Skip to content

Commit 2d4f932

Browse files
authored
Merge pull request #40 from openhpc/2025-09-12-obs
feat: enable additional packages and remove trilinos intel constraints
2 parents ce7ee6e + 24b92be commit 2d4f932

File tree

5 files changed

+10
-37
lines changed

5 files changed

+10
-37
lines changed

obs/config

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,23 @@ skip_x86 = ["-arm1","gnu15-impi"]
4747
compiler_families=["gnu15", "intel"]
4848
mpi_families=["openmpi5","mpich","mvapich2","impi"]
4949
compiler_dependent = ["openmpi", "mpich", "mvapich2", "openblas", "R", "likwid",
50-
"!pdtoolkit", "gsl", "metis", "superlu", "scotch",
50+
"pdtoolkit", "gsl", "metis", "superlu", "scotch",
5151
"numpy", "plasma", "hdf5", "gotcha", "cubew", "cubelib", "opari2"]
5252

5353
standalone = ["docs", "test-suite", "warewulf", "gnu-compilers", "ohpc-filesystem",
5454
"cmake", "pdsh", "intel-compilers-devel","autoconf","automake", "pmix",
5555
"impi-devel", "meta-packages", "easybuild", "spack", "hwloc", "ucx",
56+
"conman", "examples", "charliecloud", "magpie",
5657
"python-Cython", "openpbs", "libtool", "prun", "papi", "nhc", "losf",
5758
"lmod", "genders", "hpc-workspace", "valgrind", "slurm", "cuda-devel"]
5859

5960
mpi_dependent = ["otf2", "sionlib", "fftw", "scalapack",
60-
"scorep", "scalasca", "!scipy", "phdf5", "netcdf", "netcdf-fortran",
61-
"netcdf-cxx", "lmod-defaults", "!geopm", "!mumps", "omb",
61+
"scorep", "scalasca", "phdf5", "netcdf", "netcdf-fortran",
62+
"netcdf-cxx", "lmod-defaults", "!geopm", "mumps", "omb",
6263
"ptscotch", "boost", "pnetcdf", "tau", "extrae", "imb",
63-
"opencoarrays", "hypre", "mpi4py", "dimemas", "adios2",
64-
"!trilinos", "petsc", "slepc", "superlu_dist", "!mfem"]
65-
skip_on_distro_openEuler_22.03 = ["-arm1","-intel","-impi","impi-devel","intel-compilers-devel",
64+
"!opencoarrays", "hypre", "mpi4py", "dimemas", "adios2",
65+
"trilinos", "petsc", "slepc", "superlu_dist", "mfem"]
66+
skip_on_distro_openEuler_24.03 = ["-arm1","-intel","-impi","impi-devel","intel-compilers-devel",
6667
"arm-compilers-devel","warewulf","cuda-devel"]
6768
openblas_compiler=["gnu15"]
6869
R_compiler=["gnu15"]
@@ -87,15 +88,15 @@ compiler_dependent = ["!openmpi", "!mpich", "!mvapich2", "!openblas", "!R", "!li
8788
"!numpy", "!plasma", "!hdf5", "!gotcha", "!cubew", "!cubelib", "!opari2"]
8889

8990
standalone = ["docs", "test-suite", "warewulf", "!gnu-compilers", "ohpc-filesystem",
90-
"!cmake", "!pdsh", "intel-compilers-devel", "examples",
91-
"impi-devel", "!meta-packages", "easybuild", "!spack", "!hwloc", "!ucx",
91+
"cmake", "!pdsh", "intel-compilers-devel", "examples",
92+
"impi-devel", "!meta-packages", "easybuild", "spack", "!hwloc", "!ucx",
9293
"lmod", "!genders", "hpc-workspace", "valgrind", "!slurm", "!cuda-devel"]
9394
mpi_dependent = ["!otf2", "!sionlib", "!fftw", "!scalapack",
9495
"scorep", "!scalasca", "!scipy", "!phdf5", "!netcdf", "!netcdf-fortran",
9596
"!netcdf-cxx", "!lmod-defaults", "!geopm", "!mumps", "!omb",
9697
"!ptscotch", "!boost", "!pnetcdf", "!tau", "!extrae", "!imb",
9798
"!opencoarrays", "!hypre", "!mpi4py", "!dimemas", "!adios2",
98-
"!trilinos", "!petsc", "!slepc", "!superlu_dist", "!mfem"]
99+
"trilinos", "!petsc", "!slepc", "!superlu_dist", "!mfem"]
99100
skip_on_distro_openEuler_22.03 = ["-arm1","-intel","-impi","impi-devel","intel-compilers-devel",
100101
"arm-compilers-devel","warewulf","cuda-devel"]
101102
openblas_compiler=["gnu14", "gnu15"]

obs/constraints/trilinos-intel-impi

Lines changed: 0 additions & 7 deletions
This file was deleted.

obs/constraints/trilinos-intel-mpich

Lines changed: 0 additions & 7 deletions
This file was deleted.

obs/constraints/trilinos-intel-mvapich2

Lines changed: 0 additions & 7 deletions
This file was deleted.

obs/constraints/trilinos-intel-openmpi3

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)