Skip to content

Commit 70865a8

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #5180 from ywwry66/openmp_use_cmake
CMake: Pass `OpenMP` compiler and linker flags through CMake targets
2 parents f0f2747 + 251c3f8 commit 70865a8

File tree

15 files changed

+66
-68
lines changed

15 files changed

+66
-68
lines changed

‎.github/workflows/apple_m.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ jobs:
102102
mkdir build && cd build
103103
cmake -DDYNAMIC_ARCH=1 \
104104
-DUSE_OPENMP=${{matrix.openmp}} \
105+
-DOpenMP_Fortran_LIB_NAMES=omp \
105106
-DINTERFACE64=${{matrix.ilp64}} \
106107
-DNOFORTRAN=0 \
107108
-DBUILD_WITHOUT_LAPACK=0 \

‎CMakeLists.txt

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ endif()
119119

120120
message(WARNING "CMake support is experimental. It does not yet support all build options and may not produce the same Makefiles that OpenBLAS ships with.")
121121

122-
if (USE_OPENMP)
123-
find_package(OpenMP REQUIRED)
124-
endif ()
125-
126122
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
127123
include("${PROJECT_SOURCE_DIR}/cmake/system.cmake")
128124

@@ -240,6 +236,12 @@ endif ()
240236
# add objects to the openblas lib
241237
if(NOT NO_LAPACK)
242238
add_library(LAPACK_OVERRIDES OBJECT ${LA_SOURCES})
239+
if (USE_OPENMP AND (NOT NOFORTRAN))
240+
# Disable OpenMP for LAPACK Fortran codes on Windows.
241+
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
242+
target_link_libraries(LAPACK_OVERRIDES OpenMP::OpenMP_Fortran)
243+
endif()
244+
endif()
243245
list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:LAPACK_OVERRIDES>")
244246
endif()
245247
if(NOT NO_LAPACKE)
@@ -281,10 +283,18 @@ endif()
281283

282284
if (USE_OPENMP)
283285
if(BUILD_STATIC_LIBS)
284-
target_link_libraries(${OpenBLAS_LIBNAME}_static OpenMP::OpenMP_C)
286+
if(NOFORTRAN)
287+
target_link_libraries(${OpenBLAS_LIBNAME}_static OpenMP::OpenMP_C)
288+
else()
289+
target_link_libraries(${OpenBLAS_LIBNAME}_static OpenMP::OpenMP_C OpenMP::OpenMP_Fortran)
290+
endif()
285291
endif()
286292
if(BUILD_SHARED_LIBS)
287-
target_link_libraries(${OpenBLAS_LIBNAME}_shared OpenMP::OpenMP_C)
293+
if(NOFORTRAN)
294+
target_link_libraries(${OpenBLAS_LIBNAME}_shared OpenMP::OpenMP_C)
295+
else()
296+
target_link_libraries(${OpenBLAS_LIBNAME}_shared OpenMP::OpenMP_C OpenMP::OpenMP_Fortran)
297+
endif()
288298
endif()
289299
endif()
290300

‎cmake/arch.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,6 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
3131
set(CCOMMON_OPT "${CCOMMON_OPT} -wd981")
3232
endif ()
3333

34-
if (USE_OPENMP)
35-
# USE_SIMPLE_THREADED_LEVEL3 = 1
36-
# NO_AFFINITY = 1
37-
find_package(OpenMP REQUIRED)
38-
if (OpenMP_FOUND)
39-
set(CCOMMON_OPT "${CCOMMON_OPT} ${OpenMP_C_FLAGS} -DUSE_OPENMP")
40-
set(FCOMMON_OPT "${FCOMMON_OPT} ${OpenMP_Fortran_FLAGS}")
41-
endif()
42-
endif ()
43-
44-
4534
if (DYNAMIC_ARCH)
4635
if (ARM64)
4736
set(DYNAMIC_CORE ARMV8 CORTEXA53 CORTEXA57 THUNDERX THUNDERX2T99 TSV110 EMAG8180 NEOVERSEN1 THUNDERX3T110)

