summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2015-09-23 20:38:29 (GMT)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2015-09-24 03:24:10 (GMT)
commit74e174537418b6a3c0c8708e444edf45ab491e94 (patch)
treee93d65805c9f532433a6b07d0827885df2992329
parentd425e59d7494e84be63ad570a149194edce73935 (diff)
downloadcaffeonacl-74e174537418b6a3c0c8708e444edf45ab491e94.zip
caffeonacl-74e174537418b6a3c0c8708e444edf45ab491e94.tar.gz
caffeonacl-74e174537418b6a3c0c8708e444edf45ab491e94.tar.bz2
[test] TestReshape: check small then large
checking large then small can mask failure since the smaller shape memory will fit within the larger shape.
-rw-r--r--src/caffe/test/test_net.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/caffe/test/test_net.cpp b/src/caffe/test/test_net.cpp
index 12998d8..ec01053 100644
--- a/src/caffe/test/test_net.cpp
+++ b/src/caffe/test/test_net.cpp
@@ -2269,8 +2269,10 @@ TYPED_TEST(NetTest, TestReshape) {
FillerParameter filler_param;
filler_param.set_std(1);
GaussianFiller<Dtype> filler(filler_param);
- Blob<Dtype> blob1(4, 3, 9, 11);
- Blob<Dtype> blob2(2, 3, 12, 10);
+ // Check smaller shape first as larger first could hide realloc failures.
+ Blob<Dtype> blob1(2, 3, 12, 10);
+ Blob<Dtype> blob2(4, 3, 9, 11);
+ ASSERT_LT(blob1.count(), blob2.count());
filler.Fill(&blob1);
filler.Fill(&blob2);