tau: updated hash

* WarpX 23.08

Update WarpX and related Python packages to the lastest releases.

* fix style

---------

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

var/spack/repos/builtin/packages/boost/package.py

@@ -431,6 +431,12 @@ class Boost(Package):
 
         return url.format(version.dotted, version.underscored)
 
+    def flag_handler(self, name, flags):
+        if name == "cxxflags":
+            if self.spec.satisfies("@1.79.0 %oneapi"):
+                flags.append("-Wno-error=enum-constexpr-conversion")
+        return (flags, None, None)
+
     def determine_toolset(self, spec):
         toolsets = {
             "g++": "gcc",

var/spack/repos/builtin/packages/fortrilinos/package.py

@@ -27,6 +27,7 @@ class Fortrilinos(CMakePackage):
     tags = ["e4s"]
     test_requires_compiler = True
 
+    version("2.3.0", sha256="7be5efecaea61ad773d3fe182aa28735ebc3e7af821e1805ad284e4ed4e31a49")
     version("2.2.0", sha256="9e73fc71066bfaf7cde040e1467baf7a1ec797ff2874add49f9741e93f9fffb5")
     version("2.1.0", sha256="2c62bb6106ae86a804497d549080cb6877c5d860b6bf2e72ec5cbcbbe63e3b5b")
     version("2.0.1", sha256="291a62c885cd4ffd76cbebafa02789649bd4fa73f1005cf8da51fd153acb9e1a")
@@ -50,9 +51,10 @@ class Fortrilinos(CMakePackage):
     variant("shared", default=True, description="Build shared libraries")
 
     # Trilinos version dependencies
-    depends_on("trilinos@13.4.0:13.4", when="@2.2.0:2.2")
-    depends_on("trilinos@13.2.0:13.2", when="@2.1.0:2.1")
-    depends_on("trilinos@13.0.0:13.2", when="@2.0.0:2.0")
+    depends_on("trilinos@14.0", when="@2.3")
+    depends_on("trilinos@13.4", when="@2.2")
+    depends_on("trilinos@13.2", when="@2.1.0:2.1")
+    depends_on("trilinos@13:13.2", when="@2.0")
     depends_on("trilinos@12.18.1", when="@2.0.dev3")
     depends_on("trilinos@12.18.1", when="@2.0.dev2")
 

var/spack/repos/builtin/packages/gmsh/package.py

@@ -107,6 +107,12 @@ class Gmsh(CMakePackage):
     conflicts("+oce", when="^gmsh@4.10:4.10.3")
     conflicts("+metis", when="+external", msg="External Metis cannot build with GMSH")
 
+    def flag_handler(self, name, flags):
+        if name == "cflags":
+            if self.spec.satisfies("%oneapi"):
+                flags.append("-Wno-error=implicit-function-declaration")
+        return (flags, None, None)
+
     def cmake_args(self):
         spec = self.spec
 

var/spack/repos/builtin/packages/libyogrt/package.py

@@ -61,6 +61,12 @@ class Libyogrt(AutotoolsPackage):
                 version
             )
 
+    def flag_handler(self, name, flags):
+        if name == "cflags":
+            if self.spec.satisfies("%oneapi"):
+                flags.append("-Wno-error=implicit-function-declaration")
+        return (flags, None, None)
+
     def configure_args(self):
         args = []
 

var/spack/repos/builtin/packages/py-pandas/package.py

@@ -128,3 +128,9 @@ class PyPandas(PythonPackage):
     # https://pandas.pydata.org/pandas-docs/stable/getting_started/install.html#optional-dependencies
 
     skip_modules = ["pandas.tests", "pandas.plotting._matplotlib", "pandas.core._numba.kernels"]
+
+    def flag_handler(self, name, flags):
+        if name == "cflags":
+            if self.spec.satisfies("@0.24.2 %oneapi"):
+                flags.append("-Wno-error=implicit-function-declaration")
+        return (flags, None, None)

var/spack/repos/builtin/packages/py-picmistandard/package.py

@@ -11,11 +11,12 @@ class PyPicmistandard(PythonPackage):
 
     homepage = "https://picmi-standard.github.io"
     git = "https://github.com/picmi-standard/picmi.git"
-    pypi = "picmistandard/picmistandard-0.25.0.tar.gz"
+    pypi = "picmistandard/picmistandard-0.26.0.tar.gz"
 
     maintainers("ax3l", "dpgrote", "RemiLehe")
 
