From 1fb7f72ef4a6f342b3f98893fc8162bc6efa193f Mon Sep 17 00:00:00 2001
From: David Gloe <dgloe@cray.com>
Date: Wed, 24 Aug 2016 09:57:07 -0600
Subject: [PATCH] Revert snc4+cache work around
Revert commit 933d4fbaf419a74d2e78ae8c0529fc5bc67ea5ca
bug 2704
---
.../node_features/knl_cray/node_features_knl_cray.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
index 87b80511781..9f0c745167a 100644
--- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
+++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
@@ -2035,18 +2035,6 @@ extern int node_features_p_job_valid(char *job_features)
if (numa_cnt > 1) /* Multiple NUMA options */
return ESLURM_INVALID_KNL;
- /* snc4 only allowed with cache today due to invalid config information
- * reported by kernel to hwloc, then to Slurm */
- if (!job_numa) {
- job_numa = default_numa;
- }
- if (!job_mcdram) {
- job_mcdram = default_mcdram;
- }
- if (job_numa == KNL_SNC4 && job_mcdram != KNL_CACHE) {
- return ESLURM_INVALID_KNL;
- }
-
return SLURM_SUCCESS;
}
--
GitLab