fix the expand_nd negative axis case

vera121 · vera121 · commit a900cd923ede · 2020-01-02T03:10:05.000+01:00
diff --git a/src/caffe/layers/expand_dims_nd_layer.cpp b/src/caffe/layers/expand_dims_nd_layer.cpp
@@ -19,8 +19,8 @@ void ExpandDimsNDLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,
   {
     CHECK_LE(axis[i], bottom[0]->num_axes())
         << "Newly inserted axis index should not be greater than bottom axis count!";
-    if(axis[i] != bottom[0]->num_axes())
-      axis[i] = bottom[0]->CanonicalAxisIndex(axis[i]);
+    if(axis[i] < 0)
+      axis[i] = bottom[0]->CanonicalAxisIndex(axis[i]) + 1;
   }
   vector<int> top_shape;
   /*

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ void ExpandDimsNDLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,`
`19`	`19`	`{`
`20`	`20`	`CHECK_LE(axis[i], bottom[0]->num_axes())`
`21`	`21`	`<< "Newly inserted axis index should not be greater than bottom axis count!";`
`22`		`- if(axis[i] != bottom[0]->num_axes())`
`23`		`- axis[i] = bottom[0]->CanonicalAxisIndex(axis[i]);`
	`22`	`+ if(axis[i] < 0)`
	`23`	`+ axis[i] = bottom[0]->CanonicalAxisIndex(axis[i]) + 1;`
`24`	`24`	`}`
`25`	`25`	`vector<int> top_shape;`
`26`	`26`	`/*`