Merge pull request #201 from BioDataAnalysis/bda_generalize_openmp

Generalize OpenMP requirement on all platforms
Xtra-Computing · Feb 8, 2020 · 7d83817 · 7d83817
2 parents d92c232 + 9ef5357
commit 7d83817
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,13 +20,9 @@ endif()
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif ()
-find_package(Threads REQUIRED QUIET)
-find_package(OpenMP REQUIRED QUIET)
+find_package(Threads)
+find_package(OpenMP REQUIRED)
 add_definitions("-DELPP_NO_LOG_TO_FILE")
-if (OPENMP_FOUND)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif ()
 
 if (USE_CUDA AND USE_EIGEN)
     message (FATAL_ERROR "CUDA and Eigen are mutually exclusive. Please specify either USE_CUDA or USE_EIGEN, not both.")

diff --git a/cmake/thundersvmConfig.cmake.in b/cmake/thundersvmConfig.cmake.in
@@ -1,5 +1,7 @@
 @PACKAGE_INIT@
 
+find_dependency(OpenMP)
+
 if (@USE_EIGEN@)
     if (@Eigen3_FOUND@)
         find_dependency(Eigen3)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -21,4 +21,4 @@ if (USE_CUDA)
 else ()
     add_executable(${PROJECT_TEST_NAME} ${TEST_SRC})
 endif ()
-target_link_libraries(${PROJECT_TEST_NAME} ${PROJECT_LIB_NAME} ${LINK_LIBRARY} ${GTEST_LIBRARIES})
+target_link_libraries(${PROJECT_TEST_NAME} ${PROJECT_LIB_NAME} ${LINK_LIBRARY} ${GTEST_LIBRARIES} OpenMP::OpenMP_CXX)
diff --git a/src/thundersvm/CMakeLists.txt b/src/thundersvm/CMakeLists.txt
@@ -11,16 +11,14 @@ if (USE_CUDA)
     file(GLOB SRC_KERNEL kernel/*.cu)
     list(APPEND SRC ${SRC_KERNEL})
     cuda_add_library(${PROJECT_LIB_NAME} ${SRC})
-    target_link_libraries(${PROJECT_LIB_NAME} ${CUDA_cusparse_LIBRARY})
+    target_link_libraries(${PROJECT_LIB_NAME} ${CUDA_cusparse_LIBRARY} OpenMP::OpenMP_CXX)
     cuda_add_executable(${PROJECT_NAME}-train thundersvm-train.cpp ${COMMON_INCLUDES})
     cuda_add_executable(${PROJECT_NAME}-predict thundersvm-predict.cpp ${COMMON_INCLUDES})
 else ()
     file(GLOB SRC_KERNEL kernel/*.cpp)
     list(APPEND SRC ${SRC_KERNEL})
     add_library(${PROJECT_LIB_NAME} ${SRC})
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        target_link_libraries(${PROJECT_LIB_NAME} OpenMP::OpenMP_CXX)
-    endif()
+    target_link_libraries(${PROJECT_LIB_NAME} OpenMP::OpenMP_CXX)
     add_executable(${PROJECT_NAME}-train thundersvm-train.cpp ${COMMON_INCLUDES})
     add_executable(${PROJECT_NAME}-predict thundersvm-predict.cpp ${COMMON_INCLUDES})
 endif ()