Skip to content

Commit 6150c42

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
typo in cmake variables
1 parent 77c2430 commit 6150c42

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎CHOLMOD/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
3838
${PROJECT_SOURCE_DIR}/cmake_modules
3939
${PROJECT_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
4040

41-
option ( SUITESPARSE_USE_CUDA "ON (default): enable CUDA acceleration for SuiteSparse, OFF: do not use CUDA" ON )
42-
option ( CHOLMOD_USE_CUDA "ON (default): enable CUDA acceleration for CHOLMOD, OFF: do not use CUDA" ON )
43-
option ( CHOLMOD_GPL "ON (default): enable GPL-licensed modules, OFF: do not use any CHOLMOD GPL-licensed modules" ON )
41+
include ( SuiteSparsePolicy )
4442

43+
option ( CHOLMOD_USE_CUDA "ON (default): enable CUDA acceleration for CHOLMOD, OFF: do not use CUDA" ${SUITESPARSE_USE_CUDA} )
44+
option ( CHOLMOD_GPL "ON (default): enable GPL-licensed modules, OFF: do not use any CHOLMOD GPL-licensed modules" ON )
4545
if ( NOT CHOLMOD_GPL )
4646
# CHOLMOD_GPL: if OFF, do not include any GPL-licensed module
4747
set ( CHOLMOD_MATRIXOPS OFF )
@@ -51,8 +51,6 @@ if ( NOT CHOLMOD_GPL )
5151
add_compile_definitions ( NGPL )
5252
endif ( )
5353

54-
include ( SuiteSparsePolicy )
55-
5654
include ( CheckTypeSize )
5755
check_type_size ( "ssize_t" SSIZE_T )
5856
if ( NOT HAVE_SSIZE_T )

‎GraphBLAS/cmake_modules/SuiteSparsePolicy.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ endif ( )
259259
# find CUDA
260260
#-------------------------------------------------------------------------------
261261

262+
option ( SUITESPARSE_USE_CUDA "Enable CUDA acceleration for SuiteSparse" ON )
262263
if ( SUITESPARSE_USE_CUDA AND NOT MSVC )
263264

264265
# try finding CUDA
@@ -276,26 +277,26 @@ if ( SUITESPARSE_USE_CUDA AND NOT MSVC )
276277
if ( CUDAToolkit_VERSION VERSION_LESS "11.2" )
277278
# CUDA is present but too old
278279
message ( STATUS "CUDA: not enabled (CUDA 11.2 or later required)" )
279-
set ( SUITSPARSE_HAS_CUDA OFF )
280+
set ( SUITESPARSE_HAS_CUDA OFF )
280281
else ( )
281282
# CUDA 11.2 or later present
282283
enable_language ( CUDA )
283-
set ( SUITSPARSE_HAS_CUDA ON )
284+
set ( SUITESPARSE_HAS_CUDA ON )
284285
endif ( )
285286
else ( )
286287
# without CUDA:
287288
message ( STATUS "CUDA: not found" )
288-
set ( SUITSPARSE_HAS_CUDA OFF )
289+
set ( SUITESPARSE_HAS_CUDA OFF )
289290
endif ( )
290291

291292
else ( )
292293

293294
# CUDA is disabled
294-
set ( SUITSPARSE_HAS_CUDA OFF )
295+
set ( SUITESPARSE_HAS_CUDA OFF )
295296

296297
endif ( )
297298

298-
if ( SUITSPARSE_HAS_CUDA )
299+
if ( SUITESPARSE_HAS_CUDA )
299300
message ( STATUS "CUDA: enabled" )
300301
set ( SUITESPARSE_CUDA_ARCHITECTURES "52;75;80" CACHE STRING "CUDA architectures" )
301302
set ( CMAKE_CUDA_ARCHITECTURES ${SUITESPARSE_CUDA_ARCHITECTURES} )

‎LAGraph/cmake_modules/SuiteSparsePolicy.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ endif ( )
259259
# find CUDA
260260
#-------------------------------------------------------------------------------
261261

262+
option ( SUITESPARSE_USE_CUDA "Enable CUDA acceleration for SuiteSparse" ON )
262263
if ( SUITESPARSE_USE_CUDA AND NOT MSVC )
263264

264265
# try finding CUDA
@@ -276,26 +277,26 @@ if ( SUITESPARSE_USE_CUDA AND NOT MSVC )
276277
if ( CUDAToolkit_VERSION VERSION_LESS "11.2" )
277278
# CUDA is present but too old
278279
message ( STATUS "CUDA: not enabled (CUDA 11.2 or later required)" )
279-
set ( SUITSPARSE_HAS_CUDA OFF )
280+
set ( SUITESPARSE_HAS_CUDA OFF )
280281
else ( )
281282
# CUDA 11.2 or later present
282283
enable_language ( CUDA )
283-
set ( SUITSPARSE_HAS_CUDA ON )
284+
set ( SUITESPARSE_HAS_CUDA ON )
284285
endif ( )
285286
else ( )
286287
# without CUDA:
287288
message ( STATUS "CUDA: not found" )
288-
set ( SUITSPARSE_HAS_CUDA OFF )
289+
set ( SUITESPARSE_HAS_CUDA OFF )
289290
endif ( )
290291

291292
else ( )
292293

293294
# CUDA is disabled
294-
set ( SUITSPARSE_HAS_CUDA OFF )
295+
set ( SUITESPARSE_HAS_CUDA OFF )
295296

296297
endif ( )
297298

298-
if ( SUITSPARSE_HAS_CUDA )
299+
if ( SUITESPARSE_HAS_CUDA )
299300
message ( STATUS "CUDA: enabled" )
300301
set ( SUITESPARSE_CUDA_ARCHITECTURES "52;75;80" CACHE STRING "CUDA architectures" )
301302
set ( CMAKE_CUDA_ARCHITECTURES ${SUITESPARSE_CUDA_ARCHITECTURES} )

‎SPQR/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ project ( spqr
3838
set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
3939
${PROJECT_SOURCE_DIR}/../SuiteSparse_config/cmake_modules )
4040

41-
option ( SUITESPARSE_USE_CUDA "Enable CUDA acceleration for SuiteSparse" ON )
42-
option ( SPQR_USE_CUDA "Enable CUDA acceleration for SPQR" ON )
43-
4441
include ( SuiteSparsePolicy )
4542

43+
option ( SPQR_USE_CUDA "Enable CUDA acceleration for SPQR" ${SUITESPARSE_USE_CUDA} )
44+
4645
#-------------------------------------------------------------------------------
4746
# find library dependencies
4847
#-------------------------------------------------------------------------------

‎SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ endif ( )
259259
# find CUDA
260260
#-------------------------------------------------------------------------------
261261

262+
option ( SUITESPARSE_USE_CUDA "Enable CUDA acceleration for SuiteSparse" ON )
262263
if ( SUITESPARSE_USE_CUDA AND NOT MSVC )
263264

264265
# try finding CUDA
@@ -276,26 +277,26 @@ if ( SUITESPARSE_USE_CUDA AND NOT MSVC )
276277
if ( CUDAToolkit_VERSION VERSION_LESS "11.2" )
277278
# CUDA is present but too old
278279
message ( STATUS "CUDA: not enabled (CUDA 11.2 or later required)" )
279-
set ( SUITSPARSE_HAS_CUDA OFF )
280+
set ( SUITESPARSE_HAS_CUDA OFF )
280281
else ( )
281282
# CUDA 11.2 or later present
282283
enable_language ( CUDA )
283-
set ( SUITSPARSE_HAS_CUDA ON )
284+
set ( SUITESPARSE_HAS_CUDA ON )
284285
endif ( )
285286
else ( )
286287
# without CUDA:
287288
message ( STATUS "CUDA: not found" )
288-
set ( SUITSPARSE_HAS_CUDA OFF )
289+
set ( SUITESPARSE_HAS_CUDA OFF )
289290
endif ( )
290291

291292
else ( )
292293

293294
# CUDA is disabled
294-
set ( SUITSPARSE_HAS_CUDA OFF )
295+
set ( SUITESPARSE_HAS_CUDA OFF )
295296

296297
endif ( )
297298

298-
if ( SUITSPARSE_HAS_CUDA )
299+
if ( SUITESPARSE_HAS_CUDA )
299300
message ( STATUS "CUDA: enabled" )
300301
set ( SUITESPARSE_CUDA_ARCHITECTURES "52;75;80" CACHE STRING "CUDA architectures" )
301302
set ( CMAKE_CUDA_ARCHITECTURES ${SUITESPARSE_CUDA_ARCHITECTURES} )

0 commit comments

Comments
 (0)