summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatish Balay <balay@mcs.anl.gov>2021-06-25 09:19:26 -0500
committerGitHub <noreply@github.com>2021-06-25 08:19:26 -0600
commit3087d74ca7840aa82632a36147044df1d2d0e88d (patch)
tree4c53a0930179c549c3ae03abe6eaf6fbda9e2b3b
parent03f54ea4bbb513b056ea9f5a49def4e2ffb2e712 (diff)
downloadspack-3087d74ca7840aa82632a36147044df1d2d0e88d.tar.gz
spack-3087d74ca7840aa82632a36147044df1d2d0e88d.tar.bz2
spack-3087d74ca7840aa82632a36147044df1d2d0e88d.tar.xz
spack-3087d74ca7840aa82632a36147044df1d2d0e88d.zip
sundials: remove sundials_nvecopenmp target from ARKODE SuperLU_DIST example (#24516)
-rw-r--r--var/spack/repos/builtin/packages/sundials/package.py2
-rw-r--r--var/spack/repos/builtin/packages/sundials/remove-links-to-OpenMP-vector.patch34
2 files changed, 36 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py
index 498d4390fc..6a9cbe3ed3 100644
--- a/var/spack/repos/builtin/packages/sundials/package.py
+++ b/var/spack/repos/builtin/packages/sundials/package.py
@@ -202,6 +202,8 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage):
patch('FindPackageMultipass.cmake.patch', when='@5.0.0')
patch('5.5.0-xsdk-patches.patch', when='@5.5.0')
patch('0001-add-missing-README-to-examples-cvode-hip.patch', when='@5.6.0:5.7.0')
+ # remove sundials_nvecopenmp target from ARKODE SuperLU_DIST example
+ patch('remove-links-to-OpenMP-vector.patch', when='@5.5.0:5.7.0')
# ==========================================================================
# SUNDIALS Settings
diff --git a/var/spack/repos/builtin/packages/sundials/remove-links-to-OpenMP-vector.patch b/var/spack/repos/builtin/packages/sundials/remove-links-to-OpenMP-vector.patch
new file mode 100644
index 0000000000..5792fde936
--- /dev/null
+++ b/var/spack/repos/builtin/packages/sundials/remove-links-to-OpenMP-vector.patch
@@ -0,0 +1,34 @@
+From 93f2a963e4c23c0acbcdbb349f157cf8c640ce14 Mon Sep 17 00:00:00 2001
+From: "David J. Gardner" <gardner48@llnl.gov>
+Date: Wed, 31 Mar 2021 20:59:30 -0700
+Subject: [PATCH] remove links to OpenMP vector
+
+---
+ examples/arkode/CXX_superludist/CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/examples/arkode/CXX_superludist/CMakeLists.txt b/examples/arkode/CXX_superludist/CMakeLists.txt
+index 9c486b1cd..6de445851 100644
+--- a/examples/arkode/CXX_superludist/CMakeLists.txt
++++ b/examples/arkode/CXX_superludist/CMakeLists.txt
+@@ -45,7 +45,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ set(ARKODE_LIB sundials_arkode)
+ set(SUNMAT_LIB sundials_sunmatrixslunrloc)
+ set(SUNLS_LIB sundials_sunlinsolsuperludist)
+-set(NVECP_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+ set(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECP_LIB} ${SUNMAT_LIB} ${SUNLS_LIB} ${EXTRA_LINK_LIBS})
+@@ -102,8 +101,7 @@ if(EXAMPLES_INSTALL)
+ set(SOLVER "ARKODE")
+ string(CONCAT SUNDIALS_LIBS "-lsundials_arkode "
+ "-lsundials_sunmatrixslunrloc "
+- "-lsundials_sunlinsolsuperludist "
+- "-lsundials_nvecopenmp")
++ "-lsundials_sunlinsolsuperludist")
+
+ examples2string(ARKODE_examples EXAMPLES)
+
+--
+2.24.3 (Apple Git-128)
+