diff --git a/tf_adapter/kernels/om_executor.cc b/tf_adapter/kernels/om_executor.cc index fcea7d2e454ee03de332755efdfa3aec71e9afc7..88e3e4a4c43469ce90ba8227ed1a280fd0e983ef 100644 --- a/tf_adapter/kernels/om_executor.cc +++ b/tf_adapter/kernels/om_executor.cc @@ -70,7 +70,7 @@ Status ModelProcess::GetDynamicGearInfo() { aclmdlBatch dynamic_batch = {}; REQUIRES_ACL_STATUS_OK(aclmdlGetDynamicBatch(model_desc_, &dynamic_batch), aclmdlGetDynamicBatch); if (dynamic_batch.batchCount > 0U) { - dymainc_gear_type_ = DYNAMIC_BATCH; + dymainc_gear_type_ = DynamicGearType::DYNAMIC_BATCH; for (size_t i = 0U; i < dynamic_batch.batchCount; ++i) { std::vector current_batch; current_batch.emplace_back(dynamic_batch.batch[i]); @@ -195,10 +195,10 @@ Status ModelProcess::Execute(const std::vector &inputs, std::vector &inputs) const { - if (dymainc_gear_type_ == DYNAMIC_UNDEFINED) { + if (dymainc_gear_type_ == DynamicGearType::DYNAMIC_UNDEFINED) { return Status::OK(); } - if (dymainc_gear_type_ == DYNAMIC_BATCH) { + if (dymainc_gear_type_ == DynamicGearType::DYNAMIC_BATCH) { if (inputs.size() <= dynamic_gear_input_index_) { ADP_LOG(ERROR) << "input size " << inputs.size() << " is invalid, need be larger than " << dynamic_gear_input_index_; @@ -227,15 +227,16 @@ Status ModelProcess::ProcessDynamicGearInput(const std::vector &inputs) Status ModelProcess::ProcessInput(const std::vector &inputs) const { const size_t model_input_size = aclmdlGetNumInputs(model_desc_); - if (dymainc_gear_type_ == DYNAMIC_UNDEFINED) { + if (dymainc_gear_type_ == DynamicGearType::DYNAMIC_UNDEFINED) { if (inputs.size() < model_input_size) { ADP_LOG(ERROR) << "input num " << inputs.size() << " is smaller than model input num " << model_input_size; return tensorflow::errors::Internal("input num is invalid"); } } // dynamic gear data need to be feeded alone - size_t need_feed_input_cnts = ((dymainc_gear_type_ == DYNAMIC_UNDEFINED) && (model_input_size >= 1U)) - ? model_input_size : (model_input_size - 1U); + size_t need_feed_input_cnts = ((dymainc_gear_type_ == DynamicGearType::DYNAMIC_UNDEFINED) && (model_input_size >= 1U)) + ? model_input_size + : (model_input_size - 1U); for (size_t i = 0U; i < need_feed_input_cnts; ++i) { auto tensor_data = inputs[i].tensor_data().data(); auto tensor_size = inputs[i].tensor_data().size(); @@ -272,7 +273,7 @@ Status ModelProcess::ProcessStaticOutput(const size_t index, const tensorflow::D const size_t cur_size, std::vector &outputs) const { ADP_LOG(INFO) << "this out " << index << " is static"; aclmdlIODims acl_dims = {}; - if (dymainc_gear_type_ == DYNAMIC_UNDEFINED) { + if (dymainc_gear_type_ == DynamicGearType::DYNAMIC_UNDEFINED) { REQUIRES_ACL_STATUS_OK(aclmdlGetOutputDims(model_desc_, index, &acl_dims), aclmdlGetOutputDims); } else { REQUIRES_ACL_STATUS_OK(aclmdlGetCurOutputDims(model_desc_, index, &acl_dims), aclmdlGetCurOutputDims); diff --git a/tf_adapter/kernels/om_executor.h b/tf_adapter/kernels/om_executor.h index 61bc095b87db421c6285358c1eb623fc1a448ea3..b4f74fa4f73155a010a8a9b6a00ab32be71bec66 100644 --- a/tf_adapter/kernels/om_executor.h +++ b/tf_adapter/kernels/om_executor.h @@ -26,7 +26,7 @@ namespace tensorflow { class ModelProcess { -enum DynamicGearType { +enum class DynamicGearType { DYNAMIC_UNDEFINED = -1, DYNAMIC_BATCH, DYNAMIC_HW, @@ -112,7 +112,7 @@ private: std::vector inputs_; std::vector outputs_; - DynamicGearType dymainc_gear_type_ = DYNAMIC_UNDEFINED; + DynamicGearType dymainc_gear_type_ = DynamicGearType::DYNAMIC_UNDEFINED; std::vector> dynamic_gear_info_; // which inut is dynamic gear size_t dynamic_gear_input_index_ = SIZE_MAX;