‎cmake/fc.cmake

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (${F_COMPILER} STREQUAL "FLANG" AND NOT CMAKE_Fortran_COMPILER_ID STREQUAL "L
77
# This is for classic Flang. LLVM Flang is handled with gfortran below.
88
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FLANG")
99
if (USE_OPENMP)
10-
set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
10+
set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "OpenMP Fortran compiler flags")
1111
endif ()
1212
set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive -Kieee")
1313
endif ()
@@ -117,7 +117,7 @@ if (${F_COMPILER} STREQUAL "GFORTRAN" OR ${F_COMPILER} STREQUAL "F95" OR CMAKE_F
117117
endif ()
118118

119119
if (USE_OPENMP)
120-
set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
120+
set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "OpenMP Fortran compiler flags")
121121
endif ()
122122
endif ()
123123

@@ -128,14 +128,14 @@ if (${F_COMPILER} STREQUAL "INTEL" OR CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
128128
endif ()
129129
set(FCOMMON_OPT "${FCOMMON_OPT} -recursive -fp-model=consistent")
130130
if (USE_OPENMP)
131-
set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
131+
set(OpenMP_Fortran_FLAGS "-openmp" CACHE STRING "OpenMP Fortran compiler flags")
132132
endif ()
133133
endif ()
134134

135135
if (${F_COMPILER} STREQUAL "FUJITSU")
136136
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FUJITSU")
137137
if (USE_OPENMP)
138-
set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
138+
set(OpenMP_Fortran_FLAGS "-openmp" CACHE STRING "OpenMP Fortran compiler flags")
139139
endif ()
140140
endif ()
141141

@@ -151,7 +151,7 @@ if (${F_COMPILER} STREQUAL "IBM")
151151
set(FCOMMON_OPT "${FCOMMON_OPT} -q32")
152152
endif ()
153153
if (USE_OPENMP)
154-
set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
154+
set(OpenMP_Fortran_FLAGS "-openmp" CACHE STRING "OpenMP Fortran compiler flags")
155155
endif ()
156156
endif ()
157157

@@ -168,7 +168,7 @@ if (${F_COMPILER} STREQUAL "PGI" OR ${F_COMPILER} STREQUAL "PGF95")
168168
endif ()
169169
set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive")
170170
if (USE_OPENMP)
171-
set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
171+
set(OpenMP_Fortran_FLAGS "-mp" CACHE STRING "OpenMP Fortran compiler flags")
172172
endif ()
173173
endif ()
174174

@@ -195,7 +195,7 @@ if (${F_COMPILER} STREQUAL "PATHSCALE")
195195
endif ()
196196

197197
if (USE_OPENMP)
198-
set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
198+
set(OpenMP_Fortran_FLAGS "-mp" CACHE STRING "OpenMP Fortran compiler flags")
199199
endif ()
200200
endif ()
201201

@@ -233,7 +233,7 @@ if (${F_COMPILER} STREQUAL "OPEN64")
233233

234234
if (USE_OPENMP)
235235
set(FEXTRALIB "${FEXTRALIB} -lstdc++")
236-
set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
236+
set(OpenMP_Fortran_FLAGS "-mp" CACHE STRING "OpenMP Fortran compiler flags")
237237
endif ()
238238
endif ()
239239

@@ -245,14 +245,14 @@ if (${F_COMPILER} STREQUAL "SUN")
245245
set(FCOMMON_OPT "${FCOMMON_OPT} -m64")
246246
endif ()
247247
if (USE_OPENMP)
248-
set(FCOMMON_OPT "${FCOMMON_OPT} -xopenmp=parallel")
248+
set(OpenMP_Fortran_FLAGS "-xopenmp=parallel" CACHE STRING "OpenMP Fortran compiler flags")
249249
endif ()
250250
endif ()
251251

252252
if (${F_COMPILER} STREQUAL "COMPAQ")
253253
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_COMPAQ")
254254
if (USE_OPENMP)
255-
set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
255+
set(OpenMP_Fortran_FLAGS "-openmp" CACHE STRING "OpenMP Fortran compiler flags")
256256
endif ()
257257
endif ()
258258

@@ -265,7 +265,7 @@ if (${F_COMPILER} STREQUAL "CRAY")
265265
if (NOT USE_OPENMP)
266266
set(FCOMMON_OPT "${FCOMMON_OPT} -fno-openmp")
267267
else ()
268-
set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
268+
set(OpenMP_Fortran_FLAGS "-fopenmp" CACHE STRING "OpenMP Fortran compiler flags")
269269
endif ()
270270
endif ()
271271

@@ -290,7 +290,7 @@ if (${F_COMPILER} STREQUAL "NAGFOR")
290290
# -w=unused: Suppress warning messages about unused variables
291291
set(FCOMMON_OPT "${FCOMMON_OPT} -w=x77 -w=ques -w=unused")
292292
if (USE_OPENMP)
293-
set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
293+
set(OpenMP_Fortran_FLAGS "-openmp" CACHE STRING "OpenMP Fortran compiler flags")
294294
endif ()
295295
endif ()
296296

‎cmake/system.cmake

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,20 @@ else ()
372372
endif ()
373373
endif ()
374374

375+
if (USE_OPENMP)
376+
find_package(OpenMP COMPONENTS C REQUIRED)
377+
set(CCOMMON_OPT "${CCOMMON_OPT} -DUSE_OPENMP")
378+
if (NOT NOFORTRAN)
379+
find_package(OpenMP COMPONENTS Fortran REQUIRED)
380+
# Avoid mixed OpenMP linkage
381+
get_target_property(OMP_C_LIB OpenMP::OpenMP_C INTERFACE_LINK_LIBRARIES)
382+
get_target_property(OMP_Fortran_LIB OpenMP::OpenMP_Fortran INTERFACE_LINK_LIBRARIES)
383+
if (NOT OMP_C_LIB STREQUAL OMP_Fortran_LIB)
384+
message(FATAL_ERROR "Multiple OpenMP runtime libraries detected. Mixed OpenMP runtime linkage is dangerous. You may pass -DOpenMP_LANG_LIB_NAMES and -DOpenMP_omp_LIBRARY to manually choose the OpenMP library.")
385+
endif()
386+
endif ()
387+
endif ()
388+
375389
if (BINARY64)
376390
if (INTERFACE64)
377391
# CCOMMON_OPT += -DUSE64BITINT
@@ -655,15 +669,6 @@ if (LAPACK_STRLEN)
655669
endif()
656670
set(LAPACK_FPFLAGS "${LAPACK_FPFLAGS} ${FPFLAGS}")
657671

658-
#Disable -fopenmp for LAPACK Fortran codes on Windows.
659-
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
660-
set(FILTER_FLAGS "-fopenmp;-mp;-openmp;-xopenmp=parallel")
661-
foreach (FILTER_FLAG ${FILTER_FLAGS})
662-
string(REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS})
663-
string(REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS})
664-
endforeach ()
665-
endif ()
666-
667672
if (CMAKE_Fortran_COMPILER)
668673
if ("${F_COMPILER}" STREQUAL "NAGFOR" OR "${F_COMPILER}" STREQUAL "CRAY" OR CMAKE_Fortran_COMPILER_ID MATCHES "LLVMFlang.*")
669674
set(FILTER_FLAGS "-msse3;-mssse3;-msse4.1;-mavx;-mavx2,-mskylake-avx512")

