Skip to content

Commit 1cbd8f3

Browse files
authored
Move some DYNAMIC_ARCH targets to new DYNAMIC_OLDER option
1 parent 6c2d90b commit 1cbd8f3

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

cmake/arch.cmake

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,18 @@ if (DYNAMIC_ARCH)
4949
endif ()
5050

5151
if (X86_64)
52-
set(DYNAMIC_CORE PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO)
52+
set(DYNAMIC_CORE PRESCOTT CORE2)
53+
if (DYNAMIC_OLDER)
54+
set (DYNAMIC_CORE ${DYNAMIC_CORE} PENRYN DUNNINGTON)
55+
endif ()
56+
set (DYNAMIC_CORE ${DYNAMIC_CORE} NEHALEM)
57+
if (DYNAMIC_OLDER)
58+
set (DYNAMIC_CORE ${DYNAMIC_CORE} OPTERON OPTERON_SSE3)
59+
endif ()
60+
set (DYNAMIC_CORE ${DYNAMIC_CORE} BARCELONA)
61+
if (DYNAMIC_OLDER)
62+
set (DYNAMIC_CORE ${DYNAMIC_CORE} BOBCAT ATOM NANO)
63+
endif ()
5364
if (NOT NO_AVX)
5465
set(DYNAMIC_CORE ${DYNAMIC_CORE} SANDYBRIDGE BULLDOZER PILEDRIVER STEAMROLLER EXCAVATOR)
5566
endif ()

cmake/openblas.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
22
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
33

4-
openblas_config=USE_64BITINT=@USE_64BITINT@ NO_CBLAS=@NO_CBLAS@ NO_LAPACK=@NO_LAPACK@ NO_LAPACKE=@NO_LAPACKE@ DYNAMIC_ARCH=@DYNAMIC_ARCH@ NO_AFFINITY=@NO_AFFINITY@ USE_OPENMP=@USE_OPENMP@ @CORE@ MAX_THREADS=@NUM_THREADS@
4+
openblas_config=USE_64BITINT=@USE_64BITINT@ NO_CBLAS=@NO_CBLAS@ NO_LAPACK=@NO_LAPACK@ NO_LAPACKE=@NO_LAPACKE@ DYNAMIC_ARCH=@DYNAMIC_ARCH@ DYNAMIC_OLDER=@DYNAMIC_OLDER@ NO_AFFINITY=@NO_AFFINITY@ USE_OPENMP=@USE_OPENMP@ @CORE@ MAX_THREADS=@NUM_THREADS@
55
Name: OpenBLAS
66
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version
77
Version: @OPENBLAS_VERSION@

cmake/system.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ endif ()
163163

164164
if (DYNAMIC_ARCH)
165165
set(CCOMMON_OPT "${CCOMMON_OPT} -DDYNAMIC_ARCH")
166+
if (DYNAMIC_OLDER)
167+
set(CCOMMON_OPT "${CCOMMON_OPT} -DDYNAMIC_OLDER")
168+
endif ()
166169
endif ()
167170

168171
if (NO_LAPACK)

0 commit comments

Comments
 (0)