Merge branch 'master' into master

Makefile

@@ -104,3 +104,4 @@ clean:
 -include build/*.d
 -include build/*/*.d
 -include build/*/*/*.d
+-include build/*/*/*/*.d

python/nnvm/frontend/keras.py

@@ -40,7 +40,7 @@ def _convert_activation(insym, keras_layer, _):
         return _sym.__add_scalar__(_sym.__mul_scalar__(insym, \
             scalar=alpha), scalar=beta)
     elif act_type == 'softmax':
-        return _sym.softmax(insym)
+        return _sym.softmax(insym, axis=1)
     elif act_type == 'sigmoid':
         return _sym.sigmoid(insym)
     elif act_type == 'tanh':

src/top/tensor/matrix_op.cc

@@ -34,8 +34,8 @@ inline bool DotShape(const nnvm::NodeAttrs& attrs,
     << "dot shape inconsistent: " << lshape << " X " << rshape;
 
   TShape oshape(lshape.ndim() + rshape.ndim() - 2);
-  for (int i = 0; i < lshape.ndim() - 1; i++) oshape[i] = lshape[i];
-  for (int i = 1; i < rshape.ndim(); i++) oshape[i + lshape.ndim() - 2] = rshape[i];
+  for (uint32_t i = 0; i < lshape.ndim() - 1; i++) oshape[i] = lshape[i];
+  for (uint32_t i = 1; i < rshape.ndim(); i++) oshape[i + lshape.ndim() - 2] = rshape[i];
 
   NNVM_ASSIGN_OUTPUT_SHAPE(attrs, *out_attrs, 0, oshape);
   return true;

src/top/tensor/reduce.cc

@@ -145,7 +145,7 @@ Example::
       for (dim_t i = 0; i < param.axis.ndim(); ++i) {
         exclude_axis.insert(param.axis[i]);
       }
-      for (dim_t i = 0; i < inputs[0].ndim(); ++i) {
+      for (dim_t i = 0; i < static_cast<int>(inputs[0].ndim()); ++i) {
         if (exclude_axis.count(i) == 0) {
           axis.push_back(make_const(Int(32), i));
         }

src/top/tensor/transform.cc

@@ -760,7 +760,7 @@ inline bool TransposeCorrectLayout(const NodeAttrs& attrs,
     } else {
       CHECK_EQ(input.ndim(), param.axes.ndim());
       for (size_t i = 0; i < input.ndim(); ++i) {
-        CHECK(param.axes[i] < input.ndim());
+        CHECK(param.axes[i] < static_cast<int>(input.ndim()));
         new_layout << input.at(param.axes[i]);
       }
     }

tests/python/frontend/keras/test_forward.py

@@ -59,6 +59,15 @@ def test_forward_elemwise_add():
     verify_keras_frontend(keras_model)
 
 
+def test_forward_softmax():
+    data = keras.layers.Input(shape=(32,32,3))
+    x = keras.layers.Activation('softmax')(data)
+    x = keras.layers.Concatenate()([x, x])
+    x = keras.layers.GlobalMaxPooling2D()(x)
+    keras_model = keras.models.Model(data, x)
+    verify_keras_frontend(keras_model)
+
+
 def test_forward_softrelu():
     data = keras.layers.Input(shape=(32,32,3))
     x = keras.layers.Activation('softplus')(data)
@@ -145,6 +154,7 @@ def test_forward_resnet50():
 
 if __name__ == '__main__':
     test_forward_elemwise_add()
+    test_forward_softmax()
     test_forward_softrelu()
     test_forward_leaky_relu()
     test_forward_dense()