diff --git a/cmake/external_libs/robin.cmake b/cmake/external_libs/robin.cmake deleted file mode 100644 index ea1c9dd0c458532e25ec7bb719171d2024993d4e..0000000000000000000000000000000000000000 --- a/cmake/external_libs/robin.cmake +++ /dev/null @@ -1,19 +0,0 @@ -if(ENABLE_GITEE OR ENABLE_GITEE_EULER) # Channel GITEE_EULER is NOT supported now, use GITEE instead. - set(REQ_URL "https://gitee.com/mirrors/robin-hood-hashing/repository/archive/3.11.5.zip") - set(SHA256 "8d1f5d5ee447e5827032d1eb8b1609134618b1cc5c5bcadfcbfed99a2d3583d4") -else() - set(REQ_URL "https://github.com/martinus/robin-hood-hashing/archive/3.11.5.zip") - set(SHA256 "7aa183252527ded7f46186c1e2f4efe7d6139a3b7c0869c1b6051bd7260587ed") -endif() -set(INCLUDE "./src") - -mindspore_add_pkg(robin_hood_hashing - VER 3.11.5 - HEAD_ONLY ${INCLUDE} - URL ${REQ_URL} - SHA256 ${SHA256} - PATCHES ${TOP_DIR}/third_party/patch/robin_hood_hashing/0001-fix-unused-var-warning.patch - PATCHES ${TOP_DIR}/third_party/patch/robin_hood_hashing/0002-fix-string-isflat-symbol.patch - ) - -include_directories(${robin_hood_hashing_INC}) diff --git a/mindspore-lite/CMakeLists.txt b/mindspore-lite/CMakeLists.txt index c497ee12a09a0839cfdf1cdab3d2a72e29f94e52..5316b5c31c00c924a3f575998b671f3476ffaff8 100644 --- a/mindspore-lite/CMakeLists.txt +++ b/mindspore-lite/CMakeLists.txt @@ -311,9 +311,6 @@ endif() if(DEFINED ENV{ENABLE_FAST_HASH_TABLE}) add_compile_definitions(ENABLE_FAST_HASH_TABLE) - if(NOT MSLITE_TARGET_SITEAI) - set(MSLITE_DEPS_ROBIN_HOOD_HASHING on) - endif() endif() if(DEFINED ENV{MSLITE_ENABLE_MODEL_OBF}) diff --git a/mindspore-lite/cmake/ccsrc_module.cmake b/mindspore-lite/cmake/ccsrc_module.cmake index 6283cf57f36c320dbef8169df72d2d7645403025..50fc577713d5a9160dbace84ddb37fb186b2a023 100644 --- a/mindspore-lite/cmake/ccsrc_module.cmake +++ b/mindspore-lite/cmake/ccsrc_module.cmake @@ -16,7 +16,6 @@ message(${COMM_PROTO_IN}) ms_protobuf_generate(COMM_PROTO_SRCS COMM_PROTO_HDRS ${COMM_PROTO_IN}) list(APPEND MINDSPORE_PROTO_LIST ${COMM_PROTO_SRCS}) -include(${TOP_DIR}/cmake/external_libs/robin.cmake) include(${TOP_DIR}/cmake/external_libs/eigen.cmake) include(${TOP_DIR}/cmake/external_libs/mkl_dnn.cmake) diff --git a/mindspore-lite/cmake/lite_dependences.cmake b/mindspore-lite/cmake/lite_dependences.cmake index 295a51cd781fd3234c2722e2f967b45e80cc3cb8..77fee4d08d005e880c915d1e7dd9cd37ecdfb2a0 100644 --- a/mindspore-lite/cmake/lite_dependences.cmake +++ b/mindspore-lite/cmake/lite_dependences.cmake @@ -2,10 +2,6 @@ set(MINDSPORE_PROJECT_DIR ${TOP_DIR}) find_required_package(Patch) -if(MSLITE_DEPS_ROBIN_HOOD_HASHING) - include(${TOP_DIR}/cmake/external_libs/robin.cmake) -endif() - if(MSLITE_DEPS_FLATBUFFERS) include(${TOP_DIR}/cmake/external_libs/flatbuffers.cmake) endif() diff --git a/mindspore-lite/providers/siteai/CMakeLists.txt b/mindspore-lite/providers/siteai/CMakeLists.txt index dccb9942a6eaa4f05c78935da7b2f6d1fb55a301..a30235b2ec8e806b311de2a0000728ac885bb82d 100644 --- a/mindspore-lite/providers/siteai/CMakeLists.txt +++ b/mindspore-lite/providers/siteai/CMakeLists.txt @@ -3,7 +3,6 @@ project(SiteAi) ##disable external libs set(MSLITE_DEPS_PYBIND11 on CACHE INTERNAL "setting MSLITE_DEPS_PYBIND11 value") -set(MSLITE_DEPS_ROBIN_HOOD_HASHING off CACHE INTERNAL "setting MSLITE_DEPS_ROBIN_HOOD_HASHING value") set(MSLITE_DEPS_MKLDNN off CACHE INTERNAL "setting MSLITE_DEPS_MKLDNN value") set(MSLITE_DEPS_LIBEVENT off CACHE INTERNAL "setting MSLITE_DEPS_LIBEVENT value") set(MSLITE_DEPS_OPENSSL off CACHE INTERNAL "setting MSLITE_DEPS_OPENSSL value") diff --git a/third_party/patch/robin_hood_hashing/0001-fix-unused-var-warning.patch b/third_party/patch/robin_hood_hashing/0001-fix-unused-var-warning.patch deleted file mode 100644 index 54b7857e253be93be0cd24de67d7d82e2be05be7..0000000000000000000000000000000000000000 --- a/third_party/patch/robin_hood_hashing/0001-fix-unused-var-warning.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/include/robin_hood.h b/src/include/robin_hood.h ---- a/src/include/robin_hood.h -+++ b/src/include/robin_hood.h -@@ -2541,4 +2541,56 @@ using unordered_set = detail::Table -+struct tuple_size> : std::integral_constant {}; -+ -+template -+struct tuple_element> { -+ typedef typename std::conditional::type type; -+}; -+} // namespace std -+ -+namespace robin_hood { -+template -+typename std::enable_if::type get(robin_hood::pair &p) { -+ return p.first; -+} -+ -+template -+typename std::enable_if::type get(robin_hood::pair &p) { -+ return p.second; -+} -+ -+template -+typename std::enable_if::type get(const robin_hood::pair &p) { -+ return p.first; -+} -+ -+template -+typename std::enable_if::type get(const robin_hood::pair &p) { -+ return p.second; -+} -+ -+template -+typename std::enable_if::type get(robin_hood::pair &&p) { -+ return std::move(p.first); -+} -+ -+template -+typename std::enable_if::type get(robin_hood::pair &&p) { -+ return std::move(p.second); -+} -+ -+template -+typename std::enable_if::type get(const robin_hood::pair &&p) { -+ return std::move(p.first); -+} -+ -+template -+typename std::enable_if::type get(const robin_hood::pair &&p) { -+ return std::move(p.second); -+} -+} // namespace robin_hood -+ - #endif diff --git a/third_party/patch/robin_hood_hashing/0002-fix-string-isflat-symbol.patch b/third_party/patch/robin_hood_hashing/0002-fix-string-isflat-symbol.patch deleted file mode 100644 index f2cb59f16bb9db7ba43c2aa7b4abe9b336ab0bf3..0000000000000000000000000000000000000000 --- a/third_party/patch/robin_hood_hashing/0002-fix-string-isflat-symbol.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/include/robin_hood.h b/src/include/robin_hood.h ---- a/src/include/robin_hood.h -+++ b/src/include/robin_hood.h -@@ -2519,7 +2519,8 @@ - using unordered_map = - detail::Table) <= sizeof(size_t) * 6 && - std::is_nothrow_move_constructible>::value && -- std::is_nothrow_move_assignable>::value, -+ std::is_nothrow_move_assignable>::value && -+ !std::is_same::value, - MaxLoadFactor100, Key, T, Hash, KeyEqual>; - - // set