diff --git a/torchvision/csrc/io/decoder/audio_sampler.cpp b/torchvision/csrc/io/decoder/audio_sampler.cpp index cc170aa1bcc..e26d788d9c7 100644 --- a/torchvision/csrc/io/decoder/audio_sampler.cpp +++ b/torchvision/csrc/io/decoder/audio_sampler.cpp @@ -121,7 +121,7 @@ int AudioSampler::sample( return result; } - CHECK_LE(result, outNumSamples); + TORCH_CHECK_LE(result, outNumSamples); if (result) { if ((result = av_samples_get_buffer_size( @@ -166,7 +166,7 @@ int AudioSampler::sample( av_free(tmpBuffer); - CHECK_LE(result, outNumSamples); + TORCH_CHECK_LE(result, outNumSamples); if (result) { result = av_samples_get_buffer_size( diff --git a/torchvision/csrc/io/decoder/sync_decoder.cpp b/torchvision/csrc/io/decoder/sync_decoder.cpp index 374b40838ea..1f03ef8eb95 100644 --- a/torchvision/csrc/io/decoder/sync_decoder.cpp +++ b/torchvision/csrc/io/decoder/sync_decoder.cpp @@ -19,17 +19,17 @@ void SyncDecoder::AVByteStorage::ensure(size_t n) { } uint8_t* SyncDecoder::AVByteStorage::writableTail() { - CHECK_LE(offset_ + length_, capacity_); + TORCH_CHECK_LE(offset_ + length_, capacity_); return buffer_ + offset_ + length_; } void SyncDecoder::AVByteStorage::append(size_t n) { - CHECK_LE(n, tail()); + TORCH_CHECK_LE(n, tail()); length_ += n; } void SyncDecoder::AVByteStorage::trim(size_t n) { - CHECK_LE(n, length_); + TORCH_CHECK_LE(n, length_); offset_ += n; length_ -= n; } @@ -43,7 +43,7 @@ size_t SyncDecoder::AVByteStorage::length() const { } size_t SyncDecoder::AVByteStorage::tail() const { - CHECK_LE(offset_ + length_, capacity_); + TORCH_CHECK_LE(offset_ + length_, capacity_); return capacity_ - offset_ - length_; } diff --git a/torchvision/csrc/io/decoder/sync_decoder_test.cpp b/torchvision/csrc/io/decoder/sync_decoder_test.cpp index 6109b12685e..7e778a449b3 100644 --- a/torchvision/csrc/io/decoder/sync_decoder_test.cpp +++ b/torchvision/csrc/io/decoder/sync_decoder_test.cpp @@ -50,7 +50,7 @@ void gotFilesStats(std::vector& stats) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); fclose(f); for (size_t i = 0; i < rounds; ++i) { @@ -66,7 +66,7 @@ void gotFilesStats(std::vector& stats) { avgProvUs += std::chrono::duration_cast(then - now) .count(); - CHECK_EQ(metadata.size(), 1); + TORCH_CHECK_EQ(metadata.size(), 1); item.num = metadata[0].num; item.den = metadata[0].den; item.fps = metadata[0].fps; @@ -90,7 +90,7 @@ size_t measurePerformanceUs( fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); fclose(f); for (size_t i = 0; i < rounds; ++i) { @@ -324,7 +324,7 @@ TEST(SyncDecoder, TestMemoryBuffer) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); fclose(f); CHECK(decoder.init( params, @@ -349,7 +349,7 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithFullRead) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); fclose(f); params.maxSeekableBytes = buffer.size() + 1; @@ -388,7 +388,7 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithPartialRead) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); fclose(f); params.maxSeekableBytes = buffer.size() / 2; diff --git a/torchvision/csrc/io/decoder/util.cpp b/torchvision/csrc/io/decoder/util.cpp index 658876ff600..2ecd7512c06 100644 --- a/torchvision/csrc/io/decoder/util.cpp +++ b/torchvision/csrc/io/decoder/util.cpp @@ -265,7 +265,7 @@ std::string generateErrorDesc(int errorCode) { size_t serialize(const AVSubtitle& sub, ByteStorage* out) { const auto len = size(sub); - CHECK_LE(len, out->tail()); + TORCH_CHECK_LE(len, out->tail()); size_t pos = 0; if (!Serializer::serializeItem(out->writableTail(), len, pos, sub)) { return 0; diff --git a/torchvision/csrc/io/video/video.cpp b/torchvision/csrc/io/video/video.cpp index e23ecacf075..38b35014595 100644 --- a/torchvision/csrc/io/video/video.cpp +++ b/torchvision/csrc/io/video/video.cpp @@ -321,7 +321,7 @@ std::tuple Video::Next() { static_cast(format.format.audio.format)); int frameSizeTotal = out.payload->length(); - CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0); + TORCH_CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0); int numAudioSamples = frameSizeTotal / (outAudioChannels * bytesPerSample); diff --git a/torchvision/csrc/io/video_reader/video_reader.cpp b/torchvision/csrc/io/video_reader/video_reader.cpp index ec4857a8399..39b9cacc224 100644 --- a/torchvision/csrc/io/video_reader/video_reader.cpp +++ b/torchvision/csrc/io/video_reader/video_reader.cpp @@ -91,7 +91,7 @@ size_t fillTensor( } T* frameData = frame.numel() > 0 ? frame.data_ptr() : nullptr; int64_t* framePtsData = framePts.data_ptr(); - CHECK_EQ(framePts.size(0), (int64_t)msgs.size()); + TORCH_CHECK_EQ(framePts.size(0), (int64_t)msgs.size()); size_t avgElementsInFrame = frame.numel() / msgs.size(); size_t offset = 0; @@ -320,7 +320,7 @@ torch::List readVideo( auto numberWrittenBytes = fillVideoTensor( videoMessages, videoFrame, videoFramePts, header.num, header.den); - CHECK_EQ(numberWrittenBytes, expectedWrittenBytes); + TORCH_CHECK_EQ(numberWrittenBytes, expectedWrittenBytes); videoTimeBase = torch::zeros({2}, torch::kInt); int* videoTimeBaseData = videoTimeBase.data_ptr(); @@ -365,7 +365,7 @@ torch::List readVideo( frameSizeTotal += audioMessage.payload->length(); } - CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0); + TORCH_CHECK_EQ(frameSizeTotal % (outAudioChannels * bytesPerSample), 0); numAudioSamples = frameSizeTotal / (outAudioChannels * bytesPerSample); audioFrame = @@ -380,7 +380,7 @@ torch::List readVideo( auto numberWrittenBytes = fillAudioTensor( audioMessages, audioFrame, audioFramePts, header.num, header.den); - CHECK_EQ( + TORCH_CHECK_EQ( numberWrittenBytes, numAudioSamples * outAudioChannels * sizeof(float));