Skip to content

Commit ec0e9e1

Browse files
authored
Replaced CHECK_ by TORCH_CHECK_ (#6322)
1 parent 6aacf49 commit ec0e9e1

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

torchvision/csrc/io/decoder/audio_sampler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ int AudioSampler::sample(
121121
return result;
122122
}
123123

124-
CHECK_LE(result, outNumSamples);
124+
TORCH_CHECK_LE(result, outNumSamples);
125125

126126
if (result) {
127127
if ((result = av_samples_get_buffer_size(
@@ -166,7 +166,7 @@ int AudioSampler::sample(
166166

167167
av_free(tmpBuffer);
168168

169-
CHECK_LE(result, outNumSamples);
169+
TORCH_CHECK_LE(result, outNumSamples);
170170

171171
if (result) {
172172
result = av_samples_get_buffer_size(

torchvision/csrc/io/decoder/sync_decoder.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ void SyncDecoder::AVByteStorage::ensure(size_t n) {
1919
}
2020

2121
uint8_t* SyncDecoder::AVByteStorage::writableTail() {
22-
CHECK_LE(offset_ + length_, capacity_);
22+
TORCH_CHECK_LE(offset_ + length_, capacity_);
2323
return buffer_ + offset_ + length_;
2424
}
2525

2626
void SyncDecoder::AVByteStorage::append(size_t n) {
27-
CHECK_LE(n, tail());
27+
TORCH_CHECK_LE(n, tail());
2828
length_ += n;
2929
}
3030

3131
void SyncDecoder::AVByteStorage::trim(size_t n) {
32-
CHECK_LE(n, length_);
32+
TORCH_CHECK_LE(n, length_);
3333
offset_ += n;
3434
length_ -= n;
3535
}
@@ -43,7 +43,7 @@ size_t SyncDecoder::AVByteStorage::length() const {
4343
}
4444

4545
size_t SyncDecoder::AVByteStorage::tail() const {
46-
CHECK_LE(offset_ + length_, capacity_);
46+
TORCH_CHECK_LE(offset_ + length_, capacity_);
4747
return capacity_ - offset_ - length_;
4848
}
4949

torchvision/csrc/io/decoder/sync_decoder_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void gotFilesStats(std::vector<VideoFileStats>& stats) {
5050
fseek(f, 0, SEEK_END);
5151
std::vector<uint8_t> buffer(ftell(f));
5252
rewind(f);
53-
CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
53+
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
5454
fclose(f);
5555

5656
for (size_t i = 0; i < rounds; ++i) {
@@ -66,7 +66,7 @@ void gotFilesStats(std::vector<VideoFileStats>& stats) {
6666
avgProvUs +=
6767
std::chrono::duration_cast<std::chrono::microseconds>(then - now)
6868
.count();
69-
CHECK_EQ(metadata.size(), 1);
69+
TORCH_CHECK_EQ(metadata.size(), 1);
7070
item.num = metadata[0].num;
7171
item.den = metadata[0].den;
7272
item.fps = metadata[0].fps;
@@ -90,7 +90,7 @@ size_t measurePerformanceUs(
9090
fseek(f, 0, SEEK_END);
9191
std::vector<uint8_t> buffer(ftell(f));
9292
rewind(f);
93-
CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
93+
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
9494
fclose(f);
9595

9696
for (size_t i = 0; i < rounds; ++i) {
@@ -324,7 +324,7 @@ TEST(SyncDecoder, TestMemoryBuffer) {
324324
fseek(f, 0, SEEK_END);
325325
std::vector<uint8_t> buffer(ftell(f));
326326
rewind(f);
327-
CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
327+
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
328328
fclose(f);
329329
CHECK(decoder.init(
330330
params,
@@ -349,7 +349,7 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithFullRead) {
349349
fseek(f, 0, SEEK_END);
350350
std::vector<uint8_t> buffer(ftell(f));
351351
rewind(f);
352-
CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
352+
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
353353
fclose(f);
354354

355355
params.maxSeekableBytes = buffer.size() + 1;
@@ -388,7 +388,7 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithPartialRead) {
388388
fseek(f, 0, SEEK_END);
389389
std::vector<uint8_t> buffer(ftell(f));
390390
rewind(f);
391-
CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
391+
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
392392
fclose(f);
393393

394394
params.maxSeekableBytes = buffer.size() / 2;

torchvision/csrc/io/decoder/util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ std::string generateErrorDesc(int errorCode) {
265265

266266
size_t serialize(const AVSubtitle& sub, ByteStorage* out) {
267267
const auto len = size(sub);
268-
CHECK_LE(len, out->tail());
268+
TORCH_CHECK_LE(len, out->tail());
269269
size_t pos = 0;
270270
if (!Serializer::serializeItem(out->writableTail(), len, pos, sub)) {
271271
return 0;

torchvision/csrc/io/video/video.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ std::tuple<torch::Tensor, double> Video::Next() {
321321
static_cast<AVSampleFormat>(format.format.audio.format));
322322
int frameSizeTotal = out.payload->length();
323323

324-
CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0);
324+
TORCH_CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0);
325325
int numAudioSamples =
326326
frameSizeTotal / (outAudioChannels * bytesPerSample);
327327

torchvision/csrc/io/video_reader/video_reader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ size_t fillTensor(
9191
}
9292
T* frameData = frame.numel() > 0 ? frame.data_ptr<T>() : nullptr;
9393
int64_t* framePtsData = framePts.data_ptr<int64_t>();
94-
CHECK_EQ(framePts.size(0), (int64_t)msgs.size());
94+
TORCH_CHECK_EQ(framePts.size(0), (int64_t)msgs.size());
9595
size_t avgElementsInFrame = frame.numel() / msgs.size();
9696

9797
size_t offset = 0;
@@ -320,7 +320,7 @@ torch::List<torch::Tensor> readVideo(
320320
auto numberWrittenBytes = fillVideoTensor(
321321
videoMessages, videoFrame, videoFramePts, header.num, header.den);
322322

323-
CHECK_EQ(numberWrittenBytes, expectedWrittenBytes);
323+
TORCH_CHECK_EQ(numberWrittenBytes, expectedWrittenBytes);
324324

325325
videoTimeBase = torch::zeros({2}, torch::kInt);
326326
int* videoTimeBaseData = videoTimeBase.data_ptr<int>();
@@ -365,7 +365,7 @@ torch::List<torch::Tensor> readVideo(
365365
frameSizeTotal += audioMessage.payload->length();
366366
}
367367

368-
CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0);
368+
TORCH_CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0);
369369
numAudioSamples = frameSizeTotal / (outAudioChannels * bytesPerSample);
370370

371371
audioFrame =
@@ -380,7 +380,7 @@ torch::List<torch::Tensor> readVideo(
380380

381381
auto numberWrittenBytes = fillAudioTensor(
382382
audioMessages, audioFrame, audioFramePts, header.num, header.den);
383-
CHECK_EQ(
383+
TORCH_CHECK_EQ(
384384
numberWrittenBytes,
385385
numAudioSamples * outAudioChannels * sizeof(float));
386386

0 commit comments

Comments
 (0)