-    version("develop", branch="master")
+    version("master", branch="master")
+    version("0.26.0", sha256="b22689f576d064bf0cd8f435621e912359fc2ee9347350eab845d2d36ebb62eb")
     version("0.25.0", sha256="3fe6a524822d382e52bfc9d3378249546075d28620969954c5ffb43e7968fb02")
     version("0.24.0", sha256="55a82adcc14b41eb612caf0d9e47b0e2a56ffc196a58b41fa0cc395c6924be9a")
     version("0.23.2", sha256="2853fcfaf2f226a88bb6063ae564832b7e69965294fd652cd2ac04756fa4599a")

var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py

@@ -21,3 +21,9 @@ class PyRuamelYamlClib(PythonPackage):
     # to prevent legacy-install-failure
     depends_on("python@:3.9", when="@0.2.0", type=("build", "link", "run"))
     depends_on("py-setuptools@28.7.0:", type="build")
+
+    def flag_handler(self, name, flags):
+        if name == "cflags":
+            if self.spec.satisfies("%oneapi"):
+                flags.append("-Wno-error=incompatible-function-pointer-types")
+        return (flags, None, None)

var/spack/repos/builtin/packages/py-scipy/package.py

@@ -139,7 +139,7 @@ class PyScipy(PythonPackage):
     # https://github.com/mesonbuild/meson/pull/10909#issuecomment-1282241479
     # Intel OneAPI ifx claims to support -fvisibility, but this does not work.
     # Meson adds this flag for all Python extensions which include Fortran code.
