From 51568e3e102b6dbcf85d4e23880a04a23bba68a7 Mon Sep 17 00:00:00 2001
From: wpoely86 <wpoely86@gmail.com>
Date: Tue, 3 Oct 2023 12:22:45 +0200
Subject: [PATCH] ncm-metaconfig: fix errors in slurm 23.02 schema (#1633)

ncm-metaconfig: fix errors in slurm 23.02 schema
---
 .../src/main/metaconfig/slurm/pan/schema_23.02.pan           | 5 ++---
 .../src/main/metaconfig/slurm/tests/profiles/cgroups.pan     | 2 --
 .../src/main/metaconfig/slurm/tests/regexps/cgroups/base     | 1 -
 3 files changed, 2 insertions(+), 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
index 95220ad73a..8935714d69 100644
--- 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
index db16809bf9..4f2503e11c 100644
--- 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
index cc158cd45e..fbd9f1238a 100644
--- 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