This is an automated email from the ASF dual-hosted git repository. jwfromm pushed a commit to branch checkpoint in repository https://gitbox.apache.org/repos/asf/tvm.git
commit aed094d99d867eef59ce14ed824edcd84969f24a Author: Chris Sullivan <csulli...@octoml.ai> AuthorDate: Mon Aug 24 08:41:18 2020 -0700 [AMD:ONNXRT:TVM] Remove build_module.cc changes. --- src/driver/driver_api.cc | 12 +--------- src/relay/backend/build_module.cc | 46 ++------------------------------------- 2 files changed, 3 insertions(+), 55 deletions(-) diff --git a/src/driver/driver_api.cc b/src/driver/driver_api.cc index d55c0ae..4399855 100644 --- a/src/driver/driver_api.cc +++ b/src/driver/driver_api.cc @@ -24,16 +24,7 @@ #include <dmlc/thread_local.h> #include <tvm/driver/driver_api.h> #include <tvm/driver/jit_interface.h> -#include <tvm/ir/module.h> #include <tvm/ir/transform.h> -#include <tvm/relay/analysis.h> -#include <tvm/relay/expr.h> -#include <tvm/relay/op_attr_types.h> -#include <tvm/relay/op_strategy.h> -#include <tvm/relay/transform.h> -#include <tvm/relay/type.h> -#include <tvm/runtime/module.h> -#include <tvm/runtime/packed_func.h> #include <tvm/runtime/container.h> #include <tvm/runtime/c_runtime_api.h> #include <tvm/runtime/registry.h> @@ -41,8 +32,7 @@ #include <tvm/te/operation.h> #include <tvm/tir/analysis.h> #include <tvm/tir/transform.h> -#include <topi/generic/injective.h> -#include <tvm/target/generic_func.h> +#include <tvm/topi/generic/injective.h> #include <algorithm> #include <mutex> diff --git a/src/relay/backend/build_module.cc b/src/relay/backend/build_module.cc index 3c047e1..cd038a4 100644 --- a/src/relay/backend/build_module.cc +++ b/src/relay/backend/build_module.cc @@ -28,10 +28,6 @@ #include <tvm/relay/qnn/transform.h> #include <tvm/relay/transform.h> #include <tvm/runtime/device_api.h> -#include <tvm/relay/op_attr_types.h> -#include <tvm/relay/op_strategy.h> -#include <topi/broadcast.h> -#include <topi/generic/injective.h> #include <memory> @@ -555,47 +551,9 @@ class RelayBuildModule : public runtime::ModuleNode { runtime::Module RelayBuildCreate() { auto exec = make_object<RelayBuildModule>(); return runtime::Module(exec); -} - -#if 1 -TVM_REGISTER_GLOBAL("jit.strategy") - .set_body_typed([](const Attrs& attrs, const Array<te::Tensor>& inputs, const Type& out_type, - const Target& target) { - FTVMCompute fcompute = [](const Attrs& attrs, const Array<te::Tensor>& inputs, - const Type& out_type) -> Array<te::Tensor> { - CHECK_EQ(inputs.size(), 2U); - return {topi::multiply(inputs[0], inputs[1])}; - }; - FTVMSchedule fschedule = [](const Attrs& attrs, const Array<te::Tensor>& outs, - const Target& target) { - With<Target> target_scope(target); - return topi::generic::schedule_injective(target, outs); - }; - - auto n = make_object<OpStrategyNode>(); - auto strategy = relay::OpStrategy(std::move(n)); - strategy.AddImplementation(fcompute, fschedule, "jit.strategy", 10); - return strategy; -}); +} + - -TVM_REGISTER_GLOBAL("relay.backend.lower_call") - .set_body_typed([](const relay::Call& call, const Array<te::Tensor>& inputs, - const Target& target) { - static auto fstrategy = Op::GetAttrMap<relay::FTVMStrategy>("FTVMStrategy"); - Op op = Downcast<Op>(call->op); - auto out_type = call->checked_type(); - OpStrategy strategy = fstrategy[op](call->attrs, inputs, out_type, target); - auto impl = strategy->specializations[0]->implementations[0]; - auto outs = impl.Compute(call->attrs, inputs, out_type); - auto f = runtime::Registry::Get("relay.backend._make_LoweredOutput"); - if (!f) { - LOG(FATAL) << "relay.backend._make_LoweredOutput is not registered"; - } - return (*f)(outs, impl); -}); -#endif - TVM_REGISTER_GLOBAL("relay.build_module._BuildModule").set_body([](TVMArgs args, TVMRetValue* rv) { *rv = RelayBuildCreate(); });