From 3682676a7b69ca76f2bbc4a57abc541cb0dc1b0a Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 11 Dec 2025 16:57:43 -0800 Subject: [PATCH 1/4] make continuation solver variable an option so it shows up in ccmake --- cmake/SmithBasics.cmake | 1 + cmake/thirdparty/SetupSmithThirdParty.cmake | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/SmithBasics.cmake b/cmake/SmithBasics.cmake index 1d44bdca5..1f42b6ea9 100644 --- a/cmake/SmithBasics.cmake +++ b/cmake/SmithBasics.cmake @@ -38,6 +38,7 @@ if (NOT SMITH_BASICS_SETUP) cmake_dependent_option(SMITH_ENABLE_OPENMP "Enables Smith with OPENMP support" ON "ENABLE_OPENMP" OFF) option(SMITH_ENABLE_GRETL "Enables Smith with Gretl Support" ON) + option(SMITH_ENABLE_CONTINUATION "Enable Continuation Solver support" ON) #------------------------------------------------------------------------------ # Profiling options diff --git a/cmake/thirdparty/SetupSmithThirdParty.cmake b/cmake/thirdparty/SetupSmithThirdParty.cmake index 5fb11987a..ddefe48d3 100644 --- a/cmake/thirdparty/SetupSmithThirdParty.cmake +++ b/cmake/thirdparty/SetupSmithThirdParty.cmake @@ -417,9 +417,6 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND) #------------------------------------------------------------------------------ # ContinuationSolvers #------------------------------------------------------------------------------ - if (NOT DEFINED SMITH_ENABLE_CONTINUATION) - set(SMITH_ENABLE_CONTINUATION ON) - endif() message(STATUS "Smith Enable Continuation: ${SMITH_ENABLE_CONTINUATION}") if(SMITH_ENABLE_CONTINUATION) From b1284e2631c46fa0bd0cbbf3bd6d6398b6a8a112 Mon Sep 17 00:00:00 2001 From: Chris White Date: Thu, 11 Dec 2025 22:04:05 -0800 Subject: [PATCH 2/4] consistency --- cmake/SmithBasics.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/SmithBasics.cmake b/cmake/SmithBasics.cmake index 1f42b6ea9..f4510b6a5 100644 --- a/cmake/SmithBasics.cmake +++ b/cmake/SmithBasics.cmake @@ -38,7 +38,7 @@ if (NOT SMITH_BASICS_SETUP) cmake_dependent_option(SMITH_ENABLE_OPENMP "Enables Smith with OPENMP support" ON "ENABLE_OPENMP" OFF) option(SMITH_ENABLE_GRETL "Enables Smith with Gretl Support" ON) - option(SMITH_ENABLE_CONTINUATION "Enable Continuation Solver support" ON) + option(SMITH_ENABLE_CONTINUATION "Enables Smith with Continuation Solver support" ON) #------------------------------------------------------------------------------ # Profiling options From 8b6087e43339d2aa6a8c11c37856b938ad947ad4 Mon Sep 17 00:00:00 2001 From: Chris White Date: Fri, 19 Dec 2025 13:01:55 -0800 Subject: [PATCH 3/4] comment --- cmake/SmithBasics.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/SmithBasics.cmake b/cmake/SmithBasics.cmake index f4510b6a5..50b9b335b 100644 --- a/cmake/SmithBasics.cmake +++ b/cmake/SmithBasics.cmake @@ -37,6 +37,7 @@ if (NOT SMITH_BASICS_SETUP) cmake_dependent_option(SMITH_ENABLE_MPI "Enables Smith with MPI support" ON "ENABLE_MPI" OFF) cmake_dependent_option(SMITH_ENABLE_OPENMP "Enables Smith with OPENMP support" ON "ENABLE_OPENMP" OFF) + # Options for builtin TPLs option(SMITH_ENABLE_GRETL "Enables Smith with Gretl Support" ON) option(SMITH_ENABLE_CONTINUATION "Enables Smith with Continuation Solver support" ON) From aae576d94d4035ba92449512d5838397a3453090 Mon Sep 17 00:00:00 2001 From: Chris White Date: Fri, 19 Dec 2025 15:47:09 -0800 Subject: [PATCH 4/4] put in common location --- cmake/SmithBasics.cmake | 5 +++++ cmake/thirdparty/SetupSmithThirdParty.cmake | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/SmithBasics.cmake b/cmake/SmithBasics.cmake index 50b9b335b..dbd196f9b 100644 --- a/cmake/SmithBasics.cmake +++ b/cmake/SmithBasics.cmake @@ -41,6 +41,11 @@ if (NOT SMITH_BASICS_SETUP) option(SMITH_ENABLE_GRETL "Enables Smith with Gretl Support" ON) option(SMITH_ENABLE_CONTINUATION "Enables Smith with Continuation Solver support" ON) + if (SMITH_ENABLE_HIP OR SMITH_ENABLE_CUDA) + message(STATUS "Disabling Smith's Continuation Solver support due to currently non-supported GPU build") + set(SMITH_ENABLE_CONTINUATION FALSE CACHE BOOL "" FORCE) + endif() + #------------------------------------------------------------------------------ # Profiling options #------------------------------------------------------------------------------ diff --git a/cmake/thirdparty/SetupSmithThirdParty.cmake b/cmake/thirdparty/SetupSmithThirdParty.cmake index ddefe48d3..02d45ea8d 100644 --- a/cmake/thirdparty/SetupSmithThirdParty.cmake +++ b/cmake/thirdparty/SetupSmithThirdParty.cmake @@ -45,10 +45,8 @@ if (NOT SMITH_THIRD_PARTY_LIBRARIES_FOUND) # Can be removed once this BLT PR is merged https://github.com/LLNL/blt/pull/585 (?) find_package(CUDAToolkit REQUIRED) set(smith_device_depends blt::cuda CUDA::cublasLt CACHE STRING "" FORCE) - set(SMITH_ENABLE_CONTINUATION FALSE) elseif(SMITH_ENABLE_HIP) set(smith_device_depends blt::hip CACHE STRING "" FORCE) - set(SMITH_ENABLE_CONTINUATION FALSE) else() set(smith_device_depends "" CACHE STRING "" FORCE) endif()