From 3b62c9e565228ff93351e135a9b1aa7d53fe1909 Mon Sep 17 00:00:00 2001 From: l00278812 Date: Fri, 13 Jan 2023 16:09:59 +0800 Subject: [PATCH] revert code changes for lazy_recompile --- tf_adapter/interface_spec/api_npu_config.pyh | 2 +- tf_adapter/kernels/geop_npu.cc | 8 +-- .../npu_bridge/estimator/npu/npu_config.py | 2 - .../npu_bridge/estimator/npu/npu_estimator.py | 1 - tf_adapter/util/npu_attrs.cc | 17 ------ .../npu_device/core/npu_wrapper.cpp | 2 +- .../python/npu_device/configs/npu_config.py | 1 - .../python/npu_device/npu_device.py | 3 - tf_adapter_2.x/tests/st/CMakeLists.txt | 5 +- .../tests/st/adapter2_jit_compile_st.py | 58 ------------------- 10 files changed, 5 insertions(+), 94 deletions(-) delete mode 100644 tf_adapter_2.x/tests/st/adapter2_jit_compile_st.py diff --git a/tf_adapter/interface_spec/api_npu_config.pyh b/tf_adapter/interface_spec/api_npu_config.pyh index 622fd771d..42b4e90d3 100644 --- a/tf_adapter/interface_spec/api_npu_config.pyh +++ b/tf_adapter/interface_spec/api_npu_config.pyh @@ -18,7 +18,7 @@ class NPURunConfig(run_config_lib.RunConfig): distribute_config=None, modify_mixlist=None, op_precision_mode=None, device_type="default_device_type", soc_config=None, hccl_timeout=None, op_wait_timeout=None, op_execute_timeout=None, HCCL_algorithm=None, customize_dtypes=None, op_debug_config=None, memory_config=None, experimental_config=None, - jit_compile=False, topo_sorting_mode=None, aoe_config_file=None, insert_op_file=None): + topo_sorting_mode=None, aoe_config_file=None, insert_op_file=None): class ProfilingConfig(): def __init__(self, enable_profiling=False, profiling_options=None): diff --git a/tf_adapter/kernels/geop_npu.cc b/tf_adapter/kernels/geop_npu.cc index 76e1714ec..952dcb281 100644 --- a/tf_adapter/kernels/geop_npu.cc +++ b/tf_adapter/kernels/geop_npu.cc @@ -328,9 +328,6 @@ void GeOp::Initialize(OpKernelConstruction *ctx) { ctx->GetAttr("_graph_parallel_option_path", &graph_parallel_option_path_); ctx->GetAttr("_recompute_mode", &recompute_mode_); ctx->GetAttr("_dynamic_input", &dynamic_input_); - string jit_compile; - ctx->GetAttr("_jit_compile", &jit_compile); - jit_compile_ = jit_compile == "1"; if (!dynamic_input_.empty() && dynamic_input_ == "1") { jit_compile_ = true; is_getnext_dynamic_shape_ = true; @@ -708,7 +705,7 @@ void GeOp::ComputeAsync(OpKernelContext *ctx, DoneCallback done) { // To be compatible with old versions, we should check dynamic_input_ and dynamic_config bool is_set_dynamic_config = IsDynamicConfig(); - if (dynamic_input_ != "1" && !is_set_dynamic_config && !jit_compile_) { + if (dynamic_input_ != "1" && !is_set_dynamic_config) { bool shape_changed = MaybeUpdateShape(ctx); if (build_flag_ && shape_changed) { ge::Status status = ge_session_->RemoveGraph(graph_id_); @@ -727,8 +724,7 @@ void GeOp::ComputeAsync(OpKernelContext *ctx, DoneCallback done) { // if input shapes changed, cache graphs uint32_t cache_graph_id = graph_id_; bool is_tuning = (!init_options_["ge.jobType"].empty()) && (!init_options_["ge.tuningPath"].empty()); - bool is_lazy_recompile_mode = ((dynamic_input_ == "1") && (dynamic_graph_execute_mode_ == "lazy_recompile")) - || ((dynamic_input_ == "0") && jit_compile_); + bool is_lazy_recompile_mode = (dynamic_input_ == "1") && (dynamic_graph_execute_mode_ == "lazy_recompile"); ADP_LOG(INFO) << "is_set_dynamic_config: " << is_set_dynamic_config << " is_tuning: " << is_tuning << " is_lazy_recompile_mode: " << is_lazy_recompile_mode; diff --git a/tf_adapter/python/npu_bridge/estimator/npu/npu_config.py b/tf_adapter/python/npu_bridge/estimator/npu/npu_config.py index 738e0e2df..7319bace8 100644 --- a/tf_adapter/python/npu_bridge/estimator/npu/npu_config.py +++ b/tf_adapter/python/npu_bridge/estimator/npu/npu_config.py @@ -99,7 +99,6 @@ class NPURunConfig(run_config_lib.RunConfig): op_debug_config=None, memory_config=None, experimental_config=None, - jit_compile=False, topo_sorting_mode=None, aoe_config_file=None, insert_op_file=None, @@ -241,7 +240,6 @@ class NPURunConfig(run_config_lib.RunConfig): self._op_debug_config = op_debug_config self._memory_config = memory_config self._experimental_config = self._get_experimental_config(experimental_config) - self._jit_compile = jit_compile self.topo_sorting_mode = topo_sorting_mode self.aoe_config_file = aoe_config_file self.insert_op_file = insert_op_file diff --git a/tf_adapter/python/npu_bridge/estimator/npu/npu_estimator.py b/tf_adapter/python/npu_bridge/estimator/npu/npu_estimator.py index 32b5622f7..57a040718 100644 --- a/tf_adapter/python/npu_bridge/estimator/npu/npu_estimator.py +++ b/tf_adapter/python/npu_bridge/estimator/npu/npu_estimator.py @@ -752,7 +752,6 @@ class NPUEstimator(estimator_lib.Estimator): custom_op.parameter_map["topo_sorting_mode"].i = config.topo_sorting_mode if config.insert_op_file is not None: custom_op.parameter_map["insert_op_file"].s = config.insert_op_file - custom_op.parameter_map["jit_compile"].b = config._jit_compile custom_op.parameter_map["external_weight"].b = config._external_weight self.__load_session_device_id(config, custom_op) diff --git a/tf_adapter/util/npu_attrs.cc b/tf_adapter/util/npu_attrs.cc index 57716cf54..e2b559472 100644 --- a/tf_adapter/util/npu_attrs.cc +++ b/tf_adapter/util/npu_attrs.cc @@ -393,7 +393,6 @@ std::map NpuAttrs::GetSessOptions(const OpKernelConstr std::string HCCL_algorithm; std::string atomic_clean_policy = "0"; std::string static_memory_policy = "0"; - std::string jit_compile = "0"; std::string topo_sorting_mode; std::string insert_op_file; std::string resource_config_path; @@ -454,7 +453,6 @@ std::map NpuAttrs::GetSessOptions(const OpKernelConstr (void) ctx->GetAttr("_HCCL_algorithm", &HCCL_algorithm); (void) ctx->GetAttr("_atomic_clean_policy", &atomic_clean_policy); (void) ctx->GetAttr("_static_memory_policy", &static_memory_policy); - (void) ctx->GetAttr("_jit_compile", &jit_compile); (void) ctx->GetAttr("_topo_sorting_mode", &topo_sorting_mode); (void) ctx->GetAttr("_insert_op_file", &insert_op_file); (void) ctx->GetAttr("_resource_config_path", &resource_config_path); @@ -501,8 +499,6 @@ std::map NpuAttrs::GetSessOptions(const OpKernelConstr sess_options["HCCL_algorithm"] = HCCL_algorithm; sess_options["atomic_clean_policy"] = atomic_clean_policy; sess_options["ge.exec.atomicCleanPolicy"] = atomic_clean_policy; - sess_options["jit_compile"] = jit_compile; - sess_options["ge.jit_compile"] = jit_compile; sess_options["topo_sorting_mode"] = topo_sorting_mode; sess_options["ge.topoSortingMode"] = topo_sorting_mode; sess_options["insert_op_file"] = insert_op_file; @@ -1002,7 +998,6 @@ std::map NpuAttrs::GetAllAttrOptions(const AttrSlice & std::string graph_exec_timeout; std::string logical_device_cluster_deploy_mode = "LB"; std::string logical_device_id; - std::string jit_compile = "0"; std::string topo_sorting_mode; std::string insert_op_file; std::string resource_config_path; @@ -1077,7 +1072,6 @@ std::map NpuAttrs::GetAllAttrOptions(const AttrSlice & auto graph_exec_timeout_value = attrs.Find("_graph_exec_timeout"); auto logical_device_cluster_deploy_mode_value = attrs.Find("_logical_device_cluster_deploy_mode"); auto logical_device_id_value = attrs.Find("_logical_device_id"); - auto jit_compile_value = attrs.Find("_jit_compile"); auto topo_sorting_mode_value = attrs.Find("_topo_sorting_mode"); auto insert_op_file_value = attrs.Find("_insert_op_file"); auto resource_config_path_value = attrs.Find("_resource_config_path"); @@ -1308,9 +1302,6 @@ std::map NpuAttrs::GetAllAttrOptions(const AttrSlice & if (logical_device_id_value != nullptr) { logical_device_id = logical_device_id_value->s(); } - if (jit_compile_value != nullptr) { - jit_compile = jit_compile_value->s(); - } if (resource_config_path_value != nullptr) { resource_config_path = resource_config_path_value->s(); } @@ -1410,8 +1401,6 @@ std::map NpuAttrs::GetAllAttrOptions(const AttrSlice & all_options["graph_exec_timeout"] = graph_exec_timeout; all_options["logical_device_cluster_deploy_mode"] = logical_device_cluster_deploy_mode; all_options["logical_device_id"] = logical_device_id; - all_options["jit_compile"] = jit_compile; - all_options["ge.jit_compile"] = jit_compile; all_options["topo_sorting_mode"] = topo_sorting_mode; all_options["ge.topoSortingMode"] = topo_sorting_mode; all_options["insert_op_file"] = insert_op_file; @@ -1513,7 +1502,6 @@ Status NpuAttrs::SetNpuOptimizerAttr(const GraphOptimizationPassOptions &options int64_t graph_exec_timeout = 600000L; std::string logical_device_cluster_deploy_mode = "LB"; std::string logical_device_id; - bool jit_compile = false; std::string aoe_config_file; bool external_weight = false; @@ -1873,9 +1861,6 @@ Status NpuAttrs::SetNpuOptimizerAttr(const GraphOptimizationPassOptions &options if (params.count("experimental_logical_device_id") > 0) { logical_device_id = params.at("experimental_logical_device_id").s(); } - if (params.count("jit_compile") > 0) { - jit_compile = params.at("jit_compile").b(); - } if (params.count("topo_sorting_mode") > 0) { int64_t topo_sorting_mode = params.at("topo_sorting_mode").i(); sess_options["topo_sorting_mode"] = std::to_string(topo_sorting_mode); @@ -1945,8 +1930,6 @@ Status NpuAttrs::SetNpuOptimizerAttr(const GraphOptimizationPassOptions &options sess_options["ge.exec.atomicCleanPolicy"] = std::to_string(atomic_clean_policy); sess_options["external_weight"] = std::to_string(static_cast(external_weight)); sess_options["ge.externalWeight"] = std::to_string(static_cast(external_weight)); - sess_options["jit_compile"] = std::to_string(static_cast(jit_compile)); - sess_options["ge.jit_compile"] = std::to_string(static_cast(jit_compile)); init_options_["precision_mode"] = precision_mode; if (precision_mode.empty()) { diff --git a/tf_adapter_2.x/npu_device/core/npu_wrapper.cpp b/tf_adapter_2.x/npu_device/core/npu_wrapper.cpp index 5c1a57a21..429847a15 100644 --- a/tf_adapter_2.x/npu_device/core/npu_wrapper.cpp +++ b/tf_adapter_2.x/npu_device/core/npu_wrapper.cpp @@ -101,7 +101,6 @@ const std::map kConfigurableOptions = { {"graph_exec_timeout", "ge.exec.graphExecTimeout"}, {"logical_device_cluster_deploy_mode", ge::OPTION_EXEC_LOGICAL_DEVICE_CLUSTER_DEPLOY_MODE}, {"logical_device_id", ge::OPTION_EXEC_LOGICAL_DEVICE_ID}, - {"jit_compile", "ge.jit_compile"}, {"topo_sorting_mode", "ge.topoSortingMode"}, {"overflow_flag", "ge.exec.overflow"}, {"insert_op_file", "ge.insertOpFile"}, @@ -157,6 +156,7 @@ void ParseGlobalOptions(int device_index, const std::map