From e31d0ac1e033cff4b6bd42e9b0f9fb3060508073 Mon Sep 17 00:00:00 2001
From: Chiyuan Zhang <pluskid@gmail.com>
Date: Fri, 26 Sep 2014 13:18:38 -0400
Subject: [PATCH 1/3] tweak test case to expose bug.

---
 src/caffe/test/test_data/generate_sample_data.py | 2 +-
 src/caffe/test/test_hdf5data_layer.cpp           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/caffe/test/test_data/generate_sample_data.py b/src/caffe/test/test_data/generate_sample_data.py
index 0516eff9158..2ab238611d8 100644
--- a/src/caffe/test/test_data/generate_sample_data.py
+++ b/src/caffe/test/test_data/generate_sample_data.py
@@ -7,7 +7,7 @@
 
 num_cols = 8
 num_rows = 10
-height = 5
+height = 6
 width = 5
 total_size = num_cols * num_rows * height * width
 
diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp
index acca75b19b1..78a45223b90 100644
--- a/src/caffe/test/test_hdf5data_layer.cpp
+++ b/src/caffe/test/test_hdf5data_layer.cpp
@@ -62,7 +62,7 @@ TYPED_TEST(HDF5DataLayerTest, TestRead) {
   hdf5_data_param->set_batch_size(batch_size);
   hdf5_data_param->set_source(*(this->filename));
   int num_cols = 8;
-  int height = 5;
+  int height = 6;
   int width = 5;
 
   // Test that the layer setup got the correct parameters.

From c85b14b02c425937a3937080d83a49da9e59fece Mon Sep 17 00:00:00 2001
From: Chiyuan Zhang <pluskid@gmail.com>
Date: Fri, 26 Sep 2014 15:21:45 -0400
Subject: [PATCH 2/3] update HDF5 layer test data.

---
 src/caffe/test/test_data/sample_data.h5       | Bin 10184 -> 11784 bytes
 .../test/test_data/sample_data_2_gzip.h5      | Bin 9992 -> 10548 bytes
 src/caffe/test/test_hdf5data_layer.cpp        |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/caffe/test/test_data/sample_data.h5 b/src/caffe/test/test_data/sample_data.h5
index cb327573cae5de98cb1008eb38a3372c229a499c..90eaaa56ec773b5de2303100a5611786c8d78766 100644
GIT binary patch
delta 1685
zcmWmBy^bC=6b4}D+w5iuf6GE7x|kvmAqDvYC|s}&4HJoy!WE(%uHbV?X|y-sl5)`A
zfJ@4`1Q%Su6jTs?9*XD4nlta)oZr6r>AUvwbp6GzpMQGs=<5FU#dGt=i`S?6;{MI$
z$B%#i<;AxT^Wye&ny>EvxQtK!{}93t51(A!oqiry58q#Z`TYFnS0R!qR62u6_{*M5
zq0$*l!W(-sg-T~I34hy@DO5Ux$vOPv2Qr09XD|u>+LI|%I)h0Fcj1OeBC}9fsWdtp
zgPq9{?#>}RQa~h;StzVj8l8>7&g3AR<cTCQ3x$<Rqq8yCnH;CHf(r#i5}Ad<N~O`+
z80<_A!ee<NiOfP_rPAnZ40a~R*$9^kh$J!#g_TO9voYA29E2-*B8kjGVWraOYz%fL
z=fen36c9;d778nsMrUKNGdT#?@<bAug~Cdu(b*X6%xm{QJi=QFh$J!#g_TO9voYA2
z9E7LxL=u^W!b+vl*%<81r|y4vgtrwCNn{oZE0soPW3V$h2=B-fNn{oZE0soPW3V&N
z#zA;j0g*&zp|DbEbT$S%lY{V{Jds3Zp|DbEbT$S%=V=^-_Z1LHWEKi5l}2Y{uroOb
zH}XUhnT5hirP0|K>^JT|Jr2SL3Wy{!3x$<Rqq8yCnH+>$c_N9-LSd!S=xhx3Tlb$H
z2jN2nL=u^W!b+vl*%<6h4#G$BL=u^W!b+vl*%<6!8<T_ZOaYNZW}&cBX>>LQJCozt
J-F^S;<$tE%fV=<z

delta 74
zcmeB(IpIG+gXx6&MlCgFM%KxJ%<@38kU5aaL4NWdRtc6jN3R8Me!wim#I!(t@)uSG
cc8~xAL&j!BHdm&J2iP{JaoEUDex$1g0G1{hA^-pY

diff --git a/src/caffe/test/test_data/sample_data_2_gzip.h5 b/src/caffe/test/test_data/sample_data_2_gzip.h5
index b3d187cb1da4445a6a2f5510dc98ba4b25e8ec75..ff49db4ea742f207cbea04de3027087f4994215a 100644
GIT binary patch
literal 10548
zcmeI13rtg27{^arp@8zREL1@r0|c3(^0G{Mx+28^1!Pg9GM=m37!Sp?IE1l|VbcI<
z8r&EH^R-D9x3SC!2~$Bq*hHK<F&Qc_Cg2t<Fh|MIuDAEzEaw~8X3G-e?j^b3`JL~a
zkMI1?IZfeHh=iN0tsJco@mN@(1<20Oq+dGf3G^X*Xr}$CRD(s?gOokVCL1h7{2;W1
z>R(L7hvSlyqN0#~Bpsi&)HEdHku5ws+RNByT>(*4WCF3qZPY^P^VCJ1GkX1*X$5IS
zJ3B2sD_d{ra~VN&{)2~wxMU0}5DSS6QCJJe4)WsYuMQR4oU&$=HRk8&Zw3)*v74*@
z?h%h0;#(koiJ^^<nLaY%XLHCj7V7;3vxpaA4Sp8N%z7<5tssjWr0=(&#&OtYYst8X
zNQFp~NRdd-(9JV+kva{ZT%P>bP1TQ><00-Taii(`Nn3Mzp>xcctLwZy-b+uPPe*DE
z_#}oH1sDYw1sDYw1sDYw1sDYw1sDYw1sDaMdIh$`i-j!2rvCaw$c^*ll<EKbbUHtI
z-2crhV_Dx46h!!C97?NL8d^Gb)a-hcAO<BCuYJV(XzbmDW%p0iItT^3BKA~9SGWZ2
zzcD&dX)r2@taG|Zc||pDJt%qP)^8V+X=CMGy-BjRWm|T8?@fD*Pt}Xu_a+242CkQP
zccj}FR|5VVa6RC&fJ*@%0j$FLD2~NVfE9on0oMR-0lZD@sd{n6;bh0Uw&C<9%X1rX
zmhN{~T#g((er<G-7hf5ttp@xG;2!`70X_|QAK-^Li*VFh1FirZ2e=2YFW^&v-@>`M
z4?hdJfU8Cop8ni2_2y#%AMRYWZZP_xkXIvbk2&%E(%97wwVDh(oYom|9pGI!cj2hL
z4LB6=H-HZShDYxleik0TgR{$T_-eRdb>+Zc4*b!;57oH@{Fku#PUS)1W;R^KccbbT
zTz&C<z+-^H_+GGky<mPKeicgM0jB_t1PtfL0RMKtQ5feZmO0^f?=!HSZvwUqRSEBX
zoR{=^fw@}Q;WfJtur=T~z`i(#0QtPJ?WxtA0W1aEDFyy%;GYJ5Tg>lNbtCU3?4wDS
zfaznY69EPvWjZ17Cj*WJyc6eMATJ;A2Y|N%?gK0U?1Rfay947+?i<?YbDEd$i5{xI
z%;8o&S07yX$>heLs;@Z7rCzQ(i@wsPPsM4azqbq?>T*`R?Qgp*BuO?jT=VV1immH&
z7u~5T%A4pOQuYW2@BTRQ{tkDk=XiHWo<=mNP)lA|6PPmA>L-&-wsm+b*Q~qyo-Vb)
zDM!(-YWAKw-{w)~9bezrdR2B}s&k;Oo6B!lb@o<~{o`W?j3*>EA)#<n5=u9oP|B}+
zFZil9@TN0ef@Q}w7rO(h`Ho){+*#5ZFf%Zu?%>zvwwIjlwLT*p7xk+P2L@E__TIh8
zDZ5**6=rCz49k^bhgY-DTIzbj1pT}gk9_gHQhBtM_;ARU!Xp!#M=IJjsBKq=Z7*t?
z@tT$X(VzG7aOK6&8m^6tPe}e`?9XMLE9(U24`RcbwV4wg_i8oaCM2Z$+JuC@Ga;c|
zqX{{Me|o_-->5{oCKEF1Ga;jJqZ!p|uA6W^Bt~U?&@j`c<K8}*HuCo>)e6HGVHTS#
z6VcTbs%T^=1rY;i{_m<#WOa+f=G=54znT-N5WjYw>Qe+c>R-O+t5SIxiEBeux#?k0
zH>L_jE5leu0Y(8v0Y(8v0Y(8vfoDSj87m`o_m`5?)I8+wmV<`OB8t#KSL7%6;K-5P
M%3wAs@i!0n6Fk~8`Tzg`

literal 9992
zcmeI1X-HI26vyv-qd8f*71<(<TiS+JMz(7;W0Oh~DP|BcV`CN!B{Ux_q9LqQG$f-9
zu~O4EE0@xWGAkq_%52fTTC|a&B$3dRz5CvM)H#(x5wzSl%)9rU-#zEt_kZ^=%gr(B
zV}`hoawqiAYKaT+lDq1ummS(r#iCxT+{`)xYqME<TvR#&p)W#4FuOO4kH;l0GZ=_8
zQjM>+%#CFDC_OkkmGbsqSHNhPzm(o%GP_ZAJvFg)rry8RVz<z~&61L8lUj9MMpNTY
z90GAuVz590G0IT{7sa3yj#N4<wkvA;;~J?lXe4icom6}D@F%`n;_Hz6gt$tPDHk=$
zGzLkWUJLX@TbT>Qn!3hjv8O77B)gW4(}=E<mAHgXg-(-Bk-lZKk8DzO>S%0D_)@9T
zi0>S<PH9D}^{KXx+`coo4^zWX2>a8C-2-&uS6l(E09Sx3z!l&Ma0R#mTmh~CSAZ+<
z$19Mq#H1I9$bNki;;-p@%Ig0<4Ws)W_rK8$VMwcCIH_2bW$9>bUf(Fa3|HDbI+8k)
zY@K;yD_!<A_#}&Q=7D){(z^1tz9{<Gyv^%V_ridJ6ZVk8xSsIY2V>K!FK+Lx-J=+E
zs^L5{L@`5GdzY|VU%qsmeZZc^=jofa=ieW?*y_GFCT;Qxo5%h|J!|Je+yZej!Ve(M
zfY@{oVm-nrw-sTOI}u@&+YWIv${lSA-aS5XRM9nS)y$P++9TfSeGV=tYZ)0oyzs^|
z?|E?$*C4zI;*AKKAnt~^9_1c{un~IaBCLlv4&iu+Z$n&i$QYP#eA=wcTPYha%(=e&
zWlr$a9kHbm2PRF=x*fEo4B=N0pNF^&d7nlYd0&Az5_y**jJ#_gu0!6Z5Qg5ta4~FX
zgA36E;?9Q<haubw@fd_3K|Bv(lv{vUhjIrXjB<M;40AVa4$O%!zW;J?Nba5Xx7w)k
z(1NC66L#G-S3mX(%kO%Ma52OvwdZTF7@S9;;wGrL^Bly@@Oe2a5JujYAr430Xc>nC
z?;BM+J+r@F*3N1e?JSCR5@8T6$ax9k4amD3VdPy4aVPRVgD~>0hggTaivgaK*scK&
z+;J2>(VOsrJ4zrvhA>(#FAzq{Wk14YFnAlnr4ZL4d<^3E5ceMW8hajoh(5*~sER^i
znK)1t`63Lfs3#I(RKcDQ=YwbTp((3Z=M=BL%@9_b*H)&P&FLi2e?58P8oh;N>&TSM
zAWbImnm9uwj;RA8<gYs4?oW(U?4q(kp#HDUwhQD<06IXu{(buo%D#q1)ZFuvXC$Yl
xX@9Wq5Uq^*#q*E$Cqnv(yBB@0#JchQhkgX)m@B{);0kaBxB^@OuE1ZWz-OO4{r&&|

diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp
index 78a45223b90..29e70c9417f 100644
--- a/src/caffe/test/test_hdf5data_layer.cpp
+++ b/src/caffe/test/test_hdf5data_layer.cpp
@@ -93,8 +93,8 @@ TYPED_TEST(HDF5DataLayerTest, TestRead) {
 
     // Every two iterations we are reading the second file,
     // which has the same labels, but data is offset by total data size,
-    // which is 2000 (see generate_sample_data).
-    int file_offset = (iter % 4 < 2) ? 0 : 2000;
+    // which is 2400 (see generate_sample_data).
+    int file_offset = (iter % 4 < 2) ? 0 : 2400;
 
     for (int i = 0; i < batch_size; ++i) {
       EXPECT_EQ(

From e8589c6cdf7bbe8becea08ee209779317dca744a Mon Sep 17 00:00:00 2001
From: Chiyuan Zhang <pluskid@gmail.com>
Date: Fri, 26 Sep 2014 15:21:57 -0400
Subject: [PATCH 3/3] fix hdf5 data layer bug

---
 src/caffe/layers/hdf5_data_layer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
index 1f2a83582f2..3f1396a9acc 100644
--- a/src/caffe/layers/hdf5_data_layer.cpp
+++ b/src/caffe/layers/hdf5_data_layer.cpp
@@ -75,9 +75,9 @@ void HDF5DataLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom,
   // Reshape blobs.
   const int batch_size = this->layer_param_.hdf5_data_param().batch_size();
   (*top)[0]->Reshape(batch_size, data_blob_.channels(),
-                     data_blob_.width(), data_blob_.height());
+                     data_blob_.height(), data_blob_.width());
   (*top)[1]->Reshape(batch_size, label_blob_.channels(),
-                     label_blob_.width(), label_blob_.height());
+                     label_blob_.height(), label_blob_.width());
   LOG(INFO) << "output data size: " << (*top)[0]->num() << ","
       << (*top)[0]->channels() << "," << (*top)[0]->height() << ","
       << (*top)[0]->width();