Browse Source

modify atlas installer package default directory, due to changes of installer packages

tags/v1.1.0
yanghaoran 5 years ago
parent
commit
ac798d87dc
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      mindspore/_version_check.py
  2. +1
    -1
      mindspore/ccsrc/CMakeLists.txt

+ 3
- 3
mindspore/_version_check.py View File

@@ -122,12 +122,12 @@ class AscendEnvChecker(EnvChecker):


def __init__(self): def __init__(self):
self.version = ["1.75.22.0.220"] self.version = ["1.75.22.0.220"]
atlas_fwk_version = "/usr/local/Ascend/nnae/latest/fwkacllib/version.info"
atlas_fwk_version = "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/version.info"
hisi_fwk_version = "/usr/local/Ascend/fwkacllib/version.info" hisi_fwk_version = "/usr/local/Ascend/fwkacllib/version.info"
if os.path.exists(atlas_fwk_version): if os.path.exists(atlas_fwk_version):
# atlas default path # 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.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.tbe_path = self.fwk_path + "/lib64"
self.cce_path = self.fwk_path + "/ccec_compiler/bin" self.cce_path = self.fwk_path + "/ccec_compiler/bin"
self.fwk_version = atlas_fwk_version self.fwk_version = atlas_fwk_version


+ 1
- 1
mindspore/ccsrc/CMakeLists.txt View File

@@ -258,7 +258,7 @@ else ()
endif () endif ()
set(MINDSPORE_RPATH ${ORIGIN_PATH}/lib) set(MINDSPORE_RPATH ${ORIGIN_PATH}/lib)
if (ENABLE_D) 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/fwkacllib/lib64)
set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/add-ons) set(MINDSPORE_RPATH ${MINDSPORE_RPATH}:/usr/local/Ascend/add-ons)
elseif (ENABLE_GPU) elseif (ENABLE_GPU)


Loading…
Cancel
Save