BGQ - Add 64 tasks per node as a valid option for srun when used with

overcommit.

NEWS

@@ -130,6 +130,8 @@ documents those changes that are of interest to users and admins.
  -- Reset node MAINT state flag when a reservation's nodes or flags change.
  -- Accounting - Fix issue where QOS usage was being zeroed out on a
     slurmctld restart.
+ -- BGQ - Add 64 tasks per node as a valid option for srun when used with
+    overcommit.
 
 * Changes in SLURM 2.4.4
 ========================

src/srun/libsrun/opt.c

@@ -1623,17 +1623,29 @@ extern void bg_figure_nodes_tasks()
 			opt.ntasks_per_node = ntpn;
 		}
 
-		if (opt.nodes_set && (opt.ntasks_per_node != 1)
-		    && (opt.ntasks_per_node != 2)
-		    && (opt.ntasks_per_node != 4)
-		    && (opt.ntasks_per_node != 8)
-		    && (opt.ntasks_per_node != 16)
-		    && (opt.ntasks_per_node != 32))
-			fatal("You requested -N %d and -n %d "
-			      "which gives --ntasks-per-node=%d.  "
-			      "This isn't a valid request.",
-			      node_cnt, opt.ntasks,
-			      opt.ntasks_per_node);
+		if (opt.nodes_set) {
+			if ((opt.ntasks_per_node != 1)
+			    && (opt.ntasks_per_node != 2)
+			    && (opt.ntasks_per_node != 4)
+			    && (opt.ntasks_per_node != 8)
+			    && (opt.ntasks_per_node != 16)
+			    && (opt.ntasks_per_node != 32)
+			    && (opt.ntasks_per_node != 64))
+				fatal("You requested -N %d and -n %d "
+				      "which gives --ntasks-per-node=%d.  "
+				      "This isn't a valid request.",
+				      node_cnt, opt.ntasks,
+				      opt.ntasks_per_node);
+			else if (!opt.overcommit
+				 && ((opt.ntasks_per_node == 32)
+				     || (opt.ntasks_per_node == 64)))
+				fatal("You requested -N %d and -n %d "
+				      "which gives --ntasks-per-node=%d.  "
+				      "This isn't a valid request "
+				      "without --overcommit.",
+				      node_cnt, opt.ntasks,
+				      opt.ntasks_per_node);
+		}
 	}
 }