Update Spack and Spack Packages repos for Devtools

scripts/spack/configs/toss_4_x86_64_ib/spack.yaml

@@ -258,7 +258,7 @@ spack:
     cmake:
       buildable: false
       externals:
-      - spec: cmake@3.30.5
+      - spec: cmake@3.26.5
         prefix: /usr
     cppcheck:
       version: [2.9]

scripts/spack/devtools.json

@@ -1,13 +1,13 @@
 {
-"package_name" : "smith_devtools",
+"package_name" : "smithdevtools",
 "package_version" : "fakeversion",
 "package_source_dir" : "../..",
 "package_final_phase" : "",
 "spack_build_mode" : "install",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "b4b1c5f271c75e918ce922ff1bcc77542eda3ec9",
+"spack_commit": "b47619603d05fa41a20278af0ac190b2fd7b2540",
 "spack_packages_url": "https://github.com/spack/spack-packages.git",
-"spack_packages_commit": "a75a7f75182ffc7a51c6ca7f0fec4bf9b2705be8",
+"spack_packages_commit": "d2fbd8ebe4117d6c10f533e0f9e4ee04a4529f61",
 "spack_configs_path": "scripts/spack/devtools_configs",
-"spack_packages_path": ["scripts/spack/radiuss-spack-configs/spack_repo/llnl_radiuss/packages", "scripts/spack/spack_repo/smith/packages"]
+"spack_packages_path": ["scripts/spack/spack_repo/smith/packages"]
 }

scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml

@@ -32,7 +32,6 @@ spack:
       # This defaults us to machine specific flags of ivybridge which allows
       # us to run on broadwell as well
       target: [ivybridge]
-      compiler: [gcc]
       providers:
         blas: [openblas]
         lapack: [netlib-lapack]
@@ -74,9 +73,8 @@ spack:
     mvapich2:
       buildable: false
       externals:
-      - spec: mvapich2@2.3.7.gcc_13~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple
-        prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-13.3.1
-
+      - spec: mvapich2@2.3.7.gcc_13
+        prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-13.3.1-magic
     netlib-lapack:
       buildable: false
       externals:
@@ -110,11 +108,10 @@ spack:
       - spec: bzip2@1.0.6
         prefix: /usr
     cmake:
-      version: [3.23.1]
       buildable: false
       externals:
-      - spec: cmake@3.23.1
-        prefix: /usr/tce
+      - spec: cmake@3.26.5
+        prefix: /usr
     curl:
       buildable: false
       externals:
@@ -160,6 +157,11 @@ spack:
       externals:
       - spec: ghostscript@9.27
         prefix: /usr
+    gmake:
+      buildable: false
+      externals:
+      - spec: gmake@4.2.1
+        prefix: /usr
     graphviz:
       buildable: false
       externals:

scripts/spack/spack_repo/smith/packages/smith_devtools/package.py → scripts/spack/spack_repo/smith/packages/smithdevtools/package.py

@@ -6,7 +6,7 @@
 from spack_repo.builtin.build_systems.bundle import BundlePackage
 from spack.package import *
 
-class SmithDevtools(BundlePackage):
+class Smithdevtools(BundlePackage):
     """This is a set of tools necessary for the developers of Smith"""
 
     version('fakeversion')