Skip to content
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

Jump to bottom

ncm-metaconfig: fix errors in slurm 23.02 schema #1633

Merged
merged 2 commits into from
Oct 3, 2023
Merged

ncm-metaconfig: fix errors in slurm 23.02 schema #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8701871
ncm-metaconfig: fix errors in slurm 23.02 schema
wpoely86 Oct 3, 2023
4e99ea7
fix tests
wpoely86 Oct 3, 2023
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
5 changes: 2 additions & 3 deletions ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_23.02.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ type slurm_conf_control = {
'MaxNodeCount' ? long(0..)
'MaxStepCount' ? long(0..)
'MaxTasksPerNode' ? long(0..65533)
'MpiDefault' ? choice("openmpi", "pmi2", "pmix", "none")
'MpiDefault' ? choice("pmi2", "pmix", "none")
'MpiParams' ? slurm_mpi_params
'PluginDir' ? absolute_file_path[] # colon-separated
'PlugStackConfig' ? absolute_file_path # defaults to plugstack.conf in the slurm conf dir
Expand Down Expand Up @@ -684,7 +684,6 @@ type slurm_cgroups_conf = {
'MaxSwapPercent' ? double(0..)
'MemorySwappiness' ? long(0..100)
'MinRAMSpace' ? long(0..)
'TaskAffinity' ? boolean
};

type slurm_spank_plugin = {
Expand Down Expand Up @@ -848,7 +847,7 @@ type slurm_mpi_conf = {
'PMIxDirectConn' ? boolean
'PMIxDirectConnEarly' ? boolean
'PMIxDirectConnUCX' ? boolean
'PMIxDirectSameArc' ? boolean
'PMIxDirectSameArch' ? boolean
'PMIxEnv' ? string[]
'PMIxFenceBarrier' ? boolean
'PMIxNetDevicesUCX' ? string
Expand Down
2 changes: 0 additions & 2 deletions ncm-metaconfig/src/main/metaconfig/slurm/tests/profiles/cgroups.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ prefix "/software/components/metaconfig/services/{/etc/slurm/cgroup.conf}/conten
'ConstrainSwapSpace' = true;

'AllowedSwapSpace' = 10;

'TaskAffinity' = true;
1 change: 0 additions & 1 deletion ncm-metaconfig/src/main/metaconfig/slurm/tests/regexps/cgroups/base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ CgroupAutomount=yes
ConstrainCores=yes
ConstrainRAMSpace=yes
ConstrainSwapSpace=yes
TaskAffinity=yes