From 0af87e888ea6544ed54054106cb4996a09ed1acc Mon Sep 17 00:00:00 2001 From: dingpeifei Date: Thu, 17 Jun 2021 19:54:54 +0800 Subject: [PATCH] upgrade_ascend_0617 --- VERSION | 2 +- graphengine | 2 +- mindspore/ccsrc/cxx_api/CMakeLists.txt | 3 +-- mindspore/run_check/_check_version.py | 2 +- tests/st/model_zoo_tests/transformer/test_transformer.py | 2 +- .../models/bert/bert_performance/test_bert_tdt_lossscale.py | 2 +- .../st/networks/models/bert/bert_performance/test_bert_thor.py | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 867e52437ab..f0bb29e7638 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.0 \ No newline at end of file +1.3.0 diff --git a/graphengine b/graphengine index 3442c74c1e9..2d5ad3a72e5 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit 3442c74c1e99f517a7816dc39b41ab85009672eb +Subproject commit 2d5ad3a72e5fefa3857eb9443083cd1117fd49a7 diff --git a/mindspore/ccsrc/cxx_api/CMakeLists.txt b/mindspore/ccsrc/cxx_api/CMakeLists.txt index 756f7161afe..76ceab48899 100644 --- a/mindspore/ccsrc/cxx_api/CMakeLists.txt +++ b/mindspore/ccsrc/cxx_api/CMakeLists.txt @@ -87,9 +87,8 @@ if(ENABLE_D OR ENABLE_ACL) find_library(libopskernel libopskernel.so ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) find_library(libaicore_utils libaicore_utils.so ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) find_library(libaicpu_engine_common libaicpu_engine_common.so ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) - find_library(atc_protobuf libascend_protobuf.so.3.8.0.0 ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) - target_link_libraries(mindspore_shared_lib PRIVATE -Wl,--no-as-needed graph ${ge_compiler} ${atc_protobuf} + target_link_libraries(mindspore_shared_lib PRIVATE -Wl,--no-as-needed graph ${ge_compiler} ${acl_retr} ${acl_cblas} ${acl_dvpp} ${acl_runtime} ${libplatform} ${libcompress} ${libopskernel} ${libaicore_utils} ${libaicpu_engine_common} ${acl}) add_dependencies(mindspore_shared_lib graph) diff --git a/mindspore/run_check/_check_version.py b/mindspore/run_check/_check_version.py index e659b015d5c..72e1a1ac44a 100644 --- a/mindspore/run_check/_check_version.py +++ b/mindspore/run_check/_check_version.py @@ -206,7 +206,7 @@ class AscendEnvChecker(EnvChecker): """ascend environment check""" def __init__(self): - self.version = ["1.78.T21.0.B210"] + self.version = ["1.78.23.0.230"] atlas_nnae_version = "/usr/local/Ascend/nnae/latest/fwkacllib/version.info" atlas_toolkit_version = "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/version.info" hisi_fwk_version = "/usr/local/Ascend/fwkacllib/version.info" diff --git a/tests/st/model_zoo_tests/transformer/test_transformer.py b/tests/st/model_zoo_tests/transformer/test_transformer.py index 6c2ac86d613..1a981cc63ec 100644 --- a/tests/st/model_zoo_tests/transformer/test_transformer.py +++ b/tests/st/model_zoo_tests/transformer/test_transformer.py @@ -131,7 +131,7 @@ class TimeMonitor(Callback): self.per_step_mseconds_list.append(epoch_mseconds / self.data_size) -@pytest.mark.level0 +@pytest.mark.level2 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_onecard diff --git a/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py b/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py index d299c0dc8f6..47e8c058e9d 100644 --- a/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py +++ b/tests/st/networks/models/bert/bert_performance/test_bert_tdt_lossscale.py @@ -174,7 +174,7 @@ class TimeMonitor(Callback): self.per_step_mseconds_list.append(epoch_mseconds / self.data_size) -@pytest.mark.level0 +@pytest.mark.level2 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_onecard diff --git a/tests/st/networks/models/bert/bert_performance/test_bert_thor.py b/tests/st/networks/models/bert/bert_performance/test_bert_thor.py index 69696e3928d..8d15415b087 100644 --- a/tests/st/networks/models/bert/bert_performance/test_bert_thor.py +++ b/tests/st/networks/models/bert/bert_performance/test_bert_thor.py @@ -188,7 +188,7 @@ def train_process_bert_thor(q, device_id, epoch_size, device_num): q.put({'loss': loss_list, 'cost': per_step_mseconds}) -@pytest.mark.level0 +@pytest.mark.level2 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_single