From 5d0ae001a1184a7cf4cea3e2043b39fcc278dae6 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Wed, 26 Oct 2022 15:04:22 -0500 Subject: slepc: fix for slepc+cuda ^petsc+kokkos+cuda ^kokkos+cuda+wrapper (#33529) kokkos wrappers modify mpicxx - breaking slepc build. --- var/spack/repos/builtin/packages/slepc/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 3fc5a5c170..bd8fa1e4ed 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -113,12 +113,20 @@ class Slepc(Package, CudaPackage, ROCmPackage): when="@3.13.0:+blopex", ) + def revert_kokkos_nvcc_wrapper(self): + # revert changes by kokkos-nvcc-wrapper + if self.spec.satisfies("^kokkos+cuda+wrapper"): + env["MPICH_CXX"] = env["CXX"] + env["OMPI_CXX"] = env["CXX"] + env["MPICXX_CXX"] = env["CXX"] + def install(self, spec, prefix): # set SLEPC_DIR for installation # Note that one should set the current (temporary) directory instead # its symlink in spack/stage/ ! os.environ["SLEPC_DIR"] = os.getcwd() + self.revert_kokkos_nvcc_wrapper() if self.spec.satisfies("%cce"): filter_file( " flags = l", @@ -158,7 +166,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): python("configure", "--prefix=%s" % prefix, *options) - make("MAKE_NP=%s" % make_jobs, parallel=False) + make("V=1 MAKE_NP=%s" % make_jobs, parallel=False) if self.run_tests: make("test", parallel=False) -- cgit v1.2.3-70-g09d2