Skip to content

Commit 37858d1

Browse files
committed
Fix threading usage in CMake: s/SMP/USE_THREAD/
1 parent 6aac065 commit 37858d1

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

driver/level2/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ GenerateNamedObjects("zgbmv_k.c" "TRANS;CONJ;XCONJ" "gbmv_d" false "" "" "" 2)
7373
# special defines for complex
7474
foreach (float_type ${FLOAT_TYPES})
7575

76-
if (SMP)
76+
if (USE_THREAD)
7777
GenerateNamedObjects("gemv_thread.c" "" "gemv_thread_n" false "" "" false ${float_type})
7878
GenerateNamedObjects("gemv_thread.c" "TRANSA" "gemv_thread_t" false "" "" false ${float_type})
7979

@@ -107,7 +107,7 @@ foreach (float_type ${FLOAT_TYPES})
107107
GenerateNamedObjects("z${ulvm_source}" "LOWER;HEMVREV" "${op_name}_M" false "" "" false ${float_type})
108108
endforeach()
109109

110-
if (SMP)
110+
if (USE_THREAD)
111111

112112
GenerateNamedObjects("gemv_thread.c" "CONJ" "gemv_thread_r" false "" "" false ${float_type})
113113
GenerateNamedObjects("gemv_thread.c" "CONJ;TRANSA" "gemv_thread_c" false "" "" false ${float_type})
@@ -186,7 +186,7 @@ foreach (float_type ${FLOAT_TYPES})
186186
GenerateCombinationObjects("${l_source}" "UNIT" "N" "TRANSA" 0 "${op_name}_TU" false ${float_type})
187187
endforeach ()
188188

189-
if (SMP)
189+
if (USE_THREAD)
190190
GenerateNamedObjects("ger_thread.c" "" "" false "" "" false ${float_type})
191191
foreach(nu_smp_source ${NU_SMP_SOURCES})
192192
string(REGEX MATCH "[a-z]+_[a-z]+" op_name ${nu_smp_source})
@@ -197,7 +197,7 @@ foreach (float_type ${FLOAT_TYPES})
197197
endif ()
198198
endforeach ()
199199

200-
if (SMP)
200+
if (USE_THREAD)
201201
GenerateCombinationObjects("${UL_SMP_SOURCES}" "LOWER" "U" "" 2)
202202
endif ()
203203

driver/level3/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(GEMM_COMPLEX_DEFINES RN CN RT CT NR TR RR CR NC TC RC CC)
99
foreach (GEMM_DEFINE ${GEMM_DEFINES})
1010
string(TOLOWER ${GEMM_DEFINE} GEMM_DEFINE_LC)
1111
GenerateNamedObjects("gemm.c" "${GEMM_DEFINE}" "gemm_${GEMM_DEFINE_LC}" 0)
12-
if (SMP AND NOT USE_SIMPLE_THREADED_LEVEL3)
12+
if (USE_THREAD AND NOT USE_SIMPLE_THREADED_LEVEL3)
1313
GenerateNamedObjects("gemm.c" "${GEMM_DEFINE};THREADED_LEVEL3" "gemm_thread_${GEMM_DEFINE_LC}" 0)
1414
endif ()
1515
endforeach ()
@@ -32,7 +32,7 @@ GenerateCombinationObjects("syrk_k.c" "LOWER;TRANS" "U;N" "" 1)
3232
GenerateCombinationObjects("syr2k_k.c" "LOWER;TRANS" "U;N" "" 1)
3333
GenerateCombinationObjects("syrk_kernel.c" "LOWER" "U" "" 2)
3434
GenerateCombinationObjects("syr2k_kernel.c" "LOWER" "U" "" 2)
35-
if (SMP)
35+
if (USE_THREAD)
3636

3737
# N.B. these do NOT have a float type (e.g. DOUBLE) defined!
3838
GenerateNamedObjects("gemm_thread_m.c;gemm_thread_n.c;gemm_thread_mn.c;gemm_thread_variable.c;syrk_thread.c" "" "" 0 "" "" 1)
@@ -71,7 +71,7 @@ foreach (float_type ${FLOAT_TYPES})
7171
GenerateNamedObjects("zher2k_k.c" "HER2K;LOWER" "her2k_LN" false "" "" false ${float_type})
7272
GenerateNamedObjects("zher2k_k.c" "HER2K;LOWER;TRANS;CONJ" "her2k_LC" false "" "" false ${float_type})
7373

74-
if (SMP AND NOT USE_SIMPLE_THREADED_LEVEL3)
74+
if (USE_THREAD AND NOT USE_SIMPLE_THREADED_LEVEL3)
7575
#herk
7676
GenerateCombinationObjects("zherk_k.c" "LOWER" "U" "HERK;THREADED_LEVEL3" 3 "herk_thread_N" false ${float_type})
7777
GenerateCombinationObjects("zherk_k.c" "LOWER" "U" "HERK;THREADED_LEVEL3;TRANS;CONJ" 3 "herk_thread_C" false ${float_type})
@@ -93,7 +93,7 @@ foreach (float_type ${FLOAT_TYPES})
9393
if(USE_GEMM3M)
9494
GenerateNamedObjects("gemm3m.c" "${gemm_define}" "gemm3m_${gemm_define_LC}" false "" "" false ${float_type})
9595
endif()
96-
if (SMP AND NOT USE_SIMPLE_THREADED_LEVEL3)
96+
if (USE_THREAD AND NOT USE_SIMPLE_THREADED_LEVEL3)
9797
GenerateNamedObjects("gemm.c" "${gemm_define};THREADED_LEVEL3" "gemm_thread_${gemm_define_LC}" false "" "" false ${float_type})
9898
if(USE_GEMM3M)
9999
GenerateNamedObjects("gemm3m.c" "${gemm_define};THREADED_LEVEL3" "gemm3m_thread_${gemm_define_LC}" false "" "" false ${float_type})
@@ -106,7 +106,7 @@ foreach (float_type ${FLOAT_TYPES})
106106
foreach (GEMM_DEFINE ${GEMM_DEFINES})
107107
string(TOLOWER ${GEMM_DEFINE} GEMM_DEFINE_LC)
108108
GenerateNamedObjects("gemm3m.c" "${GEMM_DEFINE}" "gemm3m_${GEMM_DEFINE_LC}" false "" "" false ${float_type})
109-
if (SMP AND NOT USE_SIMPLE_THREADED_LEVEL3)
109+
if (USE_THREAD AND NOT USE_SIMPLE_THREADED_LEVEL3)
110110
GenerateNamedObjects("gemm3m.c" "${GEMM_DEFINE};THREADED_LEVEL3" "gemm3m_thread_${GEMM_DEFINE_LC}" false "" "" false ${float_type})
111111
endif ()
112112
endforeach ()

driver/others/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ else ()
77
set(MEMORY memory.c)
88
endif ()
99

10-
if (SMP)
10+
if (USE_THREAD)
1111

1212
if (USE_OPENMP)
1313
set(BLAS_SERVER blas_server_omp.c)

lapack/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ GenerateNamedObjects("${LAPACK_MANGLED_SOURCES}" "" "" false "" "" false 3)
4646
GenerateNamedObjects("laswp/generic/laswp_k.c" "" "laswp_plus" false "" "" false 3)
4747
GenerateNamedObjects("laswp/generic/laswp_k.c" "MINUS" "laswp_minus" false "" "" false 3)
4848

49-
if (SMP)
49+
if (USE_THREAD)
5050

5151
if (USE_OPENMP)
5252
set(GETRF_SRC getrf/getrf_parallel_omp.c)

0 commit comments

Comments
 (0)