Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ task:
test_script: |
export SKIP_CI_SPECS="${SKIP_CI_SPECS}${JOB_SKIP_CI_SPECS}"
chown ohpc -R tests
tests/ci/setup_slurm_and_run_tests.sh ohpc gnu13 $(tests/ci/cirrus_get_changed_files.sh)
tests/ci/setup_slurm_and_run_tests.sh ohpc gnu14 $(tests/ci/cirrus_get_changed_files.sh)

openeuler_task:
name: openEuler on aarch64
Expand All @@ -45,4 +45,4 @@ openeuler_task:
test_script: |
export SKIP_CI_SPECS="${SKIP_CI_SPECS}${JOB_SKIP_CI_SPECS}"
chown ohpc -R tests
tests/ci/setup_slurm_and_run_tests.sh ohpc gnu13 $(tests/ci/cirrus_get_changed_files.sh)
tests/ci/setup_slurm_and_run_tests.sh ohpc gnu14 $(tests/ci/cirrus_get_changed_files.sh)
8 changes: 4 additions & 4 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
build_on_rhel:
strategy:
matrix:
compiler: [gnu13, intel]
compiler: [gnu14, intel]
runs-on: ubuntu-latest
name: Build on RHEL (${{ matrix.compiler}})
container:
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
test_on_rhel:
strategy:
matrix:
compiler: [gnu13, intel]
compiler: [gnu14, intel]
runs-on: ubuntu-latest
name: Test on RHEL
env:
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
test_on_openEuler:
strategy:
matrix:
compiler: [gnu13]
compiler: [gnu14]
env:
JOB_SKIP_CI_SPECS: |
components/runtimes/charliecloud/SPECS/charliecloud.spec
Expand Down Expand Up @@ -246,7 +246,7 @@ jobs:
test_on_leap:
strategy:
matrix:
compiler: [gnu13]
compiler: [gnu14]
env:
JOB_SKIP_CI_SPECS: |
components/runtimes/charliecloud/SPECS/charliecloud.spec
Expand Down
2 changes: 1 addition & 1 deletion components/mpi-families/openmpi/SPECS/openmpi.spec
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Summary: A powerful implementation of MPI/SHMEM

Name: %{pname}%{RMS_DELIM}-%{compiler_family}%{PROJ_DELIM}

Version: 5.0.3
Version: 5.0.5
Release: 1%{?dist}
License: BSD-3-Clause
Group: %{PROJ_NAME}/mpi-families
Expand Down
2 changes: 1 addition & 1 deletion misc/build_srpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SPEC=$1
if [ $# -ge 2 ]; then
COMPILER_FAMILY=$2
else
COMPILER_FAMILY=gnu13
COMPILER_FAMILY=gnu14
fi

if [ $# -ge 3 ]; then
Expand Down
2 changes: 1 addition & 1 deletion misc/obs/config.2.x
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ skip_x86 = ["-arm1"]

# define compiler/MPI families: first entry in list is defined to be parent in OBS
#compiler_families=["gnu13","intel","arm1"]
compiler_families=["gnu13", "intel"]
compiler_families=["gnu14", "intel"]
mpi_families=["openmpi5","mpich","mvapich2","impi"]

standalone = ["docs","test-suite","warewulf"]
Expand Down
2 changes: 1 addition & 1 deletion tests/admin/spack/spack
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ setup() {
}

@test "[spack] add compiler" {
module load gnu13
module load gnu14
spack compiler find
assert_success
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/run_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
parser.add_argument(
'--compiler-family',
help='compiler family name to use for rebuild',
default='gnu13',
default='gnu14',
)
parser.add_argument(
'--mpi-family',
Expand Down
30 changes: 15 additions & 15 deletions tests/ci/spec_to_test_mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
'components/io-libs/adios2/SPECS/adios2.spec': [
'adios2',
'',
'openmpi5-gnu13-ohpc \
mpich-gnu13-ohpc \
python3-numpy-gnu13-ohpc \
python3-mpi4py-gnu13-mpich-ohpc \
python3-mpi4py-gnu13-openmpi5-ohpc'
'openmpi5-gnu14-ohpc \
mpich-gnu14-ohpc \
python3-numpy-gnu14-ohpc \
python3-mpi4py-gnu14-mpich-ohpc \
python3-mpi4py-gnu14-openmpi5-ohpc'
],
'components/io-libs/hdf5/SPECS/hdf5.spec': [
'hdf5',
Expand Down Expand Up @@ -126,7 +126,7 @@
'components/parallel-libs/superlu_dist/SPECS/superlu_dist.spec': [
'superlu_dist',
'',
'scalapack-gnu13-openmpi5-ohpc scalapack-gnu13-mpich-ohpc'
'scalapack-gnu14-openmpi5-ohpc scalapack-gnu14-mpich-ohpc'
],
'components/parallel-libs/trilinos/SPECS/trilinos.spec': [
'trilinos',
Expand All @@ -136,17 +136,17 @@
'components/perf-tools/extrae/SPECS/extrae.spec': [
'extrae',
'',
'lmod-defaults-gnu13-openmpi5-ohpc'
'lmod-defaults-gnu14-openmpi5-ohpc'
],
'components/perf-tools/geopm/SPECS/geopm.spec': [
'geopm',
'',
'lmod-defaults-gnu13-openmpi5-ohpc'
'lmod-defaults-gnu14-openmpi5-ohpc'
],
'components/perf-tools/likwid/SPECS/likwid.spec': [
'likwid',
'',
'lmod-defaults-gnu13-openmpi5-ohpc'
'lmod-defaults-gnu14-openmpi5-ohpc'
],
'components/perf-tools/papi/SPECS/papi.spec': [
'papi',
Expand All @@ -156,17 +156,17 @@
'components/perf-tools/scorep/SPECS/scorep.spec': [
'scorep',
'',
'lmod-defaults-gnu13-openmpi5-ohpc'
'lmod-defaults-gnu14-openmpi5-ohpc'
],
'components/perf-tools/scalasca/SPECS/scalasca.spec': [
'scalasca',
'',
'lmod-defaults-gnu13-openmpi5-ohpc'
'lmod-defaults-gnu14-openmpi5-ohpc'
],
'components/perf-tools/tau/SPECS/tau.spec': [
'tau',
'',
'lmod-defaults-gnu13-openmpi5-ohpc man bc'
'lmod-defaults-gnu14-openmpi5-ohpc man bc'
],
'components/mpi-families/openmpi/SPECS/openmpi5.spec': [
'slurm',
Expand Down Expand Up @@ -216,7 +216,7 @@
'components/perf-tools/dimemas/SPECS/dimemas.spec': [
'dimemas',
'',
'lmod-defaults-gnu13-openmpi5-ohpc'
'lmod-defaults-gnu14-openmpi5-ohpc'
],
'components/runtimes/charliecloud/SPECS/charliecloud.spec': [
'charliecloud',
Expand All @@ -226,12 +226,12 @@
'components/io-libs/netcdf-fortran/SPECS/netcdf-fortran.spec': [
'netcdf',
'',
'netcdf-cxx-gnu13-openmpi5-ohpc netcdf-cxx-gnu13-mpich-ohpc'
'netcdf-cxx-gnu14-openmpi5-ohpc netcdf-cxx-gnu14-mpich-ohpc'
],
'components/io-libs/netcdf-cxx/SPECS/netcdf-cxx.spec': [
'netcdf',
'',
'netcdf-fortran-gnu13-openmpi5-ohpc netcdf-fortran-gnu13-mpich-ohpc'
'netcdf-fortran-gnu14-openmpi5-ohpc netcdf-fortran-gnu14-mpich-ohpc'
],
'components/perf-tools/imb/SPECS/imb.spec': [
'imb',
Expand Down
2 changes: 1 addition & 1 deletion tests/common/TEST_ENV.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PYTHON_FAMILIES="@PYTHON_FAMILIES@"
BEEGFS_TEST_PATH="/mnt/beegfs"
LUSTRE_TEST_PATH="/mnt/lustre/ohpc-test"
NUM_COMPUTES=2
GCC_DEFAULT="gnu13"
GCC_DEFAULT="gnu14"
export BATS_USE_MKTEMP=1
export OMPI_MCA_rmaps_base_oversubscribe=1
#
Expand Down
4 changes: 4 additions & 0 deletions tests/common/functions
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ check_compiler_family()
myCC=gcc
myCXX=g++
myFC=gfortran
elif [ $LMOD_FAMILY_COMPILER == "gnu14" ];then
myCC=gcc
myCXX=g++
myFC=gfortran
elif [ $LMOD_FAMILY_COMPILER == "gnu13" ];then
myCC=gcc
myCXX=g++
Expand Down
4 changes: 2 additions & 2 deletions tests/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ AC_ARG_ENABLE([psxe],
# Default MPI families to test
if test x$enable_psxe = xyes ;then
AC_MSG_RESULT([yes])
AC_SUBST(COMPILER_FAMILIES,["gnu13 intel"])
AC_SUBST(COMPILER_FAMILIES,["gnu14 intel"])
AC_SUBST(MPI_FAMILIES,["mpich mvapich2 openmpi5 impi"])
AC_SUBST(PYTHON_FAMILIES,["python3"])
else
AC_MSG_RESULT([no])
AC_SUBST(COMPILER_FAMILIES,["gnu13"])
AC_SUBST(COMPILER_FAMILIES,["gnu14"])
AC_SUBST(MPI_FAMILIES,["mpich mvapich2 openmpi5"])
AC_SUBST(PYTHON_FAMILIES,["python3"])
fi
Expand Down
1 change: 1 addition & 0 deletions tests/libs/gsl/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ fi
AM_CONDITIONAL(USE_GNU_COMPILER, test "$LMOD_FAMILY_COMPILER" = "gnu")
AM_CONDITIONAL(USE_GNU_COMPILER, test "$LMOD_FAMILY_COMPILER" = "gnu12")
AM_CONDITIONAL(USE_GNU_COMPILER, test "$LMOD_FAMILY_COMPILER" = "gnu13")
AM_CONDITIONAL(USE_GNU_COMPILER, test "$LMOD_FAMILY_COMPILER" = "gnu14")
AM_COND_IF(USE_GNU_COMPILER, LDFLAGS="${LDFLAGS} -lm")

# Set subdirectories
Expand Down
2 changes: 1 addition & 1 deletion tests/libs/opencoarrays/ohpc-tests/test_mpi_families
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export BATS_JUNIT_CLASS=OpenCoarrays

./bootstrap || exit 1

for compiler in gnu13 ; do
for compiler in gnu14 ; do
for mpi in $MPI_FAMILIES ; do

echo " "
Expand Down
6 changes: 6 additions & 0 deletions tests/m4/compiler_family.m4
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ elif test "x$LMOD_FAMILY_COMPILER" = "xgnu12"; then
FC=gfortran
AC_MSG_RESULT([gnu12])
OHPC_BLAS="-L${OPENBLAS_LIB} -lopenblas"
elif test "x$LMOD_FAMILY_COMPILER" = "xgnu14"; then
CC=gcc
CXX=g++
FC=gfortran
AC_MSG_RESULT([gnu14])
OHPC_BLAS="-L${OPENBLAS_LIB} -lopenblas"
elif test "x$LMOD_FAMILY_COMPILER" = "xgnu13"; then
CC=gcc
CXX=g++
Expand Down
2 changes: 1 addition & 1 deletion tests/perf-tools/scorep/tests/mpi/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if test "x$LMOD_FAMILY_COMPILER" = "xintel" ; then
LDFLAGS="$LDFLAGS -lfmpich"
fi
else
if test "x$LMOD_FAMILY_COMPILER" = "xgnu13" ; then
if test "x$LMOD_FAMILY_COMPILER" = "xgnu14" ; then
CFLAGS="${CFLAGS} -fopenmp"
CXXFLAGS="${CXXFLAGS} -fopenmp"
FCFLAGS="${FCFLAGS} -fopenmp -fallow-argument-mismatch"
Expand Down
2 changes: 1 addition & 1 deletion tests/perf-tools/scorep/tests/serial/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if test "x$LMOD_FAMILY_COMPILER" = "xintel" ; then
CXXFLAGS="${CXXFLAGS} -qopenmp -Wno-implicit-function-declaration"
FCFLAGS="${FCFLAGS} -qopenmp"
else
if test "x$LMOD_FAMILY_COMPILER" = "xgnu13" ; then
if test "x$LMOD_FAMILY_COMPILER" = "xgnu14" ; then
CFLAGS="${CFLAGS} -fopenmp"
CXXFLAGS="${CXXFLAGS} -fopenmp"
FCFLAGS="${FCFLAGS} -fopenmp -fallow-argument-mismatch"
Expand Down
Loading