Skip to content

Commit 3fb0503

Browse files
徐永飞gitee-org
徐永飞
authored and
gitee-org
committed
!319 Serving, update mindspore commit
Merge pull request !319 from 徐永飞/r1.3
2 parents 300b439 + b334d0e commit 3fb0503

File tree

7 files changed

+42
-41
lines changed

7 files changed

+42
-41
lines changed

‎mindspore_serving/ccsrc/worker/inference/mindspore_model_wrap.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ std::shared_ptr<DeviceInfoContext> MindSporeModelWrap::TransformAscend910ModelCo
200200
}
201201
std::shared_ptr<DeviceInfoContext> MindSporeModelWrap::TransformNvidiaGPUModelContext(
202202
uint32_t device_id, const std::map<std::string, std::string> &options) {
203-
auto context_info = std::make_shared<NvidiaGPUDeviceInfo>();
203+
auto context_info = std::make_shared<GPUDeviceInfo>();
204204
context_info->SetDeviceID(device_id);
205205

206206
for (auto &item : options) {
@@ -476,7 +476,7 @@ mindspore::DeviceType MindSporeModelWrap::GetMsDeviceType(serving::DeviceType de
476476
ms_device_type = mindspore::DeviceType::kAscend310;
477477
break;
478478
case kDeviceTypeGpu:
479-
ms_device_type = mindspore::DeviceType::kNvidiaGPU;
479+
ms_device_type = mindspore::DeviceType::kGPU;
480480
break;
481481
case kDeviceTypeCpu:
482482
ms_device_type = mindspore::DeviceType::kCPU;

‎tests/ut/stub/cxx_api/context.cc

+20-20
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
#include "utils/log_adapter.h"
2222

2323
constexpr auto kModelOptionCpuEnableFP16 = "mindspore.option.cpu.enable_fp16";
24-
constexpr auto kModelOptionMaliGpuEnableFP16 = "mindspore.option.mali_gpu.enable_fp16";
2524
constexpr auto kModelOptionKirinNpuFrequency = "mindspore.option.kirin_npu.frequency";
2625
constexpr auto kModelOptionDeviceID = "mindspore.option.device_id";
27-
constexpr auto kModelOptionNvidiaGpuDeviceID = kModelOptionDeviceID;
28-
constexpr auto kModelOptionNvidiaGpuTrtInferMode = "mindspore.option.nvidia_gpu.trt_infer_mode";
29-
constexpr auto kModelOptionNvidiaGpuPrecisionMode = "mindspore.option.nvidia_gpu.precision_mode";
26+
constexpr auto kModelOptionGPUDeviceID = kModelOptionDeviceID;
27+
constexpr auto kModelOptionGPUTrtInferMode = "mindspore.option.gpu.trt_infer_mode";
28+
constexpr auto kModelOptionGPUPrecisionMode = "mindspore.option.gpu.precision_mode";
29+
constexpr auto kModelOptionGPUEnableFP16 = "mindspore.option.gpu.enable_fp16";
3030
constexpr auto kModelOptionAscend910DeviceID = kModelOptionDeviceID;
3131
constexpr auto kModelOptionAscend310DeviceID = kModelOptionDeviceID;
3232
constexpr auto kModelOptionAscend310DumpCfgPath = "mindspore.option.ascend310.dump_config_file_path";
@@ -128,13 +128,13 @@ bool CPUDeviceInfo::GetEnableFP16() const {
128128
return GetValue<bool>(data_, kModelOptionCpuEnableFP16);
129129
}
130130

131-
void MaliGPUDeviceInfo::SetEnableFP16(bool is_fp16) {
131+
void GPUDeviceInfo::SetEnableFP16(bool is_fp16) {
132132
MS_EXCEPTION_IF_NULL(data_);
133-
data_->params[kModelOptionMaliGpuEnableFP16] = is_fp16;
133+
data_->params[kModelOptionGPUEnableFP16] = is_fp16;
134134
}
135-
bool MaliGPUDeviceInfo::GetEnableFP16() const {
135+
bool GPUDeviceInfo::GetEnableFP16() const {
136136
MS_EXCEPTION_IF_NULL(data_);
137-
return GetValue<bool>(data_, kModelOptionMaliGpuEnableFP16);
137+
return GetValue<bool>(data_, kModelOptionGPUEnableFP16);
138138
}
139139

140140
void KirinNPUDeviceInfo::SetFrequency(int frequency) {
@@ -146,31 +146,31 @@ int KirinNPUDeviceInfo::GetFrequency() const {
146146
return GetValue<int>(data_, kModelOptionKirinNpuFrequency);
147147
}
148148

149-
void NvidiaGPUDeviceInfo::SetDeviceID(uint32_t device_id) {
149+
void GPUDeviceInfo::SetDeviceID(uint32_t device_id) {
150150
MS_EXCEPTION_IF_NULL(data_);
151-
data_->params[kModelOptionNvidiaGpuDeviceID] = device_id;
151+
data_->params[kModelOptionGPUDeviceID] = device_id;
152152
}
153-
uint32_t NvidiaGPUDeviceInfo::GetDeviceID() const {
153+
uint32_t GPUDeviceInfo::GetDeviceID() const {
154154
MS_EXCEPTION_IF_NULL(data_);
155-
return GetValue<uint32_t>(data_, kModelOptionNvidiaGpuDeviceID);
155+
return GetValue<uint32_t>(data_, kModelOptionGPUDeviceID);
156156
}
157157

158-
void NvidiaGPUDeviceInfo::SetGpuTrtInferMode(bool gpu_trt_infer_mode) {
158+
void GPUDeviceInfo::SetGpuTrtInferMode(bool gpu_trt_infer_mode) {
159159
MS_EXCEPTION_IF_NULL(data_);
160-
data_->params[kModelOptionNvidiaGpuTrtInferMode] = gpu_trt_infer_mode;
160+
data_->params[kModelOptionGPUTrtInferMode] = gpu_trt_infer_mode;
161161
}
162-
bool NvidiaGPUDeviceInfo::GetGpuTrtInferMode() const {
162+
bool GPUDeviceInfo::GetGpuTrtInferMode() const {
163163
MS_EXCEPTION_IF_NULL(data_);
164-
return GetValue<bool>(data_, kModelOptionNvidiaGpuTrtInferMode);
164+
return GetValue<bool>(data_, kModelOptionGPUTrtInferMode);
165165
}
166166

167-
void NvidiaGPUDeviceInfo::SetPrecisionMode(const std::vector<char> &precision_mode) {
167+
void GPUDeviceInfo::SetPrecisionMode(const std::vector<char> &precision_mode) {
168168
MS_EXCEPTION_IF_NULL(data_);
169-
data_->params[kModelOptionNvidiaGpuPrecisionMode] = CharToString(precision_mode);
169+
data_->params[kModelOptionGPUPrecisionMode] = CharToString(precision_mode);
170170
}
171-
std::vector<char> NvidiaGPUDeviceInfo::GetPrecisionModeChar() const {
171+
std::vector<char> GPUDeviceInfo::GetPrecisionModeChar() const {
172172
MS_EXCEPTION_IF_NULL(data_);
173-
const std::string &ref = GetValue<std::string>(data_, kModelOptionNvidiaGpuPrecisionMode);
173+
const std::string &ref = GetValue<std::string>(data_, kModelOptionGPUPrecisionMode);
174174
return StringToChar(ref);
175175
}
176176

‎tests/ut/stub/cxx_api/model/model.cc

+7-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ namespace mindspore {
2323
namespace {
2424
std::string GetDeviceTypeString(enum DeviceType type) {
2525
static const std::map<enum DeviceType, std::string> kDeviceTypeStrs = {
26-
{kCPU, "CPU"}, {kMaliGPU, "MaliGPU"}, {kNvidiaGPU, "GPU"},
27-
{kKirinNPU, "KirinGPU"}, {kAscend910, "Ascend910"}, {kAscend310, "Ascend310"},
26+
{kCPU, "CPU"}, {kGPU, "GPU"}, {kKirinNPU, "KirinGPU"}, {kAscend910, "Ascend910"}, {kAscend310, "Ascend310"},
2827
};
2928
auto iter = kDeviceTypeStrs.find(type);
3029
if (iter != kDeviceTypeStrs.end()) {
@@ -72,6 +71,12 @@ Status Model::Build(const void *model_data, size_t data_size, ModelType model_ty
7271
return kMCFailed;
7372
}
7473

74+
Status Model::Build(const std::string &model_path, ModelType model_type, const std::shared_ptr<Context> &model_context,
75+
const Key &dec_key, const std::string &dec_mode) {
76+
MS_LOG(ERROR) << "Unsupported Feature.";
77+
return kMCFailed;
78+
}
79+
7580
Status Model::Resize(const std::vector<MSTensor> &inputs, const std::vector<std::vector<int64_t>> &dims) {
7681
if (impl_ == nullptr) {
7782
MS_LOG(ERROR) << "Failed because this model has not been built.";

‎tests/ut/stub/cxx_api/model/ms/ms_model.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ uint32_t MsModel::GetDeviceID() const {
142142
return ascend910_info->GetDeviceID();
143143
}
144144

145-
auto gpu_info = device_infos[0]->Cast<NvidiaGPUDeviceInfo>();
145+
auto gpu_info = device_infos[0]->Cast<GPUDeviceInfo>();
146146
if (gpu_info != nullptr) {
147147
return gpu_info->GetDeviceID();
148148
}

‎tests/ut/stub/include/api/context.h

+8-14
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
namespace mindspore {
2727
enum DeviceType {
2828
kCPU = 0,
29-
kMaliGPU,
30-
kNvidiaGPU,
29+
kGPU,
3130
kKirinNPU,
3231
kAscend910,
3332
kAscend310,
@@ -107,14 +106,6 @@ class MS_API CPUDeviceInfo : public DeviceInfoContext {
107106
bool GetEnableFP16() const;
108107
};
109108

110-
class MS_API MaliGPUDeviceInfo : public DeviceInfoContext {
111-
public:
112-
enum DeviceType GetDeviceType() const override { return DeviceType::kMaliGPU; };
113-
114-
void SetEnableFP16(bool is_fp16);
115-
bool GetEnableFP16() const;
116-
};
117-
118109
class MS_API KirinNPUDeviceInfo : public DeviceInfoContext {
119110
public:
120111
enum DeviceType GetDeviceType() const override { return DeviceType::kKirinNPU; };
@@ -123,9 +114,9 @@ class MS_API KirinNPUDeviceInfo : public DeviceInfoContext {
123114
int GetFrequency() const;
124115
};
125116

126-
class MS_API NvidiaGPUDeviceInfo : public DeviceInfoContext {
117+
class MS_API GPUDeviceInfo : public DeviceInfoContext {
127118
public:
128-
enum DeviceType GetDeviceType() const override { return DeviceType::kNvidiaGPU; };
119+
enum DeviceType GetDeviceType() const override { return DeviceType::kGPU; };
129120

130121
void SetDeviceID(uint32_t device_id);
131122
uint32_t GetDeviceID() const;
@@ -136,15 +127,18 @@ class MS_API NvidiaGPUDeviceInfo : public DeviceInfoContext {
136127
inline void SetPrecisionMode(const std::string &precison_mode);
137128
inline std::string GetPrecisionMode() const;
138129

130+
void SetEnableFP16(bool is_fp16);
131+
bool GetEnableFP16() const;
132+
139133
private:
140134
void SetPrecisionMode(const std::vector<char> &precision_mode);
141135
std::vector<char> GetPrecisionModeChar() const;
142136
};
143137

144-
void NvidiaGPUDeviceInfo::SetPrecisionMode(const std::string &precision_mode) {
138+
void GPUDeviceInfo::SetPrecisionMode(const std::string &precision_mode) {
145139
SetPrecisionMode(StringToChar(precision_mode));
146140
}
147-
std::string NvidiaGPUDeviceInfo::GetPrecisionMode() const { return CharToString(GetPrecisionModeChar()); }
141+
std::string GPUDeviceInfo::GetPrecisionMode() const { return CharToString(GetPrecisionModeChar()); }
148142

149143
class MS_API Ascend910DeviceInfo : public DeviceInfoContext {
150144
public:

‎tests/ut/stub/include/api/model.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ namespace dataset {
3838
class Dataset;
3939
} // namespace dataset
4040

41-
4241
class MS_API Model {
4342
public:
4443
Model();
@@ -73,6 +72,9 @@ class MS_API Model {
7372
Status Build(const void *model_data, size_t data_size, ModelType model_type,
7473
const std::shared_ptr<Context> &model_context = nullptr, const Key &dec_key = {},
7574
const std::string &dec_mode = kDecModeAesGcm);
75+
Status Build(const std::string &model_path, ModelType model_type,
76+
const std::shared_ptr<Context> &model_context = nullptr, const Key &dec_key = {},
77+
const std::string &dec_mode = kDecModeAesGcm);
7678

7779
private:
7880
friend class Serialization;

‎third_party/mindspore

Submodule mindspore updated from ec05237 to f0ae03f

0 commit comments

Comments
 (0)