join SetInputWithIndex and SetInputWithName to SetOneInputTensor (set_one_input) to VM API, the joined methods were removed

Author: Valery Chernov

include/tvm/runtime/vm/vm.h

@@ -274,22 +274,13 @@ class VirtualMachine : public runtime::ModuleNode {
   void SetInput(std::string name, TVMArgs args, int offset);
 
   /*!
-   * \brief Set input tensor with index to a function.
+   * \brief Set one input tensor with index or name to a function.
    * \param name The function name
-   * \param args args[1:] are two arguments (index, tensor) to the
+   * \param args args[1:] are two arguments (index or name, tensor) to the
    * function. If the tensor is not of the correct device for the function,
    * they will be copied to the device.
    */
-  void SetInputWithIndex(std::string name, TVMArgs args);
-
-  /*!
-   * \brief Set input tensor with name to a function.
-   * \param name The function name
-   * \param args args[1:] are two arguments (name, tensor) to the
-   * function. If the tensor is not of the correct device for the function,
-   * they will be copied to the device.
-   */
-  void SetInputWithName(std::string name, TVMArgs args);
+  void SetOneInputTensor(std::string func_name, TVMArgs args);
 
   /*!
    * \brief Internal hook for profiling the start of an op.

src/runtime/vm/vm.cc

@@ -211,12 +211,9 @@ PackedFunc VirtualMachine::GetFunction(const std::string& name,
   } else if (name == "set_input") {
     return PackedFunc(
         [sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { SetInput(args[0], args, 1); });
-  } else if (name == "set_input_with_index") {
+  } else if (name == "set_one_input") {
     return PackedFunc(
-        [sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { SetInputWithIndex(args[0], args); });
-  } else if (name == "set_input_with_name") {
-    return PackedFunc(
-        [sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { SetInputWithName(args[0], args); });
+        [sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { SetOneInputTensor(args[0], args); });
   } else if (name == "load_late_bound_consts") {
     return PackedFunc([this](TVMArgs args, TVMRetValue* rv) {
       CHECK_EQ(args.size(), 1);
@@ -244,25 +241,19 @@ void VirtualMachine::SetInput(std::string func_name, TVMArgs args, int offset) {
   inputs_.emplace(func_name, func_args);
 }
 
-void VirtualMachine::SetInputWithIndex(std::string func_name, TVMArgs args) {
+void VirtualMachine::SetOneInputTensor(std::string func_name, TVMArgs args) {
+  ICHECK_EQ(args.size(), 3) << "The expected number of arguments is 3 (func_name, index or name, tensor)";
   const auto& vm_func = checkAndGetVMFunction(func_name);
   size_t params_num = vm_func.params.size();
-  ICHECK_EQ(args.size(), 3) << "The expected number of arguments is 3 (func_name, index, tensor)";
-  ICHECK_EQ(args[1].type_code(), kTVMArgInt) << "The second argument type doesn't match integer";
-  int inp_index = args[1];
-  ICHECK_LT(inp_index, params_num);
 
-  createInputsOrCheckSize(func_name, params_num);
-  Device dev = GetDevice(vm_func.param_device_indexes[inp_index]);
-  SetInputTensorWithIndex(inputs_[func_name], args[2], inp_index, dev);
-}
-
-void VirtualMachine::SetInputWithName(std::string func_name, TVMArgs args) {
-  const auto& vm_func = checkAndGetVMFunction(func_name);
-  size_t params_num = vm_func.params.size();
-  ICHECK_EQ(args.size(), 3) << "The expected number of arguments is 3 (func_name, name, tensor)";
-  ICHECK_EQ(args[1].type_code(), kTVMStr) << "The second argument type doesn't match string";
-  int inp_index = int(getInputIndexFromName(vm_func.params, args[1]));
+  int inp_index;
+  if (args[1].type_code() == kTVMArgInt) {
+    inp_index = args[1];
+  } else if (args[1].type_code() == kTVMStr) {
+    inp_index = int(getInputIndexFromName(vm_func.params, args[1]));
+  } else {
+    LOG(FATAL) << "The second argument type (" << args[1].type_code() << ") doesn't match integer or string";
+  }
   ICHECK_LT(inp_index, params_num);
 
   createInputsOrCheckSize(func_name, params_num);