‎ctest/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ else()
4444
c_${float_char}blas1.c)
4545
endif()
4646
target_link_libraries(x${float_char}cblat1 ${OpenBLAS_LIBNAME})
47-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
48-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
49-
target_link_libraries(x${float_char}cblat1 omp pthread)
50-
endif()
5147
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
5248
target_link_libraries(x${float_char}cblat1 m)
5349
endif()
@@ -73,10 +69,6 @@ else()
7369
constant.c)
7470
endif()
7571
target_link_libraries(x${float_char}cblat2 ${OpenBLAS_LIBNAME})
76-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
77-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
78-
target_link_libraries(x${float_char}cblat2 omp pthread)
79-
endif()
8072
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
8173
target_link_libraries(x${float_char}cblat2 m)
8274
endif()
@@ -124,20 +116,12 @@ else()
124116
endif()
125117
endif()
126118
target_link_libraries(x${float_char}cblat3 ${OpenBLAS_LIBNAME})
127-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
128-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
129-
target_link_libraries(x${float_char}cblat3 omp pthread)
130-
endif()
131119
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
132120
target_link_libraries(x${float_char}cblat3 m)
133121
endif()
134122
if (USE_GEMM3M)
135123
if ((${float_char} STREQUAL "c") OR (${float_char} STREQUAL "z"))
136124
target_link_libraries(x${float_char}cblat3_3m ${OpenBLAS_LIBNAME})
137-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
138-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
139-
target_link_libraries(x${float_char}cblat3 omp pthread)
140-
endif()
141125
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "QNX")
142126
target_link_libraries(x${float_char}cblat3_3m m)
143127
endif()