-    conflicts("%oneapi", when="@1.9:")
+    conflicts("%oneapi@:2023.0.0", when="@1.9:")
 
     # https://github.com/scipy/scipy/issues/12860
     patch(

var/spack/repos/builtin/packages/py-warpx/package.py

@@ -18,7 +18,7 @@ class PyWarpx(PythonPackage):
     """
 
     homepage = "https://ecp-warpx.github.io"
-    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.07.tar.gz"
+    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.08.tar.gz"
     git = "https://github.com/ECP-WarpX/WarpX.git"
 
     maintainers("ax3l", "dpgrote", "RemiLehe")
@@ -27,6 +27,7 @@ class PyWarpx(PythonPackage):
 
     # NOTE: if you update the versions here, also see warpx
     version("develop", branch="development")
+    version("23.08", sha256="67695ff04b83d1823ea621c19488e54ebaf268532b0e5eb4ea8ad293d7ab3ddc")
     version("23.07", sha256="511633f94c0d0205013609bde5bbf92a29c2e69f6e69b461b80d09dc25602945")
     version("23.06", sha256="75fcac949220c44dce04de581860c9a2caa31a0eee8aa7d49455fa5fc928514b")
     version("23.05", sha256="34306a98fdb1f5f44ab4fb92f35966bfccdcf1680a722aa773af2b59a3060d73")
@@ -50,6 +51,7 @@ class PyWarpx(PythonPackage):
     variant("mpi", default=True, description="Enable MPI support")
 
     for v in [
+        "23.08",
         "23.07",
         "23.06",
         "23.05",
@@ -73,24 +75,23 @@ class PyWarpx(PythonPackage):
     ]:
         depends_on("warpx@{0}".format(v), when="@{0}".format(v), type=["build", "link"])
 
-    depends_on("python@3.6:3.9", type=("build", "run"), when="@:21.12")
-    depends_on("python@3.6:", type=("build", "run"), when="@22.01:")
+    depends_on("python@3.7:", type=("build", "run"))
+    depends_on("python@3.8:", type=("build", "run"), when="@23.09:")
     depends_on("py-numpy@1.15.0:1", type=("build", "run"))
     depends_on("py-mpi4py@2.1.0:", type=("build", "run"), when="+mpi")
     depends_on("py-periodictable@1.5:1", type=("build", "run"))
-    depends_on("py-picmistandard@0.0.18", type=("build", "run"), when="@22.01")
-    depends_on("py-picmistandard@0.0.19", type=("build", "run"), when="@22.02:22.09")
-    depends_on("py-picmistandard@0.0.20", type=("build", "run"), when="@22.10:22.11")
-    depends_on("py-picmistandard@0.0.22", type=("build", "run"), when="@22.12:23.03")
-    depends_on("py-picmistandard@0.23.2", type=("build", "run"), when="@23.04:23.05")
-    depends_on("py-picmistandard@0.24.0", type=("build", "run"), when="@23.06")
     depends_on("py-picmistandard@0.25.0", type=("build", "run"), when="@23.07:")
+    depends_on("py-picmistandard@0.24.0", type=("build", "run"), when="@23.06")
+    depends_on("py-picmistandard@0.23.2", type=("build", "run"), when="@23.04:23.05")
+    depends_on("py-picmistandard@0.0.22", type=("build", "run"), when="@22.12:23.03")
+    depends_on("py-picmistandard@0.0.20", type=("build", "run"), when="@22.10:22.11")
+    depends_on("py-picmistandard@0.0.19", type=("build", "run"), when="@22.02:22.09")
+    depends_on("py-picmistandard@0.0.18", type=("build", "run"), when="@22.01")
     depends_on("py-setuptools@42:", type="build")
     # Since we use PYWARPX_LIB_DIR to pull binaries out of the
     # 'warpx' spack package, we don't need py-cmake as declared
     # depends_on('py-cmake@3.15:3', type='build')
     # depends_on('py-cmake@3.18:3', type='build', when='@22.01:')
-    depends_on("py-wheel", type="build")
     depends_on("warpx +lib ~mpi +shared", type=("build", "link"), when="~mpi")
     depends_on("warpx +lib +mpi +shared", type=("build", "link"), when="+mpi")
 

var/spack/repos/builtin/packages/tau/package.py

@@ -26,6 +26,7 @@ class Tau(Package):
     tags = ["e4s"]
 
     version("master", branch="master")
+    version("2.32.1", sha256="0eec3de46b0873846dfc639270c5e30a226b463dd6cb41aa12e975b7563f0eeb")
     version("2.32", sha256="ee774a06e30ce0ef0f053635a52229152c39aba4f4933bed92da55e5e13466f3")
     version("2.31.1", sha256="bf445b9d4fe40a5672a7b175044d2133791c4dfb36a214c1a55a931aebc06b9d")
     version("2.31", sha256="27e73c395dd2a42b91591ce4a76b88b1f67663ef13aa19ef4297c68f45d946c2")
@@ -124,6 +125,7 @@ class Tau(Package):
     depends_on("rocprofiler-dev", when="+rocprofiler")
     depends_on("roctracer-dev", when="+roctracer")
     depends_on("hsa-rocr-dev", when="+rocm")
+    depends_on("rocm-smi-lib", when="+rocm")
     depends_on("java", type="run")  # for paraprof
     depends_on("oneapi-level-zero", when="+level_zero")
 
@@ -288,6 +290,8 @@ class Tau(Package):
 
         if "+rocm" in spec:
             options.append("-rocm=%s" % spec["hsa-rocr-dev"].prefix)
+            if spec.satisfies("@2.32.1"):
+                options.append("-rocmsmi=%s" % spec["rocm-smi-lib"].prefix)
 
         if "+rocprofiler" in spec:
             options.append("-rocprofiler=%s" % spec["rocprofiler-dev"].prefix)

var/spack/repos/builtin/packages/tau/tau-2.32.1-rocm-smi-dir.patch

@@ -0,0 +1,87 @@
+diff -ruN spack-src/configure spack-src-patched/configure
+--- spack-src/configure	2023-08-17 17:01:17.000000000 -0700
++++ spack-src-patched/configure	2023-08-18 11:08:49.959762310 -0700
+@@ -768,6 +768,7 @@
+     echo "-rocm[=<dir>] ...... Specify alternate path to ROCm (/opt/rocm default)."
+     echo "-rocprofiler=<dir> .............. Specify location of ROCm rocprofiler."
+     echo "-rocprofv2 .......................................... Enable rocprofv2."
++    echo "-rocmsmi=<dir> ..................... Specify location of RoCm rocm_smi."
+ #   echo "-rocprofilerinc=<dir> .... Specify location of rocprofiler include dir."
+ #   echo "-rocprofilerlibrary=<library> .... Specify name of rocprofiler library."
+     echo "-level_zero[=<dir>] ................. Specify path to Intel Level Zero."
+@@ -936,6 +937,7 @@
+         echo "-rocm[=<dir>] ..... Specify alternate path to ROCm (/opt/rocm default)."
+         echo "-rocprofiler=<dir> .............. Specify location of ROCm rocprofiler."
+ 	echo "-rocprofv2 .......................................... Enable rocprofv2."
++	echo "-rocmsmi=<dir> ..................... Specify location of RoCm rocm_smi."
+         #echo "-rocprofilerinc=<dir> .... Specify location of rocprofiler include dir."
+         #echo "-rocprofilerlibrary=<library> .... Specify name of rocprofiler library."
+         echo "-roctracer=<dir> .................. Specify location of ROCm roctracer."
+@@ -1364,6 +1366,7 @@
+ rocprofiler=no
+ rocprofv2=no
+ roctracer=no
++rocmsmi=no
+ hip=no
+ use_opencl=no
+ use_openacc=no
+@@ -3057,6 +3060,17 @@
+             shift
+             ;;
+ 
++        -rocmsmi=*)
++            rocmsmidir=`echo $arg | sed -e 's/-rocmsmi=//' -e 's/ /#/g'`
++            if [ ! -d $rocmsmidir ]; then
++              echo  "Error: Cannot access ROCm smi directory $rocmsmidir"
++              exit 1
++            else
++              fixmakeargs="$fixmakeargs rocmsmidir=$rocmsmidir"
++              rocmsmi=yes
++            fi
++            shift
++            ;;
+ 
+         -hip=*)
+             hipdir=`echo $arg | sed -e 's/-hip=//' -e 's/ /#/g'`
+@@ -3324,6 +3338,11 @@
+   pthread=yes
+ fi
+ 
++if [ "x$rocmsmi" = "xno" ]; then
++  echo "No rocmsmi specified, using $rocmdir"
++  fixmakeargs="$fixmakeargs rocmsmidir=$rocmdir"
++fi
++
+ if [ "x$use_opencl" = "xyes" -a "x$openclinclude" = "x" ]; then
+   ld_lib_path=`echo $LD_LIBRARY_PATH | sed -e "s@:@ @g" `
+   for d in $ld_lib_path
+diff -ruN spack-src/include/Makefile.skel spack-src-patched/include/Makefile.skel
+--- spack-src/include/Makefile.skel	2023-08-17 17:01:17.000000000 -0700
++++ spack-src-patched/include/Makefile.skel	2023-08-18 11:09:02.763832652 -0700
+@@ -182,8 +182,9 @@
+ TAU_ROCPROFILER_LIBRARY=
+ TAU_ROCTRACER=
+ TAU_ROCTRACER_LIB_DIR=$(TAU_ROCTRACER)/lib
+-TAU_ROCM_SMI_INC=$(TAU_ROCM_DIR)/include/rocm_smi
+-TAU_ROCM_SMI_LIB_DIR=$(TAU_ROCM_DIR)/rocm_smi/lib
++TAU_ROCM_SMI_DIR=
++TAU_ROCM_SMI_INC=$(TAU_ROCM_SMI_DIR)/include/rocm_smi
++TAU_ROCM_SMI_LIB_DIR=$(TAU_ROCM_SMI_DIR)/lib
+ TAU_CMAKE=
+ TAU_HIP=
+ PIN_ROOT=
+diff -ruN spack-src/utils/FixMakefile spack-src-patched/utils/FixMakefile
+--- spack-src/utils/FixMakefile	2023-08-15 08:11:00.000000000 -0700
++++ spack-src-patched/utils/FixMakefile	2023-08-18 11:08:50.803766947 -0700
+@@ -1082,6 +1082,10 @@
+         roctracerlibdir=`echo $1 | sed -e 's/^roctracerlibdir=//' -e 's/#/ /g'`
+ 	echo "s@^TAU_ROCTRACER_LIB_DIR=\(.*\)@TAU_ROCTRACER_LIB_DIR=$roctracerlibdir@g" >> $sedout
+         ;;
++     rocmsmidir=*)
++        rocmsmidir=`echo $1 | sed -e 's/^rocmsmidir=//' -e 's/#/ /g'`
++        echo "s@^TAU_ROCM_SMI_DIR=\(.*\)@TAU_ROCM_SMI_DIR=$rocmsmidir@g" >> $sedout
++        ;;
+      hipdir=*)
+         hipdir=`echo $1 | sed -e 's/^hipdir=//' -e 's/#/ /g'`
+ 	echo "s@^TAU_HIP=\(.*\)@TAU_HIP=$hipdir@g" >> $sedout
+

var/spack/repos/builtin/packages/warpx/package.py

@@ -17,7 +17,7 @@ class Warpx(CMakePackage):
     """
 
     homepage = "https://ecp-warpx.github.io"
-    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.07.tar.gz"
+    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.08.tar.gz"
     git = "https://github.com/ECP-WarpX/WarpX.git"
 
     maintainers("ax3l", "dpgrote", "MaxThevenet", "RemiLehe")
@@ -25,6 +25,7 @@ class Warpx(CMakePackage):
 
     # NOTE: if you update the versions here, also see py-warpx
     version("develop", branch="development")
+    version("23.08", sha256="67695ff04b83d1823ea621c19488e54ebaf268532b0e5eb4ea8ad293d7ab3ddc")
     version("23.07", sha256="511633f94c0d0205013609bde5bbf92a29c2e69f6e69b461b80d09dc25602945")
     version("23.06", sha256="75fcac949220c44dce04de581860c9a2caa31a0eee8aa7d49455fa5fc928514b")
     version("23.05", sha256="34306a98fdb1f5f44ab4fb92f35966bfccdcf1680a722aa773af2b59a3060d73")