diff --git a/cmake/external_libs/absl.cmake b/cmake/external_libs/absl.cmake index 575afd71cd5..40979bda558 100644 --- a/cmake/external_libs/absl.cmake +++ b/cmake/external_libs/absl.cmake @@ -1,9 +1,19 @@ -if(ENABLE_GITEE) - set(REQ_URL "https://gitee.com/mirrors/abseil-cpp/repository/archive/20200923.3.tar.gz") - set(MD5 "daba6e99c7a84e2242a0107bbd873669") +set(ENABLE_GITEE_EULER OFF) +if(ENABLE_GITEE_EULER) + set(GIT_REPOSITORY "https://gitee.com/src-openeuler/abseil-cpp.git") + set(GIT_TAG "openEuler-22.03-LTS") + set(MD5 "06c9554d9f9776bb1a4b848ca206c0af") + set(ABSL_SRC "${TOP_DIR}/build/mindspore/_deps/absl-src") + __download_pkg_with_git(absl ${GIT_REPOSITORY} ${GIT_TAG} ${MD5}) + execute_process(COMMAND tar -xf ${ABSL_SRC}/abseil-cpp-20210324.2.tar.gz --strip-components 1 -C ${ABSL_SRC}) else() - set(REQ_URL "https://github.com/abseil/abseil-cpp/archive/20200923.3.tar.gz") - set(MD5 "daba6e99c7a84e2242a0107bbd873669") +if(ENABLE_GITEE) + set(REQ_URL "https://gitee.com/mirrors/abseil-cpp/repository/archive/20210324.2.tar.gz") + set(MD5 "e0b585398b89ee92a10d8c68ef7eed48") +else() + set(REQ_URL "https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz") + set(MD5 "e0b585398b89ee92a10d8c68ef7eed48") +endif() endif() if(NOT ENABLE_GLIBCXX) @@ -11,7 +21,7 @@ if(NOT ENABLE_GLIBCXX) endif() mindspore_add_pkg(absl - VER 20200923.3 + VER 20210324.2 LIBS absl_strings absl_throw_delegate absl_raw_logging_internal absl_int128 absl_bad_optional_access URL ${REQ_URL} MD5 ${MD5} diff --git a/cmake/external_libs/icu4c.cmake b/cmake/external_libs/icu4c.cmake index 464eeb691c2..b87cae1ba15 100644 --- a/cmake/external_libs/icu4c.cmake +++ b/cmake/external_libs/icu4c.cmake @@ -2,12 +2,23 @@ set(LIB_ICU_COMMON icuuc) set(LIB_ICU_DATA icudata) set(LIB_ICU_I18N icui18n) -if(ENABLE_GITEE) - set(REQ_URL "https://gitee.com/mirrors/icu/repository/archive/release-67-1.tar.gz") - set(MD5 "0c2662a2b0bc80b0eb56495205247c8f") +set(ENABLE_GITEE_EULER OFF) +if(ENABLE_GITEE_EULER) + set(GIT_REPOSITORY "https://gitee.com/src-openeuler/icu.git") + set(GIT_TAG "openEuler-22.03-LTS") + set(MD5 "fa4070da839ce75469a8de962f2a0c2a") + set(ICU4C_SRC "${TOP_DIR}/build/mindspore/_deps/icu4c-src/icu4c") + set(ICU4C_TAR_SRC "${TOP_DIR}/build/mindspore/_deps/icu4c-src") + __download_pkg_with_git(icu4c ${GIT_REPOSITORY} ${GIT_TAG} ${MD5}) + execute_process(COMMAND tar -xf ${ICU4C_TAR_SRC}/icu4c-69_1-src.tgz --strip-components 1 -C ${ICU4C_SRC}) else() - set(REQ_URL "https://github.com/unicode-org/icu/archive/release-67-1.tar.gz") - set(MD5 "fd525fb47d8827b0b7da78b51dd2d93f") +if(ENABLE_GITEE) + set(REQ_URL "https://gitee.com/mirrors/icu/repository/archive/release-69-1.tar.gz") + set(MD5 "9f218f0eee9d49831e7e48fd136e689c") +else() + set(REQ_URL "https://github.com/unicode-org/icu/archive/release-69-1.tar.gz") + set(MD5 "135125f633864285d637db5c01e0388b") +endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Windows") @@ -23,7 +34,7 @@ else() file(WRITE ${CMAKE_BINARY_DIR}/icu4c_filter.json ${JSON_FILE}) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") mindspore_add_pkg(icu4c - VER 67.1 + VER 69.1 LIBS ${LIB_ICU_COMMON} ${LIB_ICU_DATA} ${LIB_ICU_I18N} URL ${REQ_URL} MD5 ${MD5} @@ -34,7 +45,7 @@ else() ) else() mindspore_add_pkg(icu4c - VER 67.1 + VER 69.1 LIBS ${LIB_ICU_COMMON} ${LIB_ICU_DATA} ${LIB_ICU_I18N} URL ${REQ_URL} MD5 ${MD5} diff --git a/cmake/external_libs/opencv.cmake b/cmake/external_libs/opencv.cmake index c6abaeb7c1a..ba31da68893 100644 --- a/cmake/external_libs/opencv.cmake +++ b/cmake/external_libs/opencv.cmake @@ -21,6 +21,15 @@ else() set(opencv_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack -s") endif() +set(ENABLE_GITEE_EULER OFF) +if(ENABLE_GITEE_EULER) + set(GIT_REPOSITORY "https://gitee.com/src-openeuler/opencv.git") + set(GIT_TAG "openEuler-22.03-LTS") + set(MD5 "e2b5aa4946559d0a397148d6e1ab7284") + set(OPENCV_SRC "${TOP_DIR}/build/mindspore/_deps/opencv-src") + __download_pkg_with_git(opencv ${GIT_REPOSITORY} ${GIT_TAG} ${MD5}) + execute_process(COMMAND tar -xf ${OPENCV_SRC}/opencv-4.5.2.tar.gz --strip-components 1 -C ${OPENCV_SRC}) +else() if(ENABLE_GITEE) set(REQ_URL "https://gitee.com/mirrors/opencv/repository/archive/4.5.2.tar.gz") set(MD5 "d3141f649ab2d76595fdd8991ee15c55") @@ -28,6 +37,7 @@ else() set(REQ_URL "https://github.com/opencv/opencv/archive/4.5.2.tar.gz") set(MD5 "d3141f649ab2d76595fdd8991ee15c55") endif() +endif() if(MSVC) mindspore_add_pkg(opencv diff --git a/cmake/external_libs/sentencepiece.cmake b/cmake/external_libs/sentencepiece.cmake index ce2ea537bd8..3001f1c46f1 100644 --- a/cmake/external_libs/sentencepiece.cmake +++ b/cmake/external_libs/sentencepiece.cmake @@ -1,3 +1,12 @@ +set(ENABLE_GITEE_EULER OFF) +if(ENABLE_GITEE_EULER) + set(GIT_REPOSITORY "https://gitee.com/src-openeuler/sentencepiece.git") + set(GIT_TAG "master") + set(MD5 "4f88df28544b5f1a351f3dbf6b6413b8") + set(SENTENCEPIECE_SRC "${TOP_DIR}/build/mindspore/_deps/sentencepiece-src") + __download_pkg_with_git(sentencepiece ${GIT_REPOSITORY} ${GIT_TAG} ${MD5}) + execute_process(COMMAND tar -xf ${SENTENCEPIECE_SRC}/v0.1.92.tar.gz --strip-components 1 -C ${SENTENCEPIECE_SRC}) +else() if(ENABLE_GITEE) set(REQ_URL "https://gitee.com/mirrors/sentencepiece/repository/archive/v0.1.92.tar.gz") set(MD5 "0fc99de9f09b9184398f49647791799f") @@ -5,6 +14,7 @@ else() set(REQ_URL "https://github.com/google/sentencepiece/archive/v0.1.92.tar.gz") set(MD5 "5dfd2241914b5598a68b2a8542ed8e91") endif() +endif() if(WIN32) diff --git a/cmake/package.cmake b/cmake/package.cmake index 68784f927aa..87dbea6fa58 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -134,12 +134,12 @@ if(ENABLE_MINDDATA) install(FILES ${tinyxml2_LIBPATH}/libtinyxml2.so.8.0.0 DESTINATION ${INSTALL_LIB_DIR} RENAME libtinyxml2.so.8 COMPONENT mindspore) - install(FILES ${icu4c_LIBPATH}/libicuuc.so.67.1 - DESTINATION ${INSTALL_LIB_DIR} RENAME libicuuc.so.67 COMPONENT mindspore) - install(FILES ${icu4c_LIBPATH}/libicudata.so.67.1 - DESTINATION ${INSTALL_LIB_DIR} RENAME libicudata.so.67 COMPONENT mindspore) - install(FILES ${icu4c_LIBPATH}/libicui18n.so.67.1 - DESTINATION ${INSTALL_LIB_DIR} RENAME libicui18n.so.67 COMPONENT mindspore) + install(FILES ${icu4c_LIBPATH}/libicuuc.so.69.1 + DESTINATION ${INSTALL_LIB_DIR} RENAME libicuuc.so.69 COMPONENT mindspore) + install(FILES ${icu4c_LIBPATH}/libicudata.so.69.1 + DESTINATION ${INSTALL_LIB_DIR} RENAME libicudata.so.69 COMPONENT mindspore) + install(FILES ${icu4c_LIBPATH}/libicui18n.so.69.1 + DESTINATION ${INSTALL_LIB_DIR} RENAME libicui18n.so.69 COMPONENT mindspore) endif() if(ENABLE_CPU) diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index ad90e91aaa3..4591e8d1db1 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -343,12 +343,12 @@ if(PLATFORM_ARM64) DESTINATION ${RUNTIME_LIB_DIR} RENAME libturbojpeg.so.0 COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${tinyxml2_LIBPATH}/libtinyxml2.so.8.0.0 DESTINATION ${RUNTIME_LIB_DIR} RENAME libtinyxml2.so.8 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${icu4c_LIBPATH}/libicuuc.so.67.1 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libicuuc.so.67 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${icu4c_LIBPATH}/libicudata.so.67.1 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libicudata.so.67 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${icu4c_LIBPATH}/libicui18n.so.67.1 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libicui18n.so.67 COMPONENT ${RUNTIME_COMPONENT_NAME}) + install(FILES ${icu4c_LIBPATH}/libicuuc.so.69.1 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libicuuc.so.69 COMPONENT ${RUNTIME_COMPONENT_NAME}) + install(FILES ${icu4c_LIBPATH}/libicudata.so.69.1 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libicudata.so.69 COMPONENT ${RUNTIME_COMPONENT_NAME}) + install(FILES ${icu4c_LIBPATH}/libicui18n.so.69.1 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libicui18n.so.69 COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${grpc_LIBPATH}/libmindspore_grpc++.so.1.36.1 DESTINATION ${RUNTIME_LIB_DIR} RENAME libmindspore_grpc++.so.1 COMPONENT ${RUNTIME_COMPONENT_NAME}) install(FILES ${grpc_LIBPATH}/libmindspore_grpc.so.15.0.0 DESTINATION diff --git a/cmake/package_mac.cmake b/cmake/package_mac.cmake index 4440c66ce87..0880168c8c0 100644 --- a/cmake/package_mac.cmake +++ b/cmake/package_mac.cmake @@ -125,12 +125,12 @@ if(ENABLE_MINDDATA) install(FILES ${tinyxml2_LIBPATH}/libtinyxml2.8.0.0.dylib DESTINATION ${INSTALL_LIB_DIR} RENAME libtinyxml2.8.dylib COMPONENT mindspore) - install(FILES ${icu4c_LIBPATH}/libicuuc.67.1.dylib - DESTINATION ${INSTALL_LIB_DIR} RENAME libicuuc.67.dylib COMPONENT mindspore) - install(FILES ${icu4c_LIBPATH}/libicudata.67.1.dylib - DESTINATION ${INSTALL_LIB_DIR} RENAME libicudata.67.dylib COMPONENT mindspore) - install(FILES ${icu4c_LIBPATH}/libicui18n.67.1.dylib - DESTINATION ${INSTALL_LIB_DIR} RENAME libicui18n.67.dylib COMPONENT mindspore) + install(FILES ${icu4c_LIBPATH}/libicuuc.69.1.dylib + DESTINATION ${INSTALL_LIB_DIR} RENAME libicuuc.69.dylib COMPONENT mindspore) + install(FILES ${icu4c_LIBPATH}/libicudata.69.1.dylib + DESTINATION ${INSTALL_LIB_DIR} RENAME libicudata.69.dylib COMPONENT mindspore) + install(FILES ${icu4c_LIBPATH}/libicui18n.69.1.dylib + DESTINATION ${INSTALL_LIB_DIR} RENAME libicui18n.69.dylib COMPONENT mindspore) endif() if(ENABLE_CPU) diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/utils/ErrorCode.h b/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/utils/ErrorCode.h index 9fce58051d6..cdba29321a3 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/utils/ErrorCode.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/utils/ErrorCode.h @@ -25,8 +25,7 @@ enum { // define the error code of ACL model, this is same with the aclError which is // error code of ACL API Error codes 1~999 are reserved for the ACL. Do not // add other error codes. Add it after APP_ERR_COMMON_ERR_BASE. - APP_ERR_ACL_FAILURE = -1, // ACL: general error - APP_ERR_ACL_ERR_BASE = 0, + APP_ERR_ACL_FAILURE = -1, // ACL: general error APP_ERR_ACL_INVALID_PARAM = 1, // ACL: invalid parameter APP_ERR_ACL_BAD_ALLOC = 2, // ACL: memory allocation fail APP_ERR_ACL_RT_FAILURE = 3, // ACL: runtime failure