Skip to content

Commit ec5444c

Browse files
authored
Merge branch 'develop' into openblas-dynamic-dispatch-aarch64
2 parents 931b8f4 + 1594bb3 commit ec5444c

File tree

180 files changed

+1954
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+1954
-456
lines changed

.ci/gitlab/.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ dotenv:
239239
- export WRITE_DOTENV_SCRIPT_REF="0f92f8bcd4dd94fc7379eef8db5c9ed6f1935402"
240240
- export WRITE_DOTENV_SCRIPT_SHA256="124d80ef595b9ddc2fca3f202a70ee15378547ad5e887fe7d3b248669c5ee54a"
241241
- curl -LSsO https://raw.githubusercontent.com/spack/spack-packages/$WRITE_DOTENV_SCRIPT_REF/.ci/gitlab/scripts/common/write_dotenv.py
242-
- echo "$WRITE_DOTENV_SCRIPT_SHA256 write_dotenv.py" | sha256sum --check --status
242+
- echo "$WRITE_DOTENV_SCRIPT_SHA256 write_dotenv.py" | sha256sum -c
243243
- python3 write_dotenv.py .ci/env
244244
- cat env
245245

.ci/gitlab/configs/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ci:
5959

6060
- signing-job:
6161
image:
62-
name: ghcr.io/spack/notary@sha256:8b685186de3e26bfacbdfea27cf3802c853e2f1311e833e4d857247791a636dc
62+
name: ghcr.io/spack/notary@sha256:a1e2575e12a1d60083a65f0a1b35abf0df85d7086e7f8b10c2a9926614a46127
6363
entrypoint: [""]
6464
tags: ["aws"]
6565
script:
@@ -150,7 +150,7 @@ ci:
150150
- nproc || true
151151
# Clone the other repo
152152
- - curl -LSsO https://raw.githubusercontent.com/spack/spack-packages/$REMOTE_SCRIPT_REF/.ci/gitlab/scripts/common/clone_spack.sh
153-
- echo "$REMOTE_SCRIPT_CLONE_SPACK_SHA256 clone_spack.sh" | sha256sum --check --status
153+
- echo "$REMOTE_SCRIPT_CLONE_SPACK_SHA256 clone_spack.sh" | sha256sum -c
154154
- sh clone_spack.sh
155155
- - . "${SPACK_CI_SPACK_ROOT}/share/spack/setup-env.sh"
156156
- spack --version

.ci/gitlab/configs/linux/x86_64_v4/ci.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@ ci:
33
- build-job:
44
variables:
55
SPACK_CI_TARGET: x86_64_v4
6-
before_script:
7-
- - curl -LfsS "https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.x86_64-linux-gnu.tar.gz" -o gmake.tar.gz
8-
- printf "fef1f59e56d2d11e6d700ba22d3444b6e583c663d6883fd0a4f63ab8bd280f0f gmake.tar.gz" | sha256sum --check --strict --quiet
9-
- tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
106
tags: ["x86_64_v4"]

repos/spack_repo/builtin/packages/adiak/package.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
import os
6+
57
from spack_repo.builtin.build_systems.cmake import CMakePackage
68

79
from spack.package import *
@@ -19,12 +21,15 @@ class Adiak(CMakePackage):
1921

2022
variant("mpi", default=True, description="Build with MPI support")
2123
variant("shared", default=True, description="Build dynamic libraries")
24+
variant("python", default=False, when="@0.5.0:", description="Build Python bindings")
2225

2326
license("MIT")
2427

28+
version("master", branch="master")
2529
version(
26-
"0.4.1", commit="7ac997111785bee6d9391664b1d18ebc2b3c557b", submodules=True, preferred=True
30+
"0.5.0", commit="f08c8375c613e13e9b9c6a1db271cbf8f0d3f3e3", submodules=True, preferred=True
2731
)
32+
version("0.4.1", commit="7ac997111785bee6d9391664b1d18ebc2b3c557b", submodules=True)
2833
version("0.4.0", commit="7e8b7233f8a148b402128ed46b2f0c643e3b397e", submodules=True)
2934
version("0.2.2", commit="3aedd494c81c01df1183af28bc09bade2fabfcd3", submodules=True)
3035
version("0.2.1", commit="950e3bfb91519ecb7b7ee7fa3063bfab23c0e2c9", submodules=True)
@@ -36,6 +41,11 @@ class Adiak(CMakePackage):
3641

