Skip to content

Commit 68e2a9a

Browse files
authored
Update metatensor ecosystem (spack#1959)
* update metatensor * [@spackbot] updating style on behalf of RMeli --------- Co-authored-by: RMeli <[email protected]>
1 parent 8c7a953 commit 68e2a9a

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class LibmetatensorTorch(CMakePackage):
1919

2020
version("0.8.0", sha256="61d383ce958deafe0e3916088185527680c9118588722b17ec5c39cfbaa6da55")
2121
version("0.8.1", sha256="9da124e8e09dc1859700723a76ff29aef7a216b84a19d38746cc45bf45bc599b")
22+
version("0.7.6", sha256="8dcc07c86094034facba09ebcc6b52f41847c2413737c8f9c88ae0a2990f8d41")
2223

2324
depends_on("[email protected]:", type="build")
2425
depends_on("cxx", type="build")

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ class LibmetatomicTorch(CMakePackage):
1717
maintainers("HaoZeke", "luthaf", "rmeli")
1818
license("BSD-3-Clause", checked_by="HaoZeke")
1919

20+
version("0.1.5", sha256="8ecd1587797fe1cf6b2162ddc10cc84c558fdfd55ab225bc5de4fe15ace8fc3d")
2021
version("0.1.4", sha256="385ec8b8515d674b6a9f093f724792b2469e7ea2365ca596f574b64e38494f94")
22+
version("0.1.3", sha256="01a49e64e6c23d269fe935a557a60ae40092f4aad145fb6201caef26a9e0898b")
2123

2224
depends_on("[email protected]:", type="build")
2325
depends_on("cxx", type="build")
2426
depends_on("c", type="build")
25-
depends_on("[email protected]:0.8")
27+
depends_on("[email protected]:0.8", when="@0.1.4:")
28+
depends_on("[email protected]:0.7", when="@0.1.3")
2629
depends_on("[email protected]:")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PyMetatensorCore(PythonPackage):
2626

2727
for ver, sha in VERSIONS.items():
2828
version(ver, sha256=sha)
29-
depends_on(f"libmetatensor@{ver}", when=f"@{ver}")
29+
depends_on(f"libmetatensor@={ver}", when=f"@{ver}")
3030

3131
# pyproject.toml
3232
depends_on("py-setuptools@77:", type="build")

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
from spack.package import *
1010

1111
VERSIONS = {
12-
"0.8.0": "240ea8c37328f6bb61ec9f3e482131f0875c73166a0e349a8dd8b85204c58bd7",
1312
"0.8.1": "11986d4c2964054baae9fe10ffc36c6a6ba70a78d97b406cb6c2e14e72a0cf72",
13+
"0.8.0": "240ea8c37328f6bb61ec9f3e482131f0875c73166a0e349a8dd8b85204c58bd7",
14+
"0.7.6": "bcc23b535e5b86c0d49096cbf73de67141896f4f14c114515d97b936a78353a1",
1415
}
1516

1617

@@ -27,7 +28,7 @@ class PyMetatensorTorch(PythonPackage):
2728

2829
for ver, sha256 in VERSIONS.items():
2930
version(ver, sha256=sha256)
30-
depends_on(f"libmetatensor-torch@{ver}", when=f"@{ver}")
31+
depends_on(f"libmetatensor-torch@={ver}", when=f"@{ver}")
3132

3233
depends_on("[email protected]:", type=("build", "run"))
3334
depends_on("[email protected]:0.1", type=("build", "run"))

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,28 @@ class PyMetatomicTorch(PythonPackage):
1818
maintainers("HaoZeke", "luthaf", "rmeli")
1919
license("BSD-3-Clause", checked_by="HaoZeke")
2020

21+
version("0.1.5", sha256="fb9680cd4cbac4348833af9cb2d196bcfbffb02da623397168e3f96c9a9e0e32")
2122
version("0.1.4", sha256="c593bbc0fa3a410bd19d4a4a8d0008d5bd1c31a9faaca85b9d6b655ee1133bde")
23+
version("0.1.3", sha256="60a4b651cf6e15f175879af74d18215d45cc4fd5e42a61242a180e2014fe9fd2")
2224

2325
depends_on("[email protected]:", type=("build", "run"))
24-
depends_on("py-vesin", type=("build", "run"))
26+
# python/metatomic_torch/setup.py
2527
depends_on("[email protected]:", type=("build", "run"))
26-
depends_on("[email protected]:0.8", type=("build", "run"))
27-
# >=0.3.0 and <0.4.0
28+
depends_on("py-vesin", type=("build", "run"))
29+
depends_on("[email protected]:0.8", type=("build", "run"), when="@0.1.4:")
30+
depends_on("[email protected]:0.7", type=("build", "run"), when="@0.1.3")
2831
depends_on("[email protected]:0.3", type=("build", "run"))
2932
# pyproject.toml
3033
depends_on("py-setuptools@77:", type="build")
3134
depends_on("py-packaging@23:", type="build")
3235
# CMakeLists.txt
3336
depends_on("[email protected]:", type="build")
37+
depends_on("[email protected]:", type="build", when="@0.1.5:")
38+
39+
# Fix build when torch looks for a CUDA compiler
40+
patch(
41+
"https://github.com/metatensor/metatomic/commit/256f9f96eb36620e42228c25d7b3062d544a11c0.patch?full_index=1",
42+
sha256="4e958c83e1a2b5684984f6db38c948a86cca6b5477f8e0a849496d235f81d628",
43+
when="@0.1.3",
44+
level=3,
45+
)

0 commit comments

Comments
 (0)