fix lint and compile error

apache · Nov 20, 2019 · 3f14766 · 3f14766
1 parent 97e01f5
commit 3f14766
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/operator/numpy/np_insert_op-inl.h b/src/operator/numpy/np_insert_op-inl.h
@@ -162,8 +162,8 @@ struct InsertSingleIndexForward {
     }
     int64_t dest_idx;
     IType index = in_obj[0];
-    if (index < 0) {
-        index += N;
+    if (static_cast<int64_t>(index) < 0) {
+        index += static_cast<IType>(N);
     }
     if (out_mid >= index && out_mid < index + numnew) {
       int idx_val = out_mid - index;
@@ -271,8 +271,8 @@ struct SliceToIndices {
   MSHADOW_XINLINE static void Map(int i, IType* indices, int N,
                                   int start, int step) {
     indices[i] = start + i * step;
-    if (indices[i] < 0) {
-      indices[i] += N;
+    if (static_cast<int64_t>(indices[i]) < 0) {
+      indices[i] += static_cast<IType>(N);
     }
   }
 };
@@ -282,8 +282,8 @@ struct ObjToIndices {
   MSHADOW_XINLINE static void Map(int i, IType* indices,
                                   int N, const IType* obj) {
     indices[i] = obj[i];
-    if (indices[i] < 0) {
-      indices[i] += N;
+    if (static_cast<int64_t>(indices[i]) < 0) {
+      indices[i] += static_cast<IType>(N);
     }
   }
 };
@@ -380,7 +380,7 @@ void NumpyInsertCompute(const nnvm::NodeAttrs& attrs,
     int N = arr.shape_[axis];
     mxnet::TShape newshape(arr.shape_);
     size_t indices_len = 0;
-    int start, stop, step;
+    int start = 0, stop = 0, step = 0;
 
     // get and check indices from slice or sequence of ints
     if (inputs.size() == 3U) {
@@ -405,7 +405,7 @@ void NumpyInsertCompute(const nnvm::NodeAttrs& attrs,
         indices_len = static_cast<size_t>(seq_cnt);
     }
 
-    int numnew, index;
+    int numnew, index = 0;
     mxnet::TShape val_newshape(arr.shape_.ndim(), -1);
     for (int i = inputs[insert_::kValues].shape_.ndim() - 1, j = arr.shape_.ndim() - 1;
          i >= 0 || j >= 0; --i, --j) {
@@ -543,10 +543,11 @@ void NumpyInsertCompute(const nnvm::NodeAttrs& attrs,
               Kernel<InsertSingleIndexForward<req_type>, xpu>::Launch(s, outshape.Size(),
                                                 outputs[insert_::kOut].dptr<DType>(),
                                                 values.dptr<DType>(), arr.dptr<DType>(),
-                                                k_outshape, k_valshape, 
+                                                k_outshape, k_valshape,
                                                 N, inputs[insert_::kObj].dptr<IType>(), numnew,
-                                                val_strides, old_val_strides, arr_strides, out_strides,
-                                                arr.shape_.ndim(), values.shape_.ndim(), 
+                                                val_strides, old_val_strides,
+                                                arr_strides, out_strides,
+                                                arr.shape_.ndim(), values.shape_.ndim(),
                                                 outshape.ndim(), axis, false);
             });
           }