diff --git a/.gitmodules b/.gitmodules index 836d824a6f5a..91b770042abc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "3rdparty/dlpack"] path = 3rdparty/dlpack url = https://github.com/dmlc/dlpack -[submodule "3rdparty/openmp"] - path = 3rdparty/openmp - url = https://github.com/llvm-mirror/openmp [submodule "3rdparty/googletest"] path = 3rdparty/googletest url = https://github.com/google/googletest.git diff --git a/3rdparty/openmp b/3rdparty/openmp deleted file mode 160000 index 37c72127e903..000000000000 --- a/3rdparty/openmp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 37c72127e90360a020f351f18d9cccfc30e5145a diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c3e635682a7..0bbd60a6c5c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -370,32 +370,12 @@ endif() # ---[ OpenMP if(USE_OPENMP) find_package(OpenMP REQUIRED) - # This should build on Windows, but there's some problem and I don't have a Windows box, so - # could a Windows user please fix? - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/openmp/CMakeLists.txt - AND SYSTEM_ARCHITECTURE STREQUAL "x86_64" - AND NOT MSVC - AND NOT CMAKE_CROSSCOMPILING) - - # Intel/llvm OpenMP: https://github.com/llvm-mirror/openmp - set(OPENMP_STANDALONE_BUILD TRUE) - set(LIBOMP_ENABLE_SHARED TRUE) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/openmp) - list(REMOVE_ITEM mxnet_LINKER_LIBS iomp5) - list(APPEND mxnet_LINKER_LIBS omp) - if(UNIX) - list(APPEND mxnet_LINKER_LIBS pthread) - endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - else() - if(OPENMP_FOUND) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") - endif() - endif() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") + elseif(UNIX AND NOT ANDROID) list(APPEND mxnet_LINKER_LIBS pthread) endif()