3742
depends_on("mpi", when="+mpi")
3843

44+
with when("+python"):
45+
extends("python")
46+
depends_on("python@3:", type=("build", "link", "run"))
47+
depends_on("[email protected]:", type=("build", "link", "run"))
48+
3949
def cmake_args(self):
4050
args = []
4151
if self.spec.satisfies("+mpi"):
@@ -50,5 +60,12 @@ def cmake_args(self):
5060
else:
5161
args.append("-DBUILD_SHARED_LIBS=OFF")
5262

63+
if self.spec.satisfies("+python"):
64+
args.append("-DENABLE_PYTHON_BINDINGS=ON")
65+
pybind11_cmake = os.path.join(
66+
self.spec["py-pybind11"].prefix, "pybind11", "share", "cmake", "pybind11"
67+
)
68+
args.append(f"-Dpybind11_DIR={pybind11_cmake}")
69+
5370
args.append("-DENABLE_TESTS=OFF")
5471
return args

repos/spack_repo/builtin/packages/amdsmi/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Amdsmi(CMakePackage):
2323
libraries = ["libamd_smi"]
2424

2525
license("MIT")
26+
version("7.1.1", sha256="2a9dfafac9593d3093c3f5fc611682e712f08816414f210344ea7b719c085ff5")
2627
version("7.1.0", sha256="17ccddf8988a5674edb360b9f3b41bf3d94c6f4ba36cf8d84739c6ccdfc87c50")
2728
version("7.0.2", sha256="6df8d828157124b513f4ffa6c059231398b19120f5b782ec42fc151862e2cf90")
2829
version("7.0.0", sha256="5a126721473859afc687bd5f00bf480cffc76c2aed2bfa0b74dfbc87d93037a2")

repos/spack_repo/builtin/packages/amrex/package.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage):
2929
license("BSD-3-Clause")
3030

3131
version("develop", branch="development")
32+
version("26.01", sha256="b26c8d36b3941881bb5db683147f94d5a48f9bcedfa4bcf65a36acb6f0710bcb")
3233
version("25.12", sha256="60a788cf398563cdf25438a3bbe597fe1f3b18f359b30fb3c0f568dd62908f1a")
3334
version("25.11", sha256="be9e5f04e1f3e2252a14e5bb817fb4f2c231e0901ef85ee4e14341616f6b1ba6")
3435
version("25.10", sha256="3c3e9e239b42a5c73e72a418bd29cf6bb7660646ee62f5e11ff131eaaa04fa16")
@@ -194,7 +195,7 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage):
194195
depends_on("conduit")
195196
depends_on("conduit +mpi", when="+mpi")
196197
with when("+catalyst"):
197-
depends_on("[email protected]: +conduit")
198+
depends_on("[email protected]:")
198199
depends_on("libcatalyst +mpi", when="+mpi")
199200
with when("+sundials"):
200201
depends_on("[email protected]: +ARKODE +CVODE", when="@21.07:22.04")
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/make/Prologue.mk b/make/Prologue.mk
2+
index 13a9c4be1..099896ec9 100644
3+
--- a/make/Prologue.mk
4+
+++ b/make/Prologue.mk
5+
@@ -236,15 +236,15 @@ compile-arrow-cpp:
6+
7+
.PHONY: compile-arrow-write
8+
compile-arrow-write:
9+
- $(CHPL_CXX) -O3 -std=c++17 -c $(ARROW_WRITE_CPP) -o $(ARROW_WRITE_O) $(INCLUDE_FLAGS) $(ARROW_SANITIZE)
10+
+ $(CHPL_CXX) -O3 -std=c++17 -fPIC -c $(ARROW_WRITE_CPP) -o $(ARROW_WRITE_O) $(INCLUDE_FLAGS) $(ARROW_SANITIZE)
11+
12+
.PHONY: compile-arrow-read
13+
compile-arrow-read:
14+
- $(CHPL_CXX) -O3 -std=c++17 -c $(ARROW_READ_CPP) -o $(ARROW_READ_O) $(INCLUDE_FLAGS) $(ARROW_SANITIZE)
15+
+ $(CHPL_CXX) -O3 -std=c++17 -fPIC -c $(ARROW_READ_CPP) -o $(ARROW_READ_O) $(INCLUDE_FLAGS) $(ARROW_SANITIZE)
16+
17+
.PHONY: compile-arrow-util
18+
compile-arrow-util:
19+
- $(CHPL_CXX) -O3 -std=c++17 -c $(ARROW_UTIL_CPP) -o $(ARROW_UTIL_O) $(INCLUDE_FLAGS) $(ARROW_SANITIZE)
20+
+ $(CHPL_CXX) -O3 -std=c++17 -fPIC -c $(ARROW_UTIL_CPP) -o $(ARROW_UTIL_O) $(INCLUDE_FLAGS) $(ARROW_SANITIZE)
21+
22+
$(ARROW_UTIL_O): $(ARROW_UTIL_CPP) $(ARROW_UTIL_H)
23+
make compile-arrow-util

repos/spack_repo/builtin/packages/arkouda/package.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ class Arkouda(MakefilePackage):
2727

2828
version("main", branch="main")
2929

30+
version(
31+
"2025.12.16", sha256="72638e9d8aa1889b6bafa76c6e8060e0c8aab0871be2693f8fb10f57cd4acbfa"
32+
)
3033
version(
3134
"2025.09.30", sha256="10f488a3ff3482b66f1b1e8a4235d72e91ad07acb932eca85d1e695f0f6155a2"
3235
)
@@ -75,6 +78,11 @@ class Arkouda(MakefilePackage):
7578
depends_on("hdf5+hl~mpi", type=("build", "link", "run", "test"))
7679
depends_on("libiconv", type=("build", "link", "run", "test"))
7780
depends_on("libidn2", type=("build", "link", "run", "test"))
81+
depends_on(
82+
"arrow+brotli+bz2+lz4+parquet+snappy+zlib+zstd",
83+
type=("build", "link", "run"),
84+
when="@2025.12.16:",
85+
)
7886
depends_on(
7987
"arrow@:19+brotli+bz2+lz4+parquet+snappy+zlib+zstd",
8088
type=("build", "link", "run"),
@@ -101,7 +109,8 @@ class Arkouda(MakefilePackage):
101109

102110
# Some systems need explicit -fPIC flag when building the Arrow functions
103111
patch("makefile-fpic-2024.06.21.patch", when="@2024.06.21")
104-
patch("makefile-fpic-2024.10.02.patch", when="@2024.10.02:")
112+
patch("makefile-fpic-2024.10.02.patch", when="@2024.10.02:2025.09.30")
113+
patch("makefile-fpic-2025.12.16.patch", when="@2025.12.16")
105114

106115
sanity_check_is_file = [join_path("bin", "arkouda_server")]
107116

repos/spack_repo/builtin/packages/asio/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class Asio(AutotoolsPackage):
5959
msg="asio v1.22.1 fixed missing includes necessary for gcc v12 and above",
6060
)
6161

62-
stds = ("11", "14", "17", "20")
62+
stds = ("11", "14", "17", "20", "23")
6363
variant(
6464
"cxxstd",
6565
default="11",

repos/spack_repo/builtin/packages/aws_ofi_nccl/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class AwsOfiNccl(AutotoolsPackage):
1919
maintainers("bvanessen", "msimberg")
2020

2121
version("master", branch="master")
22+
version("1.17.2", sha256="6676f49cdfbaa10e953f18aad55f25812e0a7e716692bc911a69fd55cab42181")
2223
version("1.17.1", sha256="15a3b5db51075d20b2cb255b99668a7161779fdf5455436e3bea02d59a04685a")
2324
version("1.17.0", sha256="45a383ffca1e17866e290247e4a314d190aeee09c5380b983a62633168765ec1")
2425
version("1.16.3", sha256="a3e99ecdb6331139b28097ffb3dc03418ed41d1867c6d225778e16a22fbebf60")

0 commit comments

Comments
 (0)