From bcf6548d3084eed6790d683157bc21a192ba6933 Mon Sep 17 00:00:00 2001 From: William Williams Date: Fri, 26 Jun 2026 08:58:59 +0200 Subject: [PATCH 1/8] [cubelib, cubew] Add version 4.9.1 --- repos/spack_repo/builtin/packages/cubelib/package.py | 1 + repos/spack_repo/builtin/packages/cubew/package.py | 1 + 2 files changed, 2 insertions(+) diff --git a/repos/spack_repo/builtin/packages/cubelib/package.py b/repos/spack_repo/builtin/packages/cubelib/package.py index e4377e5a3a5..96201373b7d 100644 --- a/repos/spack_repo/builtin/packages/cubelib/package.py +++ b/repos/spack_repo/builtin/packages/cubelib/package.py @@ -14,6 +14,7 @@ class Cubelib(AutotoolsPackage): url = "https://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubelib-4.4.tar.gz" maintainers("swat-jsc", "wrwilliams") + version("4.9.1", sha256="d82a899af07ec6c34c88665a0dfddbbc33a760031b1a79f12d168301e8ea1e46") version("4.9", sha256="a0658f5bf3f74bf7dcf465ab6e30476751ad07eb93618801bdcf190ba3029443") version("4.8.2", sha256="d6fdef57b1bc9594f1450ba46cf08f431dd0d4ae595c47e2f3454e17e4ae74f4") version("4.8.1", sha256="e4d974248963edab48c5d0fc5831146d391b0ae4632cccafe840bf5f12cd80a9") diff --git a/repos/spack_repo/builtin/packages/cubew/package.py b/repos/spack_repo/builtin/packages/cubew/package.py index 8cc361af871..0ba600f3ede 100644 --- a/repos/spack_repo/builtin/packages/cubew/package.py +++ b/repos/spack_repo/builtin/packages/cubew/package.py @@ -15,6 +15,7 @@ class Cubew(AutotoolsPackage): maintainers("swat-jsc", "wrwilliams") + version("4.9.1", sha256="c2e43089bb24bf27bb07eb1a3b4114df8040372e4ba247788d99bc872d23d8ea") version("4.9", sha256="4ef74e81c569bf53117459cba5a1ea52b5dac739493fa83be39678840cd2acdd") version("4.8.2", sha256="4f3bcf0622c2429b8972b5eb3f14d79ec89b8161e3c1cc5862ceda417d7975d2") version("4.8.1", sha256="42cbd743d87c16e805c8e28e79292ab33de259f2cfba46f2682cb35c1bc032d6") From f22f63ccc8cef514af1b634848af6f450eaa1db9 Mon Sep 17 00:00:00 2001 From: William Williams Date: Fri, 26 Jun 2026 08:59:12 +0200 Subject: [PATCH 2/8] [otf2] Add v3.2. --- repos/spack_repo/builtin/packages/otf2/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/spack_repo/builtin/packages/otf2/package.py b/repos/spack_repo/builtin/packages/otf2/package.py index bfdc5059e9f..cef63049707 100644 --- a/repos/spack_repo/builtin/packages/otf2/package.py +++ b/repos/spack_repo/builtin/packages/otf2/package.py @@ -15,6 +15,7 @@ class Otf2(AutotoolsPackage): homepage = "https://www.vi-hps.org/projects/score-p" url = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-3.1/otf2-3.1.tar.gz" + version("3.2", sha256="82b3a88a550cb8c3cec8fd45eca82cdcbaf945209977482471b4b5e430d64a8d") version("3.1.1", sha256="5a4e013a51ac4ed794fe35c55b700cd720346fda7f33ec84c76b86a5fb880a6e") version("3.1", sha256="09dff2eda692486b88ad5ee189bbc9d7ebc1f17c863108c44ccf9631badbada4") version("3.0.3", sha256="18a3905f7917340387e3edc8e5766f31ab1af41f4ecc5665da6c769ca21c4ee8") From d335bc35e080f157e03aa58789957039d39e94a8 Mon Sep 17 00:00:00 2001 From: William Williams Date: Fri, 26 Jun 2026 09:00:03 +0200 Subject: [PATCH 3/8] [scorep] Remove conditional for pre-4.0 versions as 7.0 is the oldest supported --- repos/spack_repo/builtin/packages/scorep/package.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/repos/spack_repo/builtin/packages/scorep/package.py b/repos/spack_repo/builtin/packages/scorep/package.py index 56c5c4cdbc6..37db6be72a6 100644 --- a/repos/spack_repo/builtin/packages/scorep/package.py +++ b/repos/spack_repo/builtin/packages/scorep/package.py @@ -143,11 +143,7 @@ def configure_args(self): cname = self.clean_compiler(spec.compiler.name) config_args.extend(["--with-nocross-compiler-suite={0}".format(cname)]) - if self.version >= Version("4.0"): - config_args.append("--with-cubew=%s" % spec["cubew"].prefix.bin) - config_args.append("--with-cubelib=%s" % spec["cubelib"].prefix.bin) - else: - config_args.append("--with-cube=%s" % spec["cube"].prefix.bin) + config_args.append("--with-cube=%s" % spec["cube"].prefix.bin) if "+papi" in spec: config_args.append("--with-papi-header=%s" % spec["papi"].prefix.include) From 4a27a406a7798e8e02b436b2a3c0418451905577 Mon Sep 17 00:00:00 2001 From: William Williams Date: Fri, 26 Jun 2026 09:03:25 +0200 Subject: [PATCH 4/8] [scorep] Add version and depedencies for upcoming 10.0 release. Checksum to follow when the tarballs are ready. Score-P v10.0 newly requires: * OTF2 3.2+ * CUDA 11.6+ for +cuda * rocprofiler-sdk for +hip Drops: * rocm-smi-lib for 10.0+ * rocprofiler-dev for 10.0+ (no longer need roctracer) Dropped redundant MPI `depends_on` that only applied to older versions. --- .../builtin/packages/scorep/package.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/repos/spack_repo/builtin/packages/scorep/package.py b/repos/spack_repo/builtin/packages/scorep/package.py index 37db6be72a6..c61ecbebeab 100644 --- a/repos/spack_repo/builtin/packages/scorep/package.py +++ b/repos/spack_repo/builtin/packages/scorep/package.py @@ -16,6 +16,7 @@ class Scorep(AutotoolsPackage): homepage = "https://www.vi-hps.org/projects/score-p" url = "https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-7.1/scorep-7.1.tar.gz" maintainers("wrwilliams") + version("10.0") version("9.4", sha256="bea58d8c47a7512eca0a5858179377f3f0861f30eafb342a29aa97c05de8f623") version("9.3", sha256="5498b31b1d6c04b08a9d408320a7515e884538d248de58b6dd11b48c8f364112") version("9.2", sha256="be3eaee99cdd0145e518c1aa959126df45e25b61579a007d062748b2844c499c") @@ -67,6 +68,10 @@ class Scorep(AutotoolsPackage): depends_on("cxx", type=("build", "run")) depends_on("fortran", type=("build", "run"), when="+fortran") + # SCOREP 10 + depends_on("otf2@3.2:", when="@10:") + + # SCOREP 9 depends_on("gotcha@1.0.8:", type="link", when="+gotcha") depends_on("otf2@3.1:", when="@9:") @@ -90,16 +95,25 @@ class Scorep(AutotoolsPackage): # Conditional dependencies for variants depends_on("mpi@2.2:", type=("build", "run"), when="+mpi") - depends_on("mpi", type=("build", "run"), when="+mpi") depends_on("papi", when="+papi") depends_on("pdt", when="+pdt") depends_on("llvm", when="+unwind") depends_on("libunwind", when="+unwind") + # Older CUDA support progressively gets phased out + # Expect 13+ to be the requirement for Score-P 11 + # due to the user defined activity records. + # --wrwilliams JUN26 + depends_on("cuda@11.6:", when="@10.0+cuda") depends_on("cuda@7:", when="@8.0:+cuda") depends_on("cuda", when="+cuda") depends_on("hip@4.2:", when="+hip") - depends_on("rocprofiler-dev", when="+hip") - depends_on("rocm-smi-lib", when="+hip") + # Score-P 10 introduces rocprofiler-sdk based instrumentation + # Technically there is a major version of overlap but as this + # has not been a variant, I'm just cutting over now. + # --wrwilliams JUN2026 + depends_on("rocprofiler-dev", when="@:9+hip") + depends_on("rocm-smi-lib", when="@:9+hip") + depends_on("rocprofiler-sdk", when="@10:+hip") # Score-P requires a case-sensitive file system, and therefore # does not work on macOS From d7290f5a61ad5637d2e6f679043dd4ba88de0034 Mon Sep 17 00:00:00 2001 From: William Williams Date: Fri, 26 Jun 2026 13:55:25 +0200 Subject: [PATCH 5/8] [scorep] Checksum for Score-P 10 --- repos/spack_repo/builtin/packages/scorep/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/spack_repo/builtin/packages/scorep/package.py b/repos/spack_repo/builtin/packages/scorep/package.py index c61ecbebeab..02c5ca21726 100644 --- a/repos/spack_repo/builtin/packages/scorep/package.py +++ b/repos/spack_repo/builtin/packages/scorep/package.py @@ -16,7 +16,7 @@ class Scorep(AutotoolsPackage): homepage = "https://www.vi-hps.org/projects/score-p" url = "https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-7.1/scorep-7.1.tar.gz" maintainers("wrwilliams") - version("10.0") + version("10.0", sha256="1e96fe2414bfc9eb868619501a5f62943b554eb1358628610e8e9e01036dacf2") version("9.4", sha256="bea58d8c47a7512eca0a5858179377f3f0861f30eafb342a29aa97c05de8f623") version("9.3", sha256="5498b31b1d6c04b08a9d408320a7515e884538d248de58b6dd11b48c8f364112") version("9.2", sha256="be3eaee99cdd0145e518c1aa959126df45e25b61579a007d062748b2844c499c") From 0c26ee3fbb27b675a6bffe97e248be782936aa54 Mon Sep 17 00:00:00 2001 From: wrwilliams Date: Fri, 26 Jun 2026 12:13:15 +0000 Subject: [PATCH 6/8] [@spackbot] updating style on behalf of wrwilliams --- repos/spack_repo/builtin/packages/scorep/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/repos/spack_repo/builtin/packages/scorep/package.py b/repos/spack_repo/builtin/packages/scorep/package.py index 02c5ca21726..a2a48d39fa4 100644 --- a/repos/spack_repo/builtin/packages/scorep/package.py +++ b/repos/spack_repo/builtin/packages/scorep/package.py @@ -71,7 +71,6 @@ class Scorep(AutotoolsPackage): # SCOREP 10 depends_on("otf2@3.2:", when="@10:") - # SCOREP 9 depends_on("gotcha@1.0.8:", type="link", when="+gotcha") depends_on("otf2@3.1:", when="@9:") From 6ed2c063c15cdae2409fcd8a97eaceab93b9ce20 Mon Sep 17 00:00:00 2001 From: William Williams Date: Fri, 26 Jun 2026 14:40:59 +0200 Subject: [PATCH 7/8] [scorep] Add patch for v10.0 intel MPIs. Score-P 10.0 accidentally broke our MPI adapters' link dependency on `libmpi` for Intel MPI due to blind duplication of link flags from older Intel versions. This had existed to address the `libmpi`/`libmpi_mt` difference in older Intel MPI distributions. --- .../builtin/packages/scorep/package.py | 4 ++++ .../scorep/scorep-10.0-impi-fix.patch | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 repos/spack_repo/builtin/packages/scorep/scorep-10.0-impi-fix.patch diff --git a/repos/spack_repo/builtin/packages/scorep/package.py b/repos/spack_repo/builtin/packages/scorep/package.py index a2a48d39fa4..52f61d405f8 100644 --- a/repos/spack_repo/builtin/packages/scorep/package.py +++ b/repos/spack_repo/builtin/packages/scorep/package.py @@ -33,6 +33,10 @@ class Scorep(AutotoolsPackage): when="@7:8.4 +gcc-plugin", sha256="d20b3046ba6a89ad9c106bcf372bceb1bd9ab780d4c7dd9e7373f0099b92d933", ) + patch( + "scorep-10.0-impi-fix.patch", + when="@10.0 +mpi" + ) # Variants variant("mpi", default=True, description="Enable MPI support") diff --git a/repos/spack_repo/builtin/packages/scorep/scorep-10.0-impi-fix.patch b/repos/spack_repo/builtin/packages/scorep/scorep-10.0-impi-fix.patch new file mode 100644 index 00000000000..776fe66de3b --- /dev/null +++ b/repos/spack_repo/builtin/packages/scorep/scorep-10.0-impi-fix.patch @@ -0,0 +1,23 @@ +diff --git a/build-config/common/platforms/compiler-mpi-intel3 b/build-config/common/platforms/compiler-mpi-intel3 +index 31e6893ea..3a8d85805 100644 +--- a/build-config/common/platforms/compiler-mpi-intel3 ++++ b/build-config/common/platforms/compiler-mpi-intel3 +@@ -16,7 +16,7 @@ MPI_FFLAGS={FFLAGS} + MPI_FCFLAGS={FCFLAGS} + #MPI_LDFLAGS= + #MPI_LIBS= +-MPILIB_LDFLAGS=-Wc,-nolinkage ++#MPILIB_LDFLAGS=-Wc,-nolinkage + + # # Scalasca1 settings + # MPILIB = +diff --git a/build-config/common/platforms/compiler-mpi-oneapi b/build-config/common/platforms/compiler-mpi-oneapi +index 7c55835dc..e6feaf7dd 100644 +--- a/build-config/common/platforms/compiler-mpi-oneapi ++++ b/build-config/common/platforms/compiler-mpi-oneapi +@@ -16,4 +16,4 @@ MPI_FFLAGS={FFLAGS} + MPI_FCFLAGS={FCFLAGS} + #MPI_LDFLAGS= + #MPI_LIBS= +-MPILIB_LDFLAGS=-Wc,-nolinkage ++#MPILIB_LDFLAGS=-Wc,-nolinkage From f5a8c17a6f7084e99102cdcfe9364b21f8f91f96 Mon Sep 17 00:00:00 2001 From: wrwilliams Date: Fri, 26 Jun 2026 13:21:09 +0000 Subject: [PATCH 8/8] [@spackbot] updating style on behalf of wrwilliams --- repos/spack_repo/builtin/packages/scorep/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/repos/spack_repo/builtin/packages/scorep/package.py b/repos/spack_repo/builtin/packages/scorep/package.py index 52f61d405f8..e640046b413 100644 --- a/repos/spack_repo/builtin/packages/scorep/package.py +++ b/repos/spack_repo/builtin/packages/scorep/package.py @@ -33,10 +33,7 @@ class Scorep(AutotoolsPackage): when="@7:8.4 +gcc-plugin", sha256="d20b3046ba6a89ad9c106bcf372bceb1bd9ab780d4c7dd9e7373f0099b92d933", ) - patch( - "scorep-10.0-impi-fix.patch", - when="@10.0 +mpi" - ) + patch("scorep-10.0-impi-fix.patch", when="@10.0 +mpi") # Variants variant("mpi", default=True, description="Enable MPI support")