zhiics commented on a change in pull request #5753: URL: https://github.com/apache/incubator-tvm/pull/5753#discussion_r453746046
########## File path: python/tvm/relay/backend/graph_runtime_factory.py ########## @@ -0,0 +1,113 @@ +# 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. +"""Graph runtime factory.""" +import warnings +from tvm._ffi.base import string_types +from tvm._ffi.registry import get_global_func +from tvm.runtime import ndarray + + +def create(graph_json_str, libmod, libmod_name, params): + """Create a runtime executor module. + Parameters + ---------- + graph_json_str : str or graph class Review comment: what is graph class? The doc is not precise as well. NNVM is deprecated and it could contain more than on op ########## File path: python/tvm/relay/backend/graph_runtime_factory.py ########## @@ -0,0 +1,113 @@ +# 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. +"""Graph runtime factory.""" +import warnings +from tvm._ffi.base import string_types +from tvm._ffi.registry import get_global_func +from tvm.runtime import ndarray + + +def create(graph_json_str, libmod, libmod_name, params): + """Create a runtime executor module. + Parameters + ---------- + graph_json_str : str or graph class + The graph to be deployed in json format output by nnvm graph. + The graph can only contain one operator(tvm_op) that + points to the name of PackedFunc in the libmod. + libmod : tvm.Module + The module of the corresponding function + libmod_name: str + The name of module + params : dict of str to NDArray + The parameters of module + + Returns + ------- + graph_module : Module + Runtime graph runtime factory module. + """ + if not isinstance(graph_json_str, string_types): + try: + graph_json_str = graph_json_str._tvm_graph_json() + except AttributeError: + raise ValueError("Type %s is not supported" % type(graph_json_str)) + fcreate = get_global_func("tvm.graph_runtime_factory.create") + args = [] + for k, v in params.items(): + args.append(k) + args.append(ndarray.array(v)) + return fcreate(graph_json_str, libmod, libmod_name, *args) + + +class GraphRuntimeFactoryModule(object): + """Graph runtime factory module. + This is a module of graph runtime factory + + Parameters + ---------- + graph_json_str : str or graph class + The graph to be deployed in json format output by nnvm graph. + The graph can only contain one operator(tvm_op) that + points to the name of PackedFunc in the libmod. + libmod : tvm.Module + The module of the corresponding function + libmod_name: str + The name of module + params : dict of str to NDArray + The parameters of module + """ + + def __init__(self, graph_json_str, libmod, libmod_name, params): + self.graph_json = graph_json_str + self.lib = libmod + self.libmod_name = libmod_name + self.params = params + self.iter_cnt = 0 + self.module = create(graph_json_str, libmod, libmod_name, params) + + def export_library(self, file_name, fcompile=None, addons=None, **kwargs): + return self.module.export_library(file_name, fcompile, addons, **kwargs) + + # Sometimes we want to get params explicitly. + # For example, we want to save its params value to + # an independent file. + def get_params(self): + return self.params + + def get_json(self): + return self.graph_json + + def __getitem__(self, item): + return self.module.__getitem__(item) + + def __iter__(self): + warnings.warn( + "legacy graph runtime behaviour of producing json / lib / params will be " + "removed in the next release ", + DeprecationWarning, 2) + return self + + Review comment: remove extra line ########## File path: src/runtime/graph/graph_runtime_factory.cc ########## @@ -0,0 +1,175 @@ +/* + * 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 graph_runtime_factory.cc + * \brief Graph runtime factory implementations + */ + +#include "./graph_runtime_factory.h" + +#include <tvm/node/container.h> +#include <tvm/runtime/device_api.h> +#include <tvm/runtime/registry.h> + +#include <iterator> +#include <vector> + +namespace tvm { +namespace runtime { + +GraphRuntimeFactory::GraphRuntimeFactory( + const std::string& graph_json, + const std::unordered_map<std::string, tvm::runtime::NDArray>& params, + const std::string& module_name) { + graph_json_ = graph_json; + params_ = params; + module_name_ = module_name; +} + +PackedFunc GraphRuntimeFactory::GetFunction( + const std::string& name, const tvm::runtime::ObjectPtr<tvm::runtime::Object>& sptr_to_self) { + if (name == module_name_) { + return PackedFunc([sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { + std::vector<TVMContext> contexts; + for (int i = 0; i < args.num_args; ++i) { + contexts.emplace_back(args[i].operator TVMContext()); + } + *rv = this->RuntimeCreate(contexts); + }); + } else if (name == "debug_create") { + return PackedFunc([sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { + CHECK_GE(args.size(), 2); + std::string module_name = args[0].operator String(); + CHECK(module_name == module_name_) << "Currently we only support single model for now."; + std::vector<TVMContext> contexts; + for (int i = 1; i < args.num_args; ++i) { + contexts.emplace_back(args[i].operator TVMContext()); + } + *rv = this->DebugRuntimeCreate(contexts); + }); + } else if (name == "remove_params") { + return PackedFunc([sptr_to_self, this](TVMArgs args, TVMRetValue* rv) { + std::unordered_map<std::string, tvm::runtime::NDArray> empty_params{}; + auto exec = + make_object<GraphRuntimeFactory>(this->graph_json_, empty_params, this->module_name_); + exec->Import(this->imports_[0]); + *rv = Module(exec); + }); + } else { + return PackedFunc(); + } +} + +void GraphRuntimeFactory::SaveToBinary(dmlc::Stream* stream) { + stream->Write(graph_json_); + std::vector<std::string> names; + std::vector<DLTensor*> arrays; + for (const auto& v : params_) { + names.emplace_back(v.first); + arrays.emplace_back(const_cast<DLTensor*>(v.second.operator->())); + } + uint64_t sz = arrays.size(); Review comment: With the `MetadataModule`, we should be able to remove the serialization and deserialization of params for GraphRuntime and the factory. That may affect downstream users. I can take a stab on it later. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