‎driver/level2/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,7 @@ if (USE_THREAD)
223223
endif ()
224224

225225
add_library(driver_level2 OBJECT ${OPENBLAS_SRC})
226+
227+
if (USE_OPENMP)
228+
target_link_libraries(driver_level2 OpenMP::OpenMP_C)
229+
endif()

‎driver/level3/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,7 @@ endforeach ()
171171
#
172172

173173
add_library(driver_level3 OBJECT ${OPENBLAS_SRC})
174+
175+
if (USE_OPENMP)
176+
target_link_libraries(driver_level3 OpenMP::OpenMP_C)
177+
endif()

‎driver/others/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,7 @@ endif ()
8888
#endif
8989

9090
add_library(driver_others OBJECT ${OPENBLAS_SRC} ${MEMORY} ${SMP_SOURCES} ${COMMON_SOURCES})
91+
92+
if (USE_OPENMP)
93+
target_link_libraries(driver_others OpenMP::OpenMP_C)
94+
endif()

‎interface/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,3 +250,7 @@ if ( BUILD_COMPLEX16 AND NOT BUILD_DOUBLE)
250250
endif ()
251251

252252
add_library(interface OBJECT ${OPENBLAS_SRC})
253+
254+
if (USE_OPENMP)
255+
target_link_libraries(interface OpenMP::OpenMP_C)
256+
endif()

‎kernel/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,6 +1364,9 @@ endif ()
13641364
if (USE_GEMM3M)
13651365
target_compile_definitions(kernel${TSUFFIX} PRIVATE USE_GEMM3M)
13661366
endif()
1367+
if (USE_OPENMP)
1368+
target_link_libraries(kernel${TSUFFIX} OpenMP::OpenMP_C)
1369+
endif()
13671370
endfunction ()
13681371

13691372

‎lapack-netlib/TESTING/EIG/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ set(ZDMDEIGTST zchkdmd.f90)
107107
macro(add_eig_executable name)
108108
add_executable(${name} ${ARGN})
109109
target_link_libraries(${name} ${LIBNAMEPREFIX}openblas${LIBNAMESUFFIX}${SUFFIX64_UNDERSCORE})
110-
111-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
112-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
113-
target_link_libraries(${name} omp pthread)
114-
endif()
115-
116110
#${TMGLIB} ../${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
117111
endmacro()
118112

‎lapack-netlib/TESTING/LIN/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,6 @@ set(ZLINTSTRFP zchkrfp.f zdrvrfp.f zdrvrf1.f zdrvrf2.f zdrvrf3.f zdrvrf4.f zerrr
240240
macro(add_lin_executable name)
241241
add_executable(${name} ${ARGN})
242242
target_link_libraries(${name} ${LIBNAMEPREFIX}openblas${LIBNAMESUFFIX}${SUFFIX64_UNDERSCORE})
243-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
244-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
245-
target_link_libraries(${name} omp pthread)
246-
endif()
247243
#${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
248244
endmacro()
249245

‎lapack/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,7 @@ GenerateCombinationObjects("${UNIT_SOURCES}" "UNIT" "N" "" 4)
117117
GenerateCombinationObjects("${UNIT_SOURCES2}" "UNIT" "N" "" 0 "" "" 3)
118118

119119
add_library(lapack OBJECT ${OPENBLAS_SRC})
120+
121+
if (USE_OPENMP)
122+
target_link_libraries(lapack OpenMP::OpenMP_C)
123+
endif()

‎test/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ endif ()
3434
foreach(test_bin ${OpenBLAS_Tests})
3535
add_executable(${test_bin} ${test_bin}.f)
3636
target_link_libraries(${test_bin} ${OpenBLAS_LIBNAME})
37-
if (USE_OPENMP AND (${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU) AND (${CMAKE_C_COMPILER_ID} STREQUAL Clang))
38-
string(REGEX REPLACE "-fopenmp" "" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
39-
target_link_libraries(${test_bin} omp pthread)
40-
endif()
4137
endforeach()
4238

4339
# $1 exec, $2 input, $3 output_result

0 commit comments

Comments
 (0)