Refactor according to comments

include/mxnet/runtime/container.h

@@ -171,8 +171,8 @@ class ADTObj : public Object, public InplaceArrayBase<ADTObj, ObjectRef> {
   uint32_t size{0};
   // The fields of the structure follows directly in memory.
 
-  static constexpr const uint32_t _type_index = TypeIndex::kVMADT;
-  static constexpr const char* _type_key = "vm.ADT";
+  static constexpr const uint32_t _type_index = TypeIndex::kMXNetADT;
+  static constexpr const char* _type_key = "MXNet.ADT";
   MXNET_DECLARE_FINAL_OBJECT_INFO(ADTObj, Object);
 
  private:

include/mxnet/runtime/ffi_helper.h

@@ -37,7 +37,7 @@ namespace runtime {
 class EllipsisObj : public Object {
  public:
   static constexpr const uint32_t _type_index = TypeIndex::kEllipsis;
-  static constexpr const char* _type_key = "vm.Ellipsis";
+  static constexpr const char* _type_key = "MXNet.Ellipsis";
   MXNET_DECLARE_FINAL_OBJECT_INFO(EllipsisObj, Object);
 };
 
@@ -53,7 +53,7 @@ class SliceObj : public Object {
   int64_t step;
 
   static constexpr const uint32_t _type_index = TypeIndex::kSlice;
-  static constexpr const char* _type_key = "vm.Slice";
+  static constexpr const char* _type_key = "MXNet.Slice";
   MXNET_DECLARE_FINAL_OBJECT_INFO(SliceObj, Object);
 };
 
@@ -85,7 +85,7 @@ class IntegerObj: public Object {
  public:
   int64_t value;
   static constexpr const uint32_t _type_index = TypeIndex::kInteger;
-  static constexpr const char* _type_key = "vm.Integer";
+  static constexpr const char* _type_key = "MXNet.Integer";
   MXNET_DECLARE_FINAL_OBJECT_INFO(IntegerObj, Object);
 };
 

include/mxnet/runtime/object.h

@@ -51,9 +51,9 @@ namespace runtime {
 enum TypeIndex  {
   /*! \brief Root object type. */
   kRoot = 0,
-  kVMTensor = 1,
-  kVMClosure = 2,
-  kVMADT = 3,
+  kMXNetTensor = 1,
+  kMXNetClosure = 2,
+  kMXNetADT = 3,
   kRuntimeModule = 4,
   kEllipsis = 5,
   kSlice = 6,

python/mxnet/_ffi/_ctypes/types.py

@@ -30,8 +30,8 @@ class TypeCode(object):
     FLOAT = 2
     HANDLE = 3
     NULL = 4
-    TVM_TYPE = 5
-    TVM_CONTEXT = 6
+    MXNET_TYPE = 5
+    MXNET_CONTEXT = 6
     ARRAY_HANDLE = 7
     OBJECT_HANDLE = 8
     MODULE_HANDLE = 9

python/mxnet/ndarray/numpy/_op.py

@@ -46,7 +46,7 @@
            'equal', 'not_equal', 'greater', 'less', 'greater_equal', 'less_equal', 'rot90', 'einsum',
            'true_divide', 'nonzero', 'quantile', 'percentile', 'shares_memory', 'may_share_memory',
            'diff', 'resize', 'polyval', 'nan_to_num', 'isnan', 'isinf', 'isposinf', 'isneginf', 'isfinite',
-           'where', 'bincount', 'pad', 'nop']
+           'where', 'bincount', 'pad']
 
 
 @set_module('mxnet.ndarray.numpy')
@@ -111,6 +111,8 @@ def zeros(shape, dtype=None, order='C', ctx=None):  # pylint: disable=redefined-
     """
     if order != 'C':
         raise NotImplementedError
+    # If the following code (4 lines) regarding ctx is removed
+    # np.zeros((3, 4)) can be as fast as 4.96 us
     if ctx is None:
         ctx = str(current_context())
     else:
@@ -7480,12 +7482,3 @@ def pad(x, pad_width, mode='constant', **kwargs): # pylint: disable=too-many-arg
             raise ValueError("unsupported stat_length '{}'".format(values))
         return _npi.pad(x, pad_width, mode='minimum')
     return _npi.pad(x, pad_width, mode='constant', constant_value=0)
-
-
-@set_module('mxnet.ndarray.numpy')
-def nop(*args):
-    r"""
-    nop(*args)
-    A dummy function for FFI test.
-    """
-    return _api_internal.nop(*args)

src/api/api_lang.cc → src/api/_api_internal/_api_internal.cc

@@ -18,8 +18,8 @@
  */
 
 /*!
- *  Implementation of API functions related to Higher DSL build.
- * \file api_lang.cc
+ * \file _api_internal.cc
+ * \brief Internal functions exposed to python for FFI use only
  */
 // Acknowledgement: This file originates from incubator-tvm
 #include <mxnet/api_registry.h>
@@ -30,7 +30,6 @@
 #include <mxnet/runtime/container.h>
 #include <mxnet/runtime/ffi_helper.h>
 #include <nnvm/c_api.h>
-#include <iostream>
 
 namespace mxnet {
 
@@ -58,4 +57,8 @@ MXNET_REGISTER_GLOBAL("_ADT")
     *ret = ADT(0, data.begin(), data.end());
 });
 
+MXNET_REGISTER_API("_nop")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+});
+
 }  // namespace mxnet

src/api/operator/numpy/np_init_op.cc

@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file np_init_op.cc
+ * \brief Implementation of the API of functions in src/operator/numpy/np_init_op.cc
+ */
+#include "../utils.h"
+#include "../../../operator/tensor/init_op.h"
+
+namespace mxnet {
+
+MXNET_REGISTER_API("_npi.zeros")
+.set_body([](runtime::MXNetArgs args, runtime::MXNetRetValue* ret) {
+  using namespace runtime;
+  const nnvm::Op* op = Op::Get("_npi_zeros");
+  nnvm::NodeAttrs attrs;
+  op::InitOpParam param;
+  if (args[0].type_code() == kDLInt) {
+    param.shape = TShape(1, args[0].operator int64_t());
+  } else {
+    param.shape = TShape(args[0].operator ObjectRef());
+  }
+  if (args[1].type_code() == kNull) {
+    param.dtype = mshadow::kFloat32;
+  } else {
+    param.dtype = String2MXNetTypeWithBool(args[1].operator std::string());
+  }
+  attrs.parsed = std::move(param);
+  attrs.op = op;
+  if (args[2].type_code() != kNull) {
+    attrs.dict["ctx"] = args[2].operator std::string();
+  }
+  int num_outputs = 0;
+  auto ndoutputs = Invoke<op::InitOpParam>(op, &attrs, 0, nullptr, &num_outputs, nullptr);
+  *ret = ndoutputs[0];
+});
+
+}  // namespace mxnet