diff --git a/mindspore/_version_check.py b/mindspore/_version_check.py index 6c05278e2c..5a591d59e5 100644 --- a/mindspore/_version_check.py +++ b/mindspore/_version_check.py @@ -122,15 +122,24 @@ class AscendEnvChecker(EnvChecker): def __init__(self): self.version = ["1.75.22.0.220"] - atlas_fwk_version = "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/version.info" + 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" - if os.path.exists(atlas_fwk_version): + if os.path.exists(atlas_nnae_version): + # atlas default path + self.fwk_path = "/usr/local/Ascend/nnae/latest/fwkacllib" + self.op_impl_path = "/usr/local/Ascend/nnae/latest/opp/op_impl/built-in/ai_core/tbe" + self.tbe_path = self.fwk_path + "/lib64" + self.cce_path = self.fwk_path + "/ccec_compiler/bin" + self.fwk_version = atlas_nnae_version + self.op_path = "/usr/local/Ascend/nnae/latest/opp" + elif os.path.exists(atlas_toolkit_version): # atlas default path self.fwk_path = "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib" self.op_impl_path = "/usr/local/Ascend/ascend-toolkit/latest/opp/op_impl/built-in/ai_core/tbe" self.tbe_path = self.fwk_path + "/lib64" self.cce_path = self.fwk_path + "/ccec_compiler/bin" - self.fwk_version = atlas_fwk_version + self.fwk_version = atlas_toolkit_version self.op_path = "/usr/local/Ascend/ascend-toolkit/latest/opp" elif os.path.exists(hisi_fwk_version): # hisi default path diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 6b3a2e18f8..233e4e6207 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -258,6 +258,7 @@ else () endif () set(MINDSPORE_RPATH ${ORIGIN_PATH}/lib) if (ENABLE_D) + set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/nnae/latest/fwkacllib/lib64) set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/lib64) set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/fwkacllib/lib64) set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/add-ons)