Skip to content
Snippets Groups Projects
Commit 1fb7f72e authored by David Gloe's avatar David Gloe Committed by Morris Jette
Browse files

Revert snc4+cache work around

Revert commit 933d4fba
bug 2704
parent d5058707
No related branches found
No related tags found
No related merge requests found
...@@ -2035,18 +2035,6 @@ extern int node_features_p_job_valid(char *job_features) ...@@ -2035,18 +2035,6 @@ extern int node_features_p_job_valid(char *job_features)
if (numa_cnt > 1) /* Multiple NUMA options */ if (numa_cnt > 1) /* Multiple NUMA options */
return ESLURM_INVALID_KNL; 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; return SLURM_SUCCESS;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment