From a4260ca34fb5b6e6cbc0c89d75c6dce1ff314427 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Wed, 3 Aug 2022 03:31:20 -0700 Subject: [PATCH] Move func calls outside of *CHECK_* Summary: Resolves https://www.internalfb.com/tasks/?t=128004042 Caused by TorchVision's PR at https://github.com/pytorch/vision/pull/6322 which was in response to a change on PyTorch Core at https://github.com/pytorch/pytorch/pull/82032 Reviewed By: fmassa Differential Revision: D38383266 fbshipit-source-id: 3f0ebd04a610031c4720123d1869a851f76455cd --- torchvision/csrc/io/decoder/sync_decoder_test.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/torchvision/csrc/io/decoder/sync_decoder_test.cpp b/torchvision/csrc/io/decoder/sync_decoder_test.cpp index 7e778a449b3..936d1e94f46 100644 --- a/torchvision/csrc/io/decoder/sync_decoder_test.cpp +++ b/torchvision/csrc/io/decoder/sync_decoder_test.cpp @@ -50,7 +50,8 @@ void gotFilesStats(std::vector& stats) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + size_t s = fread(buffer.data(), 1, buffer.size(), f); + TORCH_CHECK_EQ(buffer.size(), s); fclose(f); for (size_t i = 0; i < rounds; ++i) { @@ -90,7 +91,8 @@ size_t measurePerformanceUs( fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + size_t s = fread(buffer.data(), 1, buffer.size(), f); + TORCH_CHECK_EQ(buffer.size(), s); fclose(f); for (size_t i = 0; i < rounds; ++i) { @@ -324,7 +326,8 @@ TEST(SyncDecoder, TestMemoryBuffer) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + size_t s = fread(buffer.data(), 1, buffer.size(), f); + TORCH_CHECK_EQ(buffer.size(), s); fclose(f); CHECK(decoder.init( params, @@ -349,7 +352,8 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithFullRead) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + size_t s = fread(buffer.data(), 1, buffer.size(), f); + TORCH_CHECK_EQ(buffer.size(), s); fclose(f); params.maxSeekableBytes = buffer.size() + 1; @@ -388,7 +392,8 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithPartialRead) { fseek(f, 0, SEEK_END); std::vector buffer(ftell(f)); rewind(f); - TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f)); + size_t s = fread(buffer.data(), 1, buffer.size(), f); + TORCH_CHECK_EQ(buffer.size(), s); fclose(f); params.maxSeekableBytes = buffer.size() / 2;