alquimia, pflotran, plasma, py-mpi4py, strumpack - add in new versions (#33447)

* alquimia, pflotran, plasma, py-mpi4py, strumpack - add in new versions

* Fix hip CI failure

Co-authored-by: eugeneswalker <eugenesunsetwalker@gmail.com>

5 files changed, 15 insertions, 2 deletions

diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py
index bd99e2d817..05d4c54128 100644
--- a/var/spack/repos/builtin/packages/alquimia/package.py
+++ b/var/spack/repos/builtin/packages/alquimia/package.py
@@ -16,6 +16,7 @@ class Alquimia(CMakePackage):
     maintainers = ["smolins", "balay"]
 
     version("develop")
+    version("1.0.10", commit="b2c11b6cde321f4a495ef9fcf267cb4c7a9858a0")  # tag v.1.0.10
     version("1.0.9", commit="2ee3bcfacc63f685864bcac2b6868b48ad235225")  # tag v.1.0.9
     version("xsdk-0.6.0", commit="9a0aedd3a927d4d5e837f8fd18b74ad5a78c3821")
     version("xsdk-0.5.0", commit="8397c3b00a09534c5473ff3ab21f0e32bb159380")
@@ -26,6 +27,7 @@ class Alquimia(CMakePackage):
 
     depends_on("mpi")
     depends_on("hdf5")
+    depends_on("pflotran@4.0.1", when="@1.0.10")
     depends_on("pflotran@3.0.2", when="@1.0.9")
     depends_on("pflotran@xsdk-0.6.0", when="@xsdk-0.6.0")
     depends_on("pflotran@xsdk-0.5.0", when="@xsdk-0.5.0")
diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py
index 3b00fda8e7..8807ad5e71 100644
--- a/var/spack/repos/builtin/packages/pflotran/package.py
+++ b/var/spack/repos/builtin/packages/pflotran/package.py
@@ -18,6 +18,7 @@ class Pflotran(AutotoolsPackage):
     maintainers = ["ghammond86", "balay"]
 
     version("develop")
+    version("4.0.1", commit="fd351a49b687e27f46eae92e9259156eea74897d")  # tag v4.0.1
     version("3.0.2", commit="9e07f416a66b0ad304c720b61aa41cba9a0929d5")  # tag v3.0.2
     version("xsdk-0.6.0", commit="46e14355c1827c057f2e1b3e3ae934119ab023b2")
     version("xsdk-0.5.0", commit="98a959c591b72f73373febf5f9735d2c523b4c20")
@@ -27,6 +28,7 @@ class Pflotran(AutotoolsPackage):
     depends_on("mpi")
     depends_on("hdf5@1.8.12:+mpi+fortran+hl")
     depends_on("petsc@main:+hdf5+metis", when="@develop")
+    depends_on("petsc@3.18:+hdf5+metis", when="@4.0.1")
     depends_on("petsc@3.16:+hdf5+metis", when="@3.0.2")
     depends_on("petsc@3.14:+hdf5+metis", when="@xsdk-0.6.0")
     depends_on("petsc@3.12:+hdf5+metis", when="@xsdk-0.5.0")
diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py
index 937d87de9e..5e32b5af31 100644
--- a/var/spack/repos/builtin/packages/plasma/package.py
+++ b/var/spack/repos/builtin/packages/plasma/package.py
@@ -23,6 +23,7 @@ class Plasma(CMakePackage):
     tags = ["e4s"]
 
     version("develop", git=git)
+    version("22.9.29", sha256="78827898b7e3830eee2e388823b9180858279f77c5eda5aa1be173765c53ade5")
     version("21.8.29", sha256="e0bb4d9143c8540f9f46cbccac9ed0cbea12500a864e6954fce2fe94ea057a10")
     version("20.9.20", sha256="2144a77b739f8dd2f0dbe5b64d94cde0e916f55c4eb170facd168c0db7fc7970")
     version("19.8.1", sha256="3a5db6eabf91aec782b7f27b17a7f6b8ce2c9d8e648c0e9c0ff5d87277ba4d17")
diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py
index f0133d2af4..7ce0633733 100644
--- a/var/spack/repos/builtin/packages/py-mpi4py/package.py
+++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py
@@ -17,6 +17,7 @@ class PyMpi4py(PythonPackage):
     git = "https://github.com/mpi4py/mpi4py.git"
 
     version("master", branch="master")
+    version("3.1.3", sha256="f1e9fae1079f43eafdd9f817cdb3fd30d709edc093b5d5dada57a461b2db3008")
     version("3.1.2", sha256="40dd546bece8f63e1131c3ceaa7c18f8e8e93191a762cd446a8cfcf7f9cce770")
     version("3.1.1", sha256="e11f8587a3b93bb24c8526addec664b586b965d83c0882b884c14dc3fd6b9f5c")
     version("3.1.0", sha256="134fa2b2fe6d8f91bcfcc2824cfd74b55ca3dcbff4d185b1bda009beea9232ec")
@@ -28,7 +29,7 @@ class PyMpi4py(PythonPackage):
 
     depends_on("python@2.6:2.7,3.2:")
     depends_on("python@2.7:2.8,3.5:", when="@3.1:")
-    depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools@40.9:", type="build")
     depends_on("mpi")
     depends_on("py-cython@0.27.0:", when="@master", type="build")
     depends_on("py-3to2", when="@3.1: ^python@:2", type="build")
diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py
index 258e058303..e19aadcff3 100644
--- a/var/spack/repos/builtin/packages/strumpack/package.py
+++ b/var/spack/repos/builtin/packages/strumpack/package.py
@@ -29,6 +29,8 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage):
     test_requires_compiler = True
 
     version("master", branch="master")
+    version("7.0.1", sha256="ddbf9c0509eaf0f8a4c70f59508787336a05eeacc8322f156117d8ce59a70a60")
+    version("7.0.0", sha256="18f7a0d75cc5cfdb7bbb6112a2bdda7a50fbcaefa2d8bab001f902bdf62e69e3")
     version("6.3.1", sha256="3f1de435aeb850c06d841655c3bc426565eb0cc0a7314b76586c2c709b03fb61")
     version("6.3.0", sha256="47dec831684894b7ed77c66b8a23e172b388c83580cfaf91f921564fa0b46d41")
     version("6.2.1", sha256="52d63ab8f565266a9b1b5f3596afd00fc3b70296179b53a1e5b99405defeca22")
@@ -72,6 +74,7 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("cuda", when="@4.0.0: +cuda")
     depends_on("zfp", when="+zfp")
     depends_on("hipblas", when="+rocm")
+    depends_on("hipsparse", type="link", when="@7.0.1: +rocm")
     depends_on("rocsolver", when="+rocm")
     depends_on("slate", when="+slate")
     depends_on("slate+cuda", when="+cuda+slate")
@@ -144,8 +147,12 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage):
         if "+rocm" in spec:
             args.append("-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix))
             rocm_archs = spec.variants["amdgpu_target"].value
+            hipcc_flags = []
+            if spec.satisfies("@7.0.1: +rocm"):
+                hipcc_flags.append("-std=c++14")
             if "none" not in rocm_archs:
-                args.append("-DHIP_HIPCC_FLAGS=--amdgpu-target={0}".format(",".join(rocm_archs)))
+                hipcc_flags.append("--amdgpu-target={0}".format(",".join(rocm_archs)))
+            args.append("-DHIP_HIPCC_FLAGS={0}".format(" ".join(hipcc_flags)))
 
         return args