p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace ascend710 to ascend310P

This commit is contained in:
zhengyuanhua 2022-05-30 09:48:19 +08:00
parent 071ac5425b
commit dc2a211dbc
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/api/context.h
View File

@ -469,7 +469,6 @@ class MS_API AscendDeviceInfo : public DeviceInfoContext {
using Ascend310DeviceInfo = AscendDeviceInfo; using Ascend310DeviceInfo = AscendDeviceInfo;
using Ascend910DeviceInfo = AscendDeviceInfo; using Ascend910DeviceInfo = AscendDeviceInfo;
using Ascend710DeviceInfo = AscendDeviceInfo;
void AscendDeviceInfo::SetInsertOpConfigPath(const std::string &cfg_path) { void AscendDeviceInfo::SetInsertOpConfigPath(const std::string &cfg_path) {
SetInsertOpConfigPath(StringToChar(cfg_path)); SetInsertOpConfigPath(StringToChar(cfg_path));

4
mindspore/lite/test/st/scripts/ascend/run_benchmark_ascend.sh
View File

@ -130,8 +130,8 @@ echo 'run Ascend logs: ' > ${run_ascend_log_file}
echo "Start to run benchmark in ${backend}, device id ${device_id}..." echo "Start to run benchmark in ${backend}, device id ${device_id}..."
if [[ ${backend} =~ "ascend310" ]]; then if [[ ${backend} =~ "ascend310" ]]; then
ascend_device=Ascend310 ascend_device=Ascend310
elif [[ ${backend} =~ "ascend710" ]]; then elif [[ ${backend} =~ "ascend310P" ]]; then
ascend_device=Ascend710 ascend_device=Ascend310P
else else
echo "${backend} is not support." echo "${backend} is not support."
exit 1 exit 1

2
mindspore/lite/tools/benchmark/benchmark_base.cc
View File

@ -295,7 +295,7 @@ int BenchmarkBase::CheckThreadNumValid() {
int BenchmarkBase::CheckDeviceTypeValid() { int BenchmarkBase::CheckDeviceTypeValid() {
if (flags_->device_ != "CPU" && flags_->device_ != "GPU" && flags_->device_ != "NPU" && if (flags_->device_ != "CPU" && flags_->device_ != "GPU" && flags_->device_ != "NPU" &&
flags_->device_ != "Ascend310" && flags_->device_ != "Ascend710") { flags_->device_ != "Ascend310" && flags_->device_ != "Ascend310P") {
MS_LOG(ERROR) << "Device type:" << flags_->device_ << " is not supported."; MS_LOG(ERROR) << "Device type:" << flags_->device_ << " is not supported.";
std::cerr << "Device type:" << flags_->device_ << " is not supported." << std::endl; std::cerr << "Device type:" << flags_->device_ << " is not supported." << std::endl;
return RET_ERROR; return RET_ERROR;

2
mindspore/lite/tools/benchmark/benchmark_base.h
View File

@ -121,7 +121,7 @@ class MS_API BenchmarkFlags : public virtual FlagParser {
AddFlag(&BenchmarkFlags::model_type_, "modelType", "Input model type. MindIR | MindIR_Lite", "MindIR"); AddFlag(&BenchmarkFlags::model_type_, "modelType", "Input model type. MindIR | MindIR_Lite", "MindIR");
AddFlag(&BenchmarkFlags::in_data_file_, "inDataFile", "Input data file, if not set, use random input", ""); AddFlag(&BenchmarkFlags::in_data_file_, "inDataFile", "Input data file, if not set, use random input", "");
AddFlag(&BenchmarkFlags::config_file_, "configFile", "Config file", ""); AddFlag(&BenchmarkFlags::config_file_, "configFile", "Config file", "");
AddFlag(&BenchmarkFlags::device_, "device", "CPU | GPU | NPU | Ascend310 | Ascend710", "CPU"); AddFlag(&BenchmarkFlags::device_, "device", "CPU | GPU | NPU | Ascend310 | Ascend310P", "CPU");
AddFlag(&BenchmarkFlags::cpu_bind_mode_, "cpuBindMode", "Input 0 for NO_BIND, 1 for HIGHER_CPU, 2 for MID_CPU.", 1); AddFlag(&BenchmarkFlags::cpu_bind_mode_, "cpuBindMode", "Input 0 for NO_BIND, 1 for HIGHER_CPU, 2 for MID_CPU.", 1);
// MarkPerformance // MarkPerformance
AddFlag(&BenchmarkFlags::loop_count_, "loopCount", "Run loop count", 10); AddFlag(&BenchmarkFlags::loop_count_, "loopCount", "Run loop count", 10);

2
mindspore/lite/tools/benchmark/benchmark_unified_api.cc
View File

@ -426,7 +426,7 @@ int BenchmarkUnifiedApi::InitMSContext(const std::shared_ptr<mindspore::Context>
device_list.push_back(npu_device_info); device_list.push_back(npu_device_info);
} }
if (flags_->device_ == "Ascend310" || flags_->device_ == "Ascend710") { if (flags_->device_ == "Ascend310" || flags_->device_ == "Ascend310P") {
uint32_t device_id = 0; uint32_t device_id = 0;
auto device_id_env = std::getenv("ASCEND_DEVICE_ID"); auto device_id_env = std::getenv("ASCEND_DEVICE_ID");
if (device_id_env != nullptr) { if (device_id_env != nullptr) {