Skip to content

Commit 35206d5

Browse files
author
Mathieu Taillefumier
committed
Update the CI/CD
1 parent 5d13bb9 commit 35206d5

File tree

7 files changed

+25
-19
lines changed

7 files changed

+25
-19
lines changed

.ci/include/cscs/00-variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ variables:
1010
UENV_NAME: tmlqcd
1111
UENV_VERSION: experimental
1212
UENV_TAG: v0.0.7
13-
13+
UENV_VERSION: v1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
gcc:
2-
version: "14.2"
2+
version: "14.3"

.ci/uenv-recipes/tmlqcd/daint-gh200/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: tmlqcd
22
store: /user-environment
33
spack:
44
repo: https://github.com/spack/spack.git
5-
commit: releases/v1.0
5+
commit: releases/v1.1
66
packages:
77
repo: https://github.com/spack/spack-packages.git
8-
commit: releases/v2025.11
8+
#commit:
99
modules: true
1010
description: "tmLQCD is a freely available software suite providing a set of tools to be used in lattice QCD simulations."
1111
version: 2

.ci/uenv-recipes/tmlqcd/daint-gh200/environments.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ gcc-env:
22
compiler: [gcc]
33
network:
44
mpi: cray-mpich@8.1.32 +cuda
5+
specs: ['libfabric@2.4.0+cuda']
56
unify: true
67
specs:
78
- python@3.12
@@ -10,7 +11,7 @@ gcc-env:
1011
- lemonio
1112
- c-lime
1213
- openblas
13-
- cmake@3
14+
- cmake@3.31
1415
- cuda
1516
variants:
1617
- +mpi

.ci/uenv-recipes/tmlqcd/daint-gh200/repo/packages/lemonio/package.py

100755100644
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,28 @@
88

99
from spack.package import *
1010

11-
class Lemonio(AutotoolsPackage, CMakePackage):
11+
12+
class Lemonio(CMakePackage):
1213
"""LEMON: Lightweight Parallel I/O library for Lattice QCD."""
1314

1415
homepage = "https://github.com/etmc/lemon"
15-
git = "https://github.com/etmc/lemon.git"
16+
git = "https://github.com/etmc/lemon.git"
1617
license("GPL-3.0-or-later")
1718

18-
version('master', branch='master')
19-
19+
version("master", branch="master")
20+
variant("shared", default=False, description="Build shared library")
2021
depends_on("libtool", type="build", when="@master build_system=cmake")
21-
depends_on("cmake@4", type="build", when="master build_system=cmake")
22+
depends_on("cmake@3.28:", type="build", when="@master build_system=cmake")
2223

23-
depends_on('mpi')
24+
depends_on("mpi")
2425

2526
generator("ninja")
2627

28+
2729
class CMakeBuilder(cmake.CMakeBuilder):
2830
def cmake_args(self):
2931
spec = self.spec
3032
args = [
3133
self.define_from_variant("DBUILD_SHARED_LIBS", "shared"),
3234
]
3335
return args
34-

.ci/uenv-recipes/tmlqcd/daint-gh200/repo/packages/tmlqcd/package.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5-
from spack_repo.builtin.build_systems.cmake import CmakePackage
5+
from spack_repo.builtin.build_systems import cmake
6+
from spack_repo.builtin.build_systems.cmake import CMakePackage, generator
67
from spack_repo.builtin.build_systems.rocm import ROCmPackage
78
from spack_repo.builtin.build_systems.cuda import CudaPackage
89

910
from spack.package import *
1011

11-
class Tmlqcd(CmakePackage, CudaPackage, ROCmPackage):
12-
"""Base class for building tmlQCD."""
12+
13+
class Tmlqcd(CMakePackage, CudaPackage, ROCmPackage):
14+
"""Base class for building tmlQCD."""
1315

1416
homepage = "https://www.itkp.uni-bonn.de/~urbach/software.html"
1517
url = "https://github.com/etmc/tmLQCD/archive/refs/tags/rel-5-1-6.tar.gz"
@@ -47,8 +49,8 @@ class Tmlqcd(CmakePackage, CudaPackage, ROCmPackage):
4749
variant("half_spinor", default=True, description="Use a Dirac operator with half-spinor")
4850
variant("shared", default=False, description="Enable shared library")
4951
variant("shmem", default=False, description="Use shmem API")
50-
variant("quda", default=True, description="Enable the QUDA library", when="+cuda",)
51-
variant("quda", default=True, description="Enable the QUDA library", when="+rocm",)
52+
variant("quda", default=True, description="Enable the QUDA library", when="+cuda")
53+
variant("quda", default=True, description="Enable the QUDA library", when="+rocm")
5254
variant(
5355
"QPhiX", default=False, description="Enable the QPhiX library for Intel Xeon and Xeon Phis"
5456
)
@@ -77,7 +79,7 @@ class Tmlqcd(CmakePackage, CudaPackage, ROCmPackage):
7779
depends_on("lapack")
7880
depends_on("pkgconfig", type="build")
7981

80-
# dependencies
82+
# dependencies
8183
depends_on("mpi", when="+mpi")
8284
depends_on("lemon-io", when="+lemon")
8385

@@ -93,6 +95,7 @@ class Tmlqcd(CmakePackage, CudaPackage, ROCmPackage):
9395

9496
depends_on("fftw-api@3", when="+fftw")
9597

98+
9699
class CMakeBuilder(cmake.CMakeBuilder):
97100
def cmake_args(self):
98101
spec = self.spec
@@ -101,7 +104,7 @@ def cmake_args(self):
101104
self.define_from_variant("TM_USE_LEMON", "lemon"),
102105
self.define_from_variant("TM_USE_MPI", "mpi"),
103106
self.define_from_variant("TM_USE_QUDA", "quda"),
104-
self.define_from_variant("TM_USE_CUDA","cuda"),
107+
self.define_from_variant("TM_USE_CUDA", "cuda"),
105108
self.define_from_variant("TM_USE_HIP", "cuda"),
106109
self.define_from_variant("TM_USE_FFTW", "fftw"),
107110
self.define_from_variant("TM_FIXEDVOLUME", "fixed_volume"),
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
repo:
22
namespace: apps
3+
api: v2.2

0 commit comments

Comments
 (0)