Merge pull request #56 from DVEfremov/issue-55

Compilation fails for caffe opencl branch in CPU_ONLY mode issue #55
BVLC · Feb 3, 2017 · 0972b6e · 0972b6e
2 parents 7da76f3 + b5b16a9
commit 0972b6e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/caffe/layers/softmax_layer.cpp b/src/caffe/layers/softmax_layer.cpp
@@ -18,10 +18,14 @@ void SoftmaxLayer<Dtype>::Reshape(const vector<Blob<Dtype>*>& bottom,
   caffe_set(sum_multiplier_.count(), Dtype(1), multiplier_data);
   outer_num_ = bottom[0]->count(0, softmax_axis_);
   inner_num_ = bottom[0]->count(softmax_axis_ + 1);
+  vector<int_tp> scale_dims = bottom[0]->shape();
+#ifdef USE_GREENTEA
   use_slm_ = (bottom[0]->shape(softmax_axis_) * inner_num_
               + inner_num_ * 17) <= 8192;
-  vector<int_tp> scale_dims = bottom[0]->shape();
   scale_dims[softmax_axis_] = use_slm_ ? 1 : 17;
+#else
+  scale_dims[softmax_axis_] = 1;
+#endif
   scale_.Reshape(scale_dims);
 }