From 2aa0675c1de1330ebb0fc3e9cfb210db03b7a03b Mon Sep 17 00:00:00 2001
From: James Botts <jfbotts@lbl.gov>
Date: Fri, 17 Apr 2015 15:00:28 -0700
Subject: [PATCH] Enable PBS compatibility code.
---
src/sbatch/opt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 9ae4f693ac2..09bbc8ee8a6 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -2077,7 +2077,7 @@ static void _parse_pbs_resource_list(char *rl)
opt.ntasks_per_node = _get_int(temp, "mpiprocs");
xfree(temp);
}
-#ifdef HAVE_ALPS_CRAY
+#if defined(HAVE_ALPS_CRAY) || defined(HAVE_NATIVE_CRAY)
/*
* NB: no "mppmem" here since it specifies per-PE memory units,
* whereas SLURM uses per-node and per-CPU memory units.
@@ -2117,7 +2117,7 @@ static void _parse_pbs_resource_list(char *rl)
opt.ntasks_set = true;
}
xfree(temp);
-#endif /* HAVE_ALPS_CRAY */
+#endif /* HAVE_ALPS_CRAY || HAVE_NATIVE_CRAY */
} else if (!strncasecmp(rl+i, "naccelerators=", 14)) {
i += 14;
temp = _get_pbs_option_value(rl, &i, ',');
--
GitLab