Skip to content

use nodes option and factor out common required config #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smoors wants to merge 6 commits into
base: main
Choose a base branch
from
Open

use nodes option and factor out common required config #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8e78cf
use nodes option and factor out common slurm config
Dec 21, 2025
3e2ab97
completely overwrite resources for now to avoid issues
Dec 21, 2025
9d0a926
factor out more common stuff
Dec 22, 2025
af76af6
also update github_actions.py
Dec 22, 2025
844fa75
Merge branch 'main' into nodes_option
Dec 25, 2025
aedce55
allow other sched_options; notify when changing site config
Dec 26, 2025
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
105 changes: 5 additions & 100 deletions config/aws_citc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@

import os

from eessi.testsuite.common_config import common_logging_config, common_eessi_init
from eessi.testsuite.common_config import common_eessi_init, common_logging_config, set_common_required_config
from eessi.testsuite.constants import FEATURES


# This config will write all staging, output and logging to subdirs under this prefix
# Override with RFM_PREFIX environment variable
reframe_prefix = os.path.join(os.environ['HOME'], 'reframe_runs')
Expand All @@ -33,178 +34,80 @@
'name': 'x86_64-haswell-8c-15gb',
'access': ['--constraint=shape=c4.2xlarge', '--export=NONE'],
'descr': 'Haswell, 8 cores, 15 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-haswell-16c-30gb',
'access': ['--constraint=shape=c4.4xlarge', '--export=NONE'],
'descr': 'Haswell, 16 cores, 30 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-zen2-8c-16gb',
'access': ['--constraint=shape=c5a.2xlarge', '--export=NONE'],
'descr': 'Zen2, 8 cores, 16 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-zen2-16c-32gb',
'access': ['--constraint=shape=c5a.4xlarge', '--export=NONE'],
'descr': 'Zen2, 16 cores, 32 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-zen3-8c-16gb',
'access': ['--constraint=shape=c6a.2xlarge', '--export=NONE'],
'descr': 'Zen3, 8 cores, 16 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'X86_64-zen3-16c-32gb',
'access': ['--constraint=shape=c6a.4xlarge', '--export=NONE'],
'descr': 'Zen3, 16 cores, 32 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-skylake-cascadelake-8c-16gb',
'access': ['--constraint=shape=c5.2xlarge', '--export=NONE'],
'descr': 'Skylake/Cascade lake, 8 cores, 16 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-skylake-cascadelake-16c-32gb',
'access': ['--constraint=shape=c5.4xlarge', '--export=NONE'],
'descr': 'Skylake/Cascade lake, 16 cores, 32 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-skylake-cascadelake-8c-16gb-nvme',
'access': ['--constraint=shape=c5d.2xlarge', '--export=NONE'],
'descr': 'Skylake/Cascade lake, 8 cores, 16 GiB, 200GB NVMe',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'x86_64-icelake-8c-16gb',
'access': ['--constraint=shape=c6i.2xlarge', '--export=NONE'],
'descr': 'Icelake, 8 cores, 16 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'aarch64-graviton2-8c-16gb',
'access': ['--constraint=shape=c6g.2xlarge', '--export=NONE'],
'descr': 'Graviton2, 8 cores, 16 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'aarch64-graviton2-16c-32gb',
'access': ['--constraint=shape=c6g.4xlarge', '--export=NONE'],
'descr': 'Graviton2, 16 cores, 32 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'aarch64-graviton2-32c-64gb',
'access': ['--constraint=shape=c6g.8xlarge', '--export=NONE'],
'descr': 'Graviton2, 32 cores, 64 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'aarch64-graviton3-8c-16gb',
'access': ['--constraint=shape=c7g.2xlarge', '--export=NONE'],
'descr': 'Graviton3, 8 cores, 16 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
{
'name': 'aarch64-graviton3-16c-32gb',
'access': ['--constraint=shape=c7g.4xlarge', '--export=NONE'],
'descr': 'Graviton3, 16 cores, 32 GiB',
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
},
]
},
],
'environments': [
{
'name': 'default',
'cc': 'cc',
'cxx': '',
'ftn': '',
},
],
'logging': common_logging_config(reframe_prefix),
'general': [
{
Expand All @@ -219,7 +122,6 @@
partition_defaults = {
'scheduler': 'squeue',
'launcher': 'mpirun',
'environs': ['default'],
'features': [
FEATURES.CPU
],
Expand All @@ -233,3 +135,6 @@
for system in site_configuration['systems']:
for partition in system['partitions']:
partition.update(partition_defaults)

# Set common Slurm config options
set_common_required_config(site_configuration)
21 changes: 5 additions & 16 deletions config/aws_mc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

import os

from eessi.testsuite.common_config import common_logging_config, common_general_config, common_eessi_init
from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
set_common_required_config)
from eessi.testsuite.constants import EXTRAS, FEATURES, SCALES

# This config will write all staging, output and logging to subdirs under this prefix
Expand Down Expand Up @@ -72,14 +73,6 @@
]
},
],
'environments': [
{
'name': 'default',
'cc': 'cc',
'cxx': '',
'ftn': '',
},
],
'logging': common_logging_config(reframe_prefix),
'general': [
{
Expand All @@ -95,7 +88,6 @@
partition_defaults = {
'scheduler': 'slurm',
'launcher': 'mpirun',
'environs': ['default'],
'features': [
FEATURES.CPU
] + list(SCALES.keys()),
Expand All @@ -105,12 +97,6 @@
# steps inherit environment. It doesn't hurt to define this even if srun is not used
'export SLURM_EXPORT_ENV=ALL'
],
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
'extras': {
# Node types have somewhat varying amounts of memory, but we'll make it easy on ourselves
# All should _at least_ have this amount (30GB * 1E9 / (1024*1024) = 28610 MiB)
Expand All @@ -121,3 +107,6 @@
for system in site_configuration['systems']:
for partition in system['partitions']:
partition.update(partition_defaults)

# Set common Slurm config options
set_common_required_config(site_configuration)
21 changes: 5 additions & 16 deletions config/azure_mc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

import os

from eessi.testsuite.common_config import common_logging_config, common_general_config, common_eessi_init
from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
set_common_required_config)
from eessi.testsuite.constants import EXTRAS, FEATURES, SCALES

# This config will write all staging, output and logging to subdirs under this prefix
Expand Down Expand Up @@ -73,14 +74,6 @@
]
},
],
'environments': [
{
'name': 'default',
'cc': 'cc',
'cxx': '',
'ftn': '',
},
],
'logging': common_logging_config(reframe_prefix),
'general': [
{
Expand All @@ -96,18 +89,14 @@
partition_defaults = {
'scheduler': 'slurm',
'launcher': 'mpirun',
'environs': ['default'],
'features': [
FEATURES.CPU
] + list(SCALES.keys()),
'resources': [
{
'name': 'memory',
'options': ['--mem={size}'],
}
],
'max_jobs': 1,
}
for system in site_configuration['systems']:
for partition in system['partitions']:
partition.update(partition_defaults)

# Set common Slurm config options
set_common_required_config(site_configuration)
35 changes: 8 additions & 27 deletions config/bsc_marenostrum5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import os

from eessi.testsuite.common_config import (common_logging_config,
common_general_config,
common_eessi_init,
get_sbatch_account)
from eessi.testsuite.constants import *
from eessi.testsuite.common_config import (common_eessi_init, common_general_config, common_logging_config,
get_sbatch_account, set_common_required_config)
from eessi.testsuite.constants import DEVICE_TYPES, EXTRAS, FEATURES, GPU_VENDORS, SCALES

# Note that we rely on the SBATCH_ACCOUNT environment variable to be specified
# From ReFrame 4.8.1 we can no longer rely on SBATCH_ACCOUNT completely
Expand Down Expand Up @@ -41,12 +39,7 @@
'export OMPI_MCA_mtl="^ofi"',
'export OMPI_MCA_btl="^ofi"',
],
'environs': ['default'],
'max_jobs': 4,
'resources': [
# memory cannot be set on MareNostrum
# The test-suite will give warning which can be ignored
],
# list(SCALES.keys()) adds all the scales from eessi.testsuite.constants as valid for thi partition
# Can be modified if not all scales can run on this partition, see e.g. the surf_snellius.py config
'features': [
Expand Down Expand Up @@ -76,16 +69,7 @@
'export OMPI_MCA_mtl="^ofi"',
'export OMPI_MCA_btl="^ofi"',
],
'environs': ['default'],
'max_jobs': 4,
'resources': [
{
'name': '_rfm_gpu',
'options': ['--gpus-per-node={num_gpus_per_node}'],
},
# memory cannot be set on MareNostrum
# The test-suite will give warning which can be ignored
],
'devices': [
{
'type': DEVICE_TYPES.GPU,
Expand All @@ -106,14 +90,6 @@
]
},
],
'environments': [
{
'name': 'default',
'cc': 'cc',
'cxx': '',
'ftn': '',
},
],
'logging': common_logging_config(),
'general': [
{
Expand All @@ -124,3 +100,8 @@
}
],
}

# Set common Slurm config options
# memory cannot be set on MareNostrum
# The test-suite will give warning which can be ignored
set_common_required_config(site_configuration, set_memory=False)
Loading