From 0364650eae47844f7b457bcff48f4c62c7887e85 Mon Sep 17 00:00:00 2001 From: yanghaoran Date: Sat, 31 Jul 2021 16:11:38 +0800 Subject: [PATCH] Upgrade Ascend packages 28 Jul 21, with testcases removed --- graphengine | 2 +- .../device/ascend/profiling/profiling_callback_register.h | 2 +- .../ccsrc/runtime/device/ascend/profiling/profiling_manager.cc | 1 - .../ccsrc/runtime/device/ascend/profiling/profiling_manager.h | 2 +- mindspore/run_check/_check_version.py | 2 +- tests/st/auto_parallel/test_optimizer_parallel.py | 2 +- tests/st/auto_parallel/test_parallel_strategy_search.py | 2 +- tests/st/dynamic_shape/test_ascend_cpu.py | 2 +- tests/st/dynamic_shape/test_dynamic_shape_embedding.py | 2 +- tests/st/dynamic_shape/test_ftrl.py | 2 +- tests/st/dynamic_shape/test_getnext_dynamic_pipeline.py | 2 +- tests/st/model_zoo_tests/transformer/test_transformer.py | 2 +- tests/ut/cpp/stub/ge/ge_mock.cc | 2 -- 13 files changed, 11 insertions(+), 14 deletions(-) diff --git a/graphengine b/graphengine index acc2472c411..cc8b6480046 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit acc2472c4119d70b579d7ac2f7a6bbf2c344af29 +Subproject commit cc8b648004605b8b01449de85a58a08cd6257226 diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_callback_register.h b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_callback_register.h index ace8c4631d3..61f9b268c05 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_callback_register.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_callback_register.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_PROFILING_PROFILING_CALLBACK_REGISTER_H_ #include "toolchain/prof_callback.h" +#include "toolchain/prof_acl_api.h" #define MAX_DEV_NUM (64) -using Status = uint32_t; enum ProfCommandHandleType { kProfCommandhandleInit = 0, kProfCommandhandleStart, diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc index 0d33fa4219e..666d266bc74 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc @@ -24,7 +24,6 @@ #include "utils/ms_utils.h" #include "utils/convert_utils.h" #include "runtime/base.h" -#include "toolchain/prof_acl_api.h" #include "runtime/device/ascend/profiling/profiling_callback_register.h" #include diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h index 0ca8d7971a2..d6b57f373b9 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h @@ -24,11 +24,11 @@ #include "utils/contract.h" #include "utils/ms_context.h" #include "toolchain/prof_callback.h" +#include "toolchain/prof_acl_api.h" #include "runtime/device/ascend/profiling/profiling_callback_register.h" using std::map; using std::string; -using Status = uint32_t; namespace mindspore { namespace device { namespace ascend { diff --git a/mindspore/run_check/_check_version.py b/mindspore/run_check/_check_version.py index 69d2df67750..fa52264ac12 100644 --- a/mindspore/run_check/_check_version.py +++ b/mindspore/run_check/_check_version.py @@ -207,7 +207,7 @@ class AscendEnvChecker(EnvChecker): """ascend environment check""" def __init__(self): - self.version = ["1.78.23.3.230"] + self.version = ["1.79.T10.0.B100"] 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/auto_parallel/test_optimizer_parallel.py b/tests/st/auto_parallel/test_optimizer_parallel.py index b75c72b3da7..338a3c48972 100644 --- a/tests/st/auto_parallel/test_optimizer_parallel.py +++ b/tests/st/auto_parallel/test_optimizer_parallel.py @@ -16,7 +16,7 @@ import os import pytest -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_single diff --git a/tests/st/auto_parallel/test_parallel_strategy_search.py b/tests/st/auto_parallel/test_parallel_strategy_search.py index d543830ffca..81994feb3c1 100644 --- a/tests/st/auto_parallel/test_parallel_strategy_search.py +++ b/tests/st/auto_parallel/test_parallel_strategy_search.py @@ -16,7 +16,7 @@ import os import pytest -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_single diff --git a/tests/st/dynamic_shape/test_ascend_cpu.py b/tests/st/dynamic_shape/test_ascend_cpu.py index e3c4938d603..05885b94abe 100644 --- a/tests/st/dynamic_shape/test_ascend_cpu.py +++ b/tests/st/dynamic_shape/test_ascend_cpu.py @@ -58,7 +58,7 @@ def test_unique_ascend(): assert (output[1].asnumpy() == expect2).all() -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_onecard diff --git a/tests/st/dynamic_shape/test_dynamic_shape_embedding.py b/tests/st/dynamic_shape/test_dynamic_shape_embedding.py index 33061ea6913..b0c2efddf3e 100644 --- a/tests/st/dynamic_shape/test_dynamic_shape_embedding.py +++ b/tests/st/dynamic_shape/test_dynamic_shape_embedding.py @@ -36,7 +36,7 @@ class NetWithEmbeddingLookUp(nn.Cell): return out -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.platform_x86_gpu_training diff --git a/tests/st/dynamic_shape/test_ftrl.py b/tests/st/dynamic_shape/test_ftrl.py index bc1ce5b5143..d063283a0de 100644 --- a/tests/st/dynamic_shape/test_ftrl.py +++ b/tests/st/dynamic_shape/test_ftrl.py @@ -56,7 +56,7 @@ def test_ftrl_net(): [[0.6821311, 0.6821311]], [[0.6821311, 0.6821311]]])) -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_onecard diff --git a/tests/st/dynamic_shape/test_getnext_dynamic_pipeline.py b/tests/st/dynamic_shape/test_getnext_dynamic_pipeline.py index 9552b039382..e3aa26caf51 100644 --- a/tests/st/dynamic_shape/test_getnext_dynamic_pipeline.py +++ b/tests/st/dynamic_shape/test_getnext_dynamic_pipeline.py @@ -69,7 +69,7 @@ class Net(nn.Cell): x5 = self.relu(x5) return x1, x2, x3, x4, x5 -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_onecard diff --git a/tests/st/model_zoo_tests/transformer/test_transformer.py b/tests/st/model_zoo_tests/transformer/test_transformer.py index 8ace3c49c2d..cfcb049398a 100644 --- a/tests/st/model_zoo_tests/transformer/test_transformer.py +++ b/tests/st/model_zoo_tests/transformer/test_transformer.py @@ -145,7 +145,7 @@ class TimeMonitor(Callback): self.per_step_mseconds_list.append(epoch_mseconds / self.data_size) -@pytest.mark.level0 +@pytest.mark.level1 @pytest.mark.platform_arm_ascend_training @pytest.mark.platform_x86_ascend_training @pytest.mark.env_onecard diff --git a/tests/ut/cpp/stub/ge/ge_mock.cc b/tests/ut/cpp/stub/ge/ge_mock.cc index 2a405c20073..ed32606bb32 100644 --- a/tests/ut/cpp/stub/ge/ge_mock.cc +++ b/tests/ut/cpp/stub/ge/ge_mock.cc @@ -53,10 +53,8 @@ Status Graph::SaveToFile(const string& file_name) const { return ge::GRAPH_SUCCE } // namespace ge namespace gelc { -extern "C" { uint32_t GetOptInfo(uint32_t mode, const std::string &soc_ver, std::map &opt_info_map) { return 0; } -} // extern C } // namespace gelc #endif