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

ncm-metaconfig: fix errors in slurm 23.02 schema
quattor · Oct 3, 2023 · 51568e3 · 51568e3
1 parent 9cc4da5
commit 51568e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_23.02.pan b/ncm-metaconfig/src/main/metaconfig/slurm/pan/schema_23.02.pan
@@ -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
@@ -684,7 +684,6 @@ type slurm_cgroups_conf = {
     'MaxSwapPercent' ? double(0..)
     'MemorySwappiness' ? long(0..100)
     'MinRAMSpace' ? long(0..)
-    'TaskAffinity' ? boolean
 };
 
 type slurm_spank_plugin = {
@@ -848,7 +847,7 @@ type slurm_mpi_conf = {
     'PMIxDirectConn' ? boolean
     'PMIxDirectConnEarly' ? boolean
     'PMIxDirectConnUCX' ? boolean
-    'PMIxDirectSameArc' ? boolean
+    'PMIxDirectSameArch' ? boolean
     'PMIxEnv' ? string[]
     'PMIxFenceBarrier' ? boolean
     'PMIxNetDevicesUCX' ? string

diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/tests/profiles/cgroups.pan b/ncm-metaconfig/src/main/metaconfig/slurm/tests/profiles/cgroups.pan
@@ -12,5 +12,3 @@ prefix "/software/components/metaconfig/services/{/etc/slurm/cgroup.conf}/conten
 'ConstrainSwapSpace' = true;
 
 'AllowedSwapSpace' = 10;
-
-'TaskAffinity' = true;
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/tests/regexps/cgroups/base b/ncm-metaconfig/src/main/metaconfig/slurm/tests/regexps/cgroups/base
@@ -9,4 +9,3 @@ CgroupAutomount=yes
 ConstrainCores=yes
 ConstrainRAMSpace=yes
 ConstrainSwapSpace=yes
-TaskAffinity=yes
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;