Skip to content

Commit a5f0f79

Browse files
authored
[FBcode->GH] Move func calls outside of *CHECK_* (#6357)
Summary: Resolves https://www.internalfb.com/tasks/?t=128004042 Caused by TorchVision's PR at #6322 which was in response to a change on PyTorch Core at pytorch/pytorch#82032 Reviewed By: fmassa Differential Revision: D38383266 fbshipit-source-id: 3f0ebd04a610031c4720123d1869a851f76455cd
1 parent 6bea4ef commit a5f0f79

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

torchvision/csrc/io/decoder/sync_decoder_test.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ void gotFilesStats(std::vector<VideoFileStats>& stats) {
5050
fseek(f, 0, SEEK_END);
5151
std::vector<uint8_t> buffer(ftell(f));
5252
rewind(f);
53-
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
53+
size_t s = fread(buffer.data(), 1, buffer.size(), f);
54+
TORCH_CHECK_EQ(buffer.size(), s);
5455
fclose(f);
5556

5657
for (size_t i = 0; i < rounds; ++i) {
@@ -90,7 +91,8 @@ size_t measurePerformanceUs(
9091
fseek(f, 0, SEEK_END);
9192
std::vector<uint8_t> buffer(ftell(f));
9293
rewind(f);
93-
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
94+
size_t s = fread(buffer.data(), 1, buffer.size(), f);
95+
TORCH_CHECK_EQ(buffer.size(), s);
9496
fclose(f);
9597

9698
for (size_t i = 0; i < rounds; ++i) {
@@ -324,7 +326,8 @@ TEST(SyncDecoder, TestMemoryBuffer) {
324326
fseek(f, 0, SEEK_END);
325327
std::vector<uint8_t> buffer(ftell(f));
326328
rewind(f);
327-
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
329+
size_t s = fread(buffer.data(), 1, buffer.size(), f);
330+
TORCH_CHECK_EQ(buffer.size(), s);
328331
fclose(f);
329332
CHECK(decoder.init(
330333
params,
@@ -349,7 +352,8 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithFullRead) {
349352
fseek(f, 0, SEEK_END);
350353
std::vector<uint8_t> buffer(ftell(f));
351354
rewind(f);
352-
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
355+
size_t s = fread(buffer.data(), 1, buffer.size(), f);
356+
TORCH_CHECK_EQ(buffer.size(), s);
353357
fclose(f);
354358

355359
params.maxSeekableBytes = buffer.size() + 1;
@@ -388,7 +392,8 @@ TEST(SyncDecoder, TestMemoryBufferNoSeekableWithPartialRead) {
388392
fseek(f, 0, SEEK_END);
389393
std::vector<uint8_t> buffer(ftell(f));
390394
rewind(f);
391-
TORCH_CHECK_EQ(buffer.size(), fread(buffer.data(), 1, buffer.size(), f));
395+
size_t s = fread(buffer.data(), 1, buffer.size(), f);
396+
TORCH_CHECK_EQ(buffer.size(), s);
392397
fclose(f);
393398

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

0 commit comments

Comments
 (0)