From b334d0e0dad8c52ca6e853c48265843e8c921b73 Mon Sep 17 00:00:00 2001 From: xuyongfei Date: Wed, 14 Jul 2021 09:49:43 +0800 Subject: [PATCH] Serving, update mindspore commit --- .../worker/inference/mindspore_model_wrap.cc | 4 +- tests/ut/stub/cxx_api/context.cc | 40 +++++++++---------- tests/ut/stub/cxx_api/model/model.cc | 9 ++++- tests/ut/stub/cxx_api/model/ms/ms_model.cc | 2 +- tests/ut/stub/include/api/context.h | 22 ++++------ tests/ut/stub/include/api/model.h | 4 +- third_party/mindspore | 2 +- 7 files changed, 42 insertions(+), 41 deletions(-) diff --git a/mindspore_serving/ccsrc/worker/inference/mindspore_model_wrap.cc b/mindspore_serving/ccsrc/worker/inference/mindspore_model_wrap.cc index f7e9b28..91e151b 100644 --- a/mindspore_serving/ccsrc/worker/inference/mindspore_model_wrap.cc +++ b/mindspore_serving/ccsrc/worker/inference/mindspore_model_wrap.cc @@ -200,7 +200,7 @@ std::shared_ptr MindSporeModelWrap::TransformAscend910ModelCo } std::shared_ptr MindSporeModelWrap::TransformNvidiaGPUModelContext( uint32_t device_id, const std::map &options) { - auto context_info = std::make_shared(); + auto context_info = std::make_shared(); context_info->SetDeviceID(device_id); for (auto &item : options) { @@ -476,7 +476,7 @@ mindspore::DeviceType MindSporeModelWrap::GetMsDeviceType(serving::DeviceType de ms_device_type = mindspore::DeviceType::kAscend310; break; case kDeviceTypeGpu: - ms_device_type = mindspore::DeviceType::kNvidiaGPU; + ms_device_type = mindspore::DeviceType::kGPU; break; case kDeviceTypeCpu: ms_device_type = mindspore::DeviceType::kCPU; diff --git a/tests/ut/stub/cxx_api/context.cc b/tests/ut/stub/cxx_api/context.cc index d5824ac..1f9bd9e 100644 --- a/tests/ut/stub/cxx_api/context.cc +++ b/tests/ut/stub/cxx_api/context.cc @@ -21,12 +21,12 @@ #include "utils/log_adapter.h" constexpr auto kModelOptionCpuEnableFP16 = "mindspore.option.cpu.enable_fp16"; -constexpr auto kModelOptionMaliGpuEnableFP16 = "mindspore.option.mali_gpu.enable_fp16"; constexpr auto kModelOptionKirinNpuFrequency = "mindspore.option.kirin_npu.frequency"; constexpr auto kModelOptionDeviceID = "mindspore.option.device_id"; -constexpr auto kModelOptionNvidiaGpuDeviceID = kModelOptionDeviceID; -constexpr auto kModelOptionNvidiaGpuTrtInferMode = "mindspore.option.nvidia_gpu.trt_infer_mode"; -constexpr auto kModelOptionNvidiaGpuPrecisionMode = "mindspore.option.nvidia_gpu.precision_mode"; +constexpr auto kModelOptionGPUDeviceID = kModelOptionDeviceID; +constexpr auto kModelOptionGPUTrtInferMode = "mindspore.option.gpu.trt_infer_mode"; +constexpr auto kModelOptionGPUPrecisionMode = "mindspore.option.gpu.precision_mode"; +constexpr auto kModelOptionGPUEnableFP16 = "mindspore.option.gpu.enable_fp16"; constexpr auto kModelOptionAscend910DeviceID = kModelOptionDeviceID; constexpr auto kModelOptionAscend310DeviceID = kModelOptionDeviceID; constexpr auto kModelOptionAscend310DumpCfgPath = "mindspore.option.ascend310.dump_config_file_path"; @@ -128,13 +128,13 @@ bool CPUDeviceInfo::GetEnableFP16() const { return GetValue(data_, kModelOptionCpuEnableFP16); } -void MaliGPUDeviceInfo::SetEnableFP16(bool is_fp16) { +void GPUDeviceInfo::SetEnableFP16(bool is_fp16) { MS_EXCEPTION_IF_NULL(data_); - data_->params[kModelOptionMaliGpuEnableFP16] = is_fp16; + data_->params[kModelOptionGPUEnableFP16] = is_fp16; } -bool MaliGPUDeviceInfo::GetEnableFP16() const { +bool GPUDeviceInfo::GetEnableFP16() const { MS_EXCEPTION_IF_NULL(data_); - return GetValue(data_, kModelOptionMaliGpuEnableFP16); + return GetValue(data_, kModelOptionGPUEnableFP16); } void KirinNPUDeviceInfo::SetFrequency(int frequency) { @@ -146,31 +146,31 @@ int KirinNPUDeviceInfo::GetFrequency() const { return GetValue(data_, kModelOptionKirinNpuFrequency); } -void NvidiaGPUDeviceInfo::SetDeviceID(uint32_t device_id) { +void GPUDeviceInfo::SetDeviceID(uint32_t device_id) { MS_EXCEPTION_IF_NULL(data_); - data_->params[kModelOptionNvidiaGpuDeviceID] = device_id; + data_->params[kModelOptionGPUDeviceID] = device_id; } -uint32_t NvidiaGPUDeviceInfo::GetDeviceID() const { +uint32_t GPUDeviceInfo::GetDeviceID() const { MS_EXCEPTION_IF_NULL(data_); - return GetValue(data_, kModelOptionNvidiaGpuDeviceID); + return GetValue(data_, kModelOptionGPUDeviceID); } -void NvidiaGPUDeviceInfo::SetGpuTrtInferMode(bool gpu_trt_infer_mode) { +void GPUDeviceInfo::SetGpuTrtInferMode(bool gpu_trt_infer_mode) { MS_EXCEPTION_IF_NULL(data_); - data_->params[kModelOptionNvidiaGpuTrtInferMode] = gpu_trt_infer_mode; + data_->params[kModelOptionGPUTrtInferMode] = gpu_trt_infer_mode; } -bool NvidiaGPUDeviceInfo::GetGpuTrtInferMode() const { +bool GPUDeviceInfo::GetGpuTrtInferMode() const { MS_EXCEPTION_IF_NULL(data_); - return GetValue(data_, kModelOptionNvidiaGpuTrtInferMode); + return GetValue(data_, kModelOptionGPUTrtInferMode); } -void NvidiaGPUDeviceInfo::SetPrecisionMode(const std::vector &precision_mode) { +void GPUDeviceInfo::SetPrecisionMode(const std::vector &precision_mode) { MS_EXCEPTION_IF_NULL(data_); - data_->params[kModelOptionNvidiaGpuPrecisionMode] = CharToString(precision_mode); + data_->params[kModelOptionGPUPrecisionMode] = CharToString(precision_mode); } -std::vector NvidiaGPUDeviceInfo::GetPrecisionModeChar() const { +std::vector GPUDeviceInfo::GetPrecisionModeChar() const { MS_EXCEPTION_IF_NULL(data_); - const std::string &ref = GetValue(data_, kModelOptionNvidiaGpuPrecisionMode); + const std::string &ref = GetValue(data_, kModelOptionGPUPrecisionMode); return StringToChar(ref); } diff --git a/tests/ut/stub/cxx_api/model/model.cc b/tests/ut/stub/cxx_api/model/model.cc index 3371fca..699d68a 100644 --- a/tests/ut/stub/cxx_api/model/model.cc +++ b/tests/ut/stub/cxx_api/model/model.cc @@ -23,8 +23,7 @@ namespace mindspore { namespace { std::string GetDeviceTypeString(enum DeviceType type) { static const std::map kDeviceTypeStrs = { - {kCPU, "CPU"}, {kMaliGPU, "MaliGPU"}, {kNvidiaGPU, "GPU"}, - {kKirinNPU, "KirinGPU"}, {kAscend910, "Ascend910"}, {kAscend310, "Ascend310"}, + {kCPU, "CPU"}, {kGPU, "GPU"}, {kKirinNPU, "KirinGPU"}, {kAscend910, "Ascend910"}, {kAscend310, "Ascend310"}, }; auto iter = kDeviceTypeStrs.find(type); if (iter != kDeviceTypeStrs.end()) { @@ -72,6 +71,12 @@ Status Model::Build(const void *model_data, size_t data_size, ModelType model_ty return kMCFailed; } +Status Model::Build(const std::string &model_path, ModelType model_type, const std::shared_ptr &model_context, + const Key &dec_key, const std::string &dec_mode) { + MS_LOG(ERROR) << "Unsupported Feature."; + return kMCFailed; +} + Status Model::Resize(const std::vector &inputs, const std::vector> &dims) { if (impl_ == nullptr) { MS_LOG(ERROR) << "Failed because this model has not been built."; diff --git a/tests/ut/stub/cxx_api/model/ms/ms_model.cc b/tests/ut/stub/cxx_api/model/ms/ms_model.cc index fc95ac4..48508e5 100644 --- a/tests/ut/stub/cxx_api/model/ms/ms_model.cc +++ b/tests/ut/stub/cxx_api/model/ms/ms_model.cc @@ -142,7 +142,7 @@ uint32_t MsModel::GetDeviceID() const { return ascend910_info->GetDeviceID(); } - auto gpu_info = device_infos[0]->Cast(); + auto gpu_info = device_infos[0]->Cast(); if (gpu_info != nullptr) { return gpu_info->GetDeviceID(); } diff --git a/tests/ut/stub/include/api/context.h b/tests/ut/stub/include/api/context.h index 9ac356a..517f0bb 100644 --- a/tests/ut/stub/include/api/context.h +++ b/tests/ut/stub/include/api/context.h @@ -26,8 +26,7 @@ namespace mindspore { enum DeviceType { kCPU = 0, - kMaliGPU, - kNvidiaGPU, + kGPU, kKirinNPU, kAscend910, kAscend310, @@ -107,14 +106,6 @@ class MS_API CPUDeviceInfo : public DeviceInfoContext { bool GetEnableFP16() const; }; -class MS_API MaliGPUDeviceInfo : public DeviceInfoContext { - public: - enum DeviceType GetDeviceType() const override { return DeviceType::kMaliGPU; }; - - void SetEnableFP16(bool is_fp16); - bool GetEnableFP16() const; -}; - class MS_API KirinNPUDeviceInfo : public DeviceInfoContext { public: enum DeviceType GetDeviceType() const override { return DeviceType::kKirinNPU; }; @@ -123,9 +114,9 @@ class MS_API KirinNPUDeviceInfo : public DeviceInfoContext { int GetFrequency() const; }; -class MS_API NvidiaGPUDeviceInfo : public DeviceInfoContext { +class MS_API GPUDeviceInfo : public DeviceInfoContext { public: - enum DeviceType GetDeviceType() const override { return DeviceType::kNvidiaGPU; }; + enum DeviceType GetDeviceType() const override { return DeviceType::kGPU; }; void SetDeviceID(uint32_t device_id); uint32_t GetDeviceID() const; @@ -136,15 +127,18 @@ class MS_API NvidiaGPUDeviceInfo : public DeviceInfoContext { inline void SetPrecisionMode(const std::string &precison_mode); inline std::string GetPrecisionMode() const; + void SetEnableFP16(bool is_fp16); + bool GetEnableFP16() const; + private: void SetPrecisionMode(const std::vector &precision_mode); std::vector GetPrecisionModeChar() const; }; -void NvidiaGPUDeviceInfo::SetPrecisionMode(const std::string &precision_mode) { +void GPUDeviceInfo::SetPrecisionMode(const std::string &precision_mode) { SetPrecisionMode(StringToChar(precision_mode)); } -std::string NvidiaGPUDeviceInfo::GetPrecisionMode() const { return CharToString(GetPrecisionModeChar()); } +std::string GPUDeviceInfo::GetPrecisionMode() const { return CharToString(GetPrecisionModeChar()); } class MS_API Ascend910DeviceInfo : public DeviceInfoContext { public: diff --git a/tests/ut/stub/include/api/model.h b/tests/ut/stub/include/api/model.h index c2dfb8b..9c0b434 100644 --- a/tests/ut/stub/include/api/model.h +++ b/tests/ut/stub/include/api/model.h @@ -38,7 +38,6 @@ namespace dataset { class Dataset; } // namespace dataset - class MS_API Model { public: Model(); @@ -73,6 +72,9 @@ class MS_API Model { Status Build(const void *model_data, size_t data_size, ModelType model_type, const std::shared_ptr &model_context = nullptr, const Key &dec_key = {}, const std::string &dec_mode = kDecModeAesGcm); + Status Build(const std::string &model_path, ModelType model_type, + const std::shared_ptr &model_context = nullptr, const Key &dec_key = {}, + const std::string &dec_mode = kDecModeAesGcm); private: friend class Serialization; diff --git a/third_party/mindspore b/third_party/mindspore index ec05237..f0ae03f 160000 --- a/third_party/mindspore +++ b/third_party/mindspore @@ -1 +1 @@ -Subproject commit ec052373d1a898bb23a0df5eeea6cc6c9659abd3 +Subproject commit f0ae03f60d22c34170ef51c83ff080704ebb8579 -- Gitee