Browse Source

update run 20201128

tags/v1.1.0
jonyguo 5 years ago
parent
commit
663f121a11
4 changed files with 6 additions and 5 deletions
  1. +1
    -1
      CMakeLists.txt
  2. +3
    -2
      cmake/dependency_graphengine.cmake
  3. +1
    -1
      graphengine
  4. +1
    -1
      mindspore/_check_version.py

+ 1
- 1
CMakeLists.txt View File

@@ -24,7 +24,7 @@ endif()

set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -g2 -ggdb -fno-inline-functions -fno-omit-frame-pointer -Wl,--allow-shlib-undefined -D_LIBCPP_INLINE_VISIBILITY='' -D_LIBCPP_DISABLE_EXTERN_TEMPLATE=1 -DHALF_ENABLE_CPP11_USER_LITERALS=0 -D_FORTIFY_SOURCE=2 -Wno-cpp")

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include -std=c++17 -Werror -Wall -fPIC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include -std=c++17 -Werror -Wall -Wno-deprecated-declarations -fPIC")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

set(PYBIND11_CPP_STANDARD -std=c++17)


+ 3
- 2
cmake/dependency_graphengine.cmake View File

@@ -20,6 +20,7 @@ if (NOT ENABLE_D AND NOT ENABLE_ACL)
set(GE_PREBUILD_PATH ${GE_SOURCE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR})
find_library(slog libslog.so ${GE_PREBUILD_PATH})
find_library(error_manager liberror_manager.so ${GE_PREBUILD_PATH})
find_library(mmpa libmmpa.a ${GE_PREBUILD_PATH})
elseif (DEFINED ENV{D_LINK_PATH})
set(GE_LIB_PATH $ENV{D_LINK_PATH})
set(GE_SYS_ARCH "")
@@ -35,7 +36,7 @@ elseif (DEFINED ENV{D_LINK_PATH})
set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH})
find_library(c_sec libc_sec.so ${GE_LIB_PATH})
find_library(slog libslog.so ${GE_LIB_PATH})
find_library(mmpa libmmpa.so ${GE_LIB_PATH})
find_library(mmpa libmmpa.a ${GE_LIB_PATH})
find_library(runtime libruntime.so ${GE_LIB_PATH})
find_library(msprof libmsprof.so ${GE_LIB_PATH})
find_library(register libregister.so ${GE_LIB_PATH})
@@ -54,7 +55,7 @@ else()
set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64 ${ASCEND_PATH}/acllib/lib64 ${ASCEND_PATH}/atc/lib64)
find_library(c_sec libc_sec.so ${ASCEND_DRIVER_PATH})
find_library(slog libslog.so ${ASCEND_DRIVER_PATH})
find_library(mmpa libmmpa.so ${ASCEND_DRIVER_PATH})
find_library(mmpa libmmpa.a ${ASCEND_RUNTIME_PATH})
find_library(cce libcce.so ${ASCEND_RUNTIME_PATH})
find_library(hccl libhccl.so ${ASCEND_RUNTIME_PATH})
find_library(runtime libruntime.so ${ASCEND_RUNTIME_PATH})


+ 1
- 1
graphengine

@@ -1 +1 @@
Subproject commit 383f7f751d6612e9dbde9e22a2960098fdbf3792
Subproject commit 191dc747993dec992eceb1ebfcd8afc3dcd35acc

+ 1
- 1
mindspore/_check_version.py View File

@@ -122,7 +122,7 @@ class AscendEnvChecker(EnvChecker):
"""ascend environment check"""

def __init__(self):
self.version = ["1.76.T13.0.B130"]
self.version = ["1.76.T20.0.B200"]
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"


Loading…
Cancel
Save