zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Balay/xsdk 1.0.0 updates (#41180)

Browse Source 
* superlu-dist: add v8.2.1 for xsdk

* heffte, phist build fixes on tioga

* exago: build fixes on polaris

---------

Co-authored-by: Veselin Dobrev <dobrev@llnl.gov>
This commit is contained in:
Satish Balay 2023-11-27 09:57:41 -06:00 committed by GitHub
parent 8d0e0d5c77
commit d768e6ea5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/exago/exago-1.6.0.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90bddf2e..47ab5998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,11 +217,13 @@ endif(EXAGO_ENABLE_GPU)
if(EXAGO_ENABLE_PETSC)
include(FindPkgConfig)
# Include petsc package path in pkg_config_path
+ set(PKG_CONFIG_PATH_save $ENV{PKG_CONFIG_PATH})
set(ENV{PKG_CONFIG_PATH}
${PETSC_DIR}/lib/pkgconfig:${PETSC_DIR}/${PETSC_ARCH}/lib/pkgconfig
)
pkg_check_modules(PETSC REQUIRED IMPORTED_TARGET PETSc)
set(EXAGO_HAVE_PETSC 1)
+ set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save})
endif()
# Set install rpath to the locations where EXAGO and PETSc libraries reside.

2
var/spack/repos/builtin/packages/exago/package.py
View File

@ -178,6 +178,8 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage):
depends_on("umpire {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep))
depends_on("camp {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep))
patch("exago-1.6.0.patch", when="@1.6.0")
flag_handler = build_system_flags
def cmake_args(self):

2
var/spack/repos/builtin/packages/heffte/package.py
View File

@ -105,7 +105,7 @@ def cmake_args(self):
archs = ";".join(cuda_arch)
args.append("-DCMAKE_CUDA_ARCHITECTURES=%s" % archs)
if "+rocm" in self.spec and self.spec.satisfies("@:2.3.0"):
if "+rocm" in self.spec:
args.append("-DCMAKE_CXX_COMPILER={0}".format(self.spec["hip"].hipcc))
rocm_arch = self.spec.variants["amdgpu_target"].value

7
var/spack/repos/builtin/packages/phist/package.py
View File

@ -235,6 +235,13 @@ def patch(self):
test.filter("1 2 3 12", "1 2 3")
test.filter("12/", "6/")
test.filter("TEST_DRIVERS_NUM_THREADS 6", "TEST_DRIVERS_NUM_THREADS 3")
# Avoid finding external modules like:
# /opt/rocm/llvm/include/iso_fortran_env.mod
filter_file(
"use iso_fortran_env",
"use, intrinsic :: iso_fortran_env",
"drivers/matfuncs/matpde3d.F90",
)
def setup_build_environment(self, env):
env.set("SPACK_SBANG", sbang.sbang_install_path())

1
var/spack/repos/builtin/packages/superlu-dist/package.py
View File

@ -20,6 +20,7 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage):
version("develop", branch="master")
version("amd", branch="amd")
version("8.2.1", sha256="b77d065cafa6bc1a1dcc15bf23fd854f54b05762b165badcffc195835ad2bddf")
version("8.2.0", sha256="d53573e5a399b2b4ab1fcc36e8421c1b6fab36345c0af14f8fa20326e3365f1f")
version("8.1.2", sha256="7b16c442bb01ea8b298c0aab9a2584aa4615d09786aac968cb2f3118c058206b")
version("8.1.1", sha256="766d70b84ece79d88249fe10ff51d2a397a29f274d9fd1e4a4ac39179a9ef23f")

2
var/spack/repos/builtin/packages/xsdk/package.py
View File

@ -146,7 +146,7 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage):
)
xsdk_depends_on("superlu-dist@develop", when="@develop", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("superlu-dist@8.2.0", when="@1.0.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("superlu-dist@8.2.1", when="@1.0.0", cuda_var="cuda", rocm_var="rocm")
xsdk_depends_on("superlu-dist@8.1.2", when="@0.8.0")
xsdk_depends_on("superlu-dist@7.1.1", when="@0.7.0")