diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 27bb16c07a0d0e515bf35cd7478a237d04eafa39..0c0c94b2880262092dd7e5a5934fe48a0e13ab52 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -13,39 +13,292 @@ salloc is used to allocate a SLURM job allocation, which is a set of resources (
The command may be any program the user wishes. Some typical commands are xterm, a shell script containing slaunch commands, and slaunch (see the EXAMPLES section).
.SH "OPTIONS"
.LP
+
.TP
\fB\-N\fR, \fB\-\-nodes\fR[=]<\fInumber|[min]\-[max]\fR>
-Specify the number of nodes to be used by this job step. This option accepts either a single number, or a range of possible node counts. If a single number is used, such as "\-N 4", then the allocation is asking for four and ONLY four nodes. If a range is specified, such as "\-N 2\-6", SLURM controller may grant salloc anywhere from 2 to 6 nodes. When using a range, either of the min or max options may be omitted. For instance, "\-N 10\-" means "no fewer than 10 nodes", and "\-N \-20" means "no more than 20 nodes". The default value of this option is one node, but other options may require more than one node to be allocated.
+Specify the number of nodes to be used by this job step. This option accepts
+either a single number, or a range of possible node counts. If a single
+number is used, such as "\-N 4", then the allocation is asking for four and
+ONLY four nodes. If a range is specified, such as "\-N 2\-6", the SLURM
+controller may grant salloc anywhere from 2 to 6 nodes. When using a range,
+either of the min or max options may be omitted. For instance, "\-N 10\-"
+means "no fewer than 10 nodes", and "\-N \-20" means "no more than 20 nodes".
+The default value of this option is one node, but other options implicitly
+increase the default node count.
+
+.TP
+\fB\-n\fR, \fB\-\-tasks\fR[=]<\fInumber\fR>
+salloc does not launch tasks, it requests an allocation of resources and submits
+a batch script. However this \-\-tasks option advizes the SLURM controller
+that job steps run within this allocation will launch a maximum of \fInumber\fR
+tasks. This option, possibly with collaboration with the \-\-cpus\-per\-task
+option, will directly impact the number of processors granted to the job
+allocation.
+
.TP
\fB\-d\fR, \fB\-\-dependency\fR[=]<\fIjobid\fR>
-Defer the start of this job until the specified \fIjobid\fR has completed. Many jobs can share the same dependency and these jobs may even belong to different users. The value may be changed after job submission using the scontrol command.
+Defer the start of this job until the specified \fIjobid\fR has completed.
+Many jobs can share the same dependency and these jobs may even belong to
+different users. The value may be changed after job submission using the
+scontrol command.
+
+.TP
+\fB\-s\fR, \fB\-\-share\fR
+The job allocation can share nodes with other running jobs. This may result
+the allocation being granted sooner than if the \-\-share option was not set and
+allow higher system utilization, but application performance will likely suffer
+due to competition for resources within a node.
+
+.TP
+\fB\-t\fR, \fB\-\-time\fR[=]<\fIminutes\fR>
+Set a limit, in minites, on the total run time of the job allocation.
+If the requested time limit exceeds the partition's time limit, the
+job will be left in a PENDING state (possibly indefinitely). The default
+time limit is the partition's time limit. When the time limit is reached,
+the each task in each job step is sent SIGTERM followed by SIGKILL. The
+interval between signals is specified by the SLURM configuration parameter
+\fBKillWait\fR. A time limit of zero represents unlimited time.
+
.TP
\fB\-I\fR,\fB\-\-immediate\fR
-Do not wait for the resources need to grant this allocation. Normally salloc will wait for the resources necessary to satisfy the requested job allocation, but when \-\-immediate is specified it will exit immediately without running the \fIcommand\fR parameter.
+Grab the requested resources immediately, or abort if the resources are not
+currently available. The \fIcommand\fR parameter will not be run if the resources
+are not available.
+
+.TP
+\fB\-J\fR, \fB\-\-job\-name\fR[=]<\fIjobname\fR>
+Specify a name for the job allocation. The specified name will appear along with
+the job id number when querying running jobs on the system. The default job
+name is the name of the "command" specified on the command line.
+
.TP
\fB\-W\fR, \fB\-\-wait\fR[=]<\fIseconds\fR>
-If the resources needed to satisy a job allocation are not immediately available, the job allocation is enqueued and is said to be PENDING. This option tells salloc how long (in seconds) to wait for the allocation to be granted before giving up. When the wait limit has been reached, salloc will exit without running the \fIcommand\fR parameter. By default, salloc will wait indefinitely. (The \-\-immediate option makes \-\-wait moot.)
+If the resources needed to satisy a job allocation are not immediately
+available, the job allocation is enqueued and is said to be PENDING. This
+option tells salloc how long (in seconds) to wait for the allocation to be
+granted before giving up. When the wait limit has been reached, salloc
+will exit without running the \fIcommand\fR parameter. By default, salloc
+will wait indefinitely. (The \-\-immediate option makes \-\-wait moot.)
+
.TP
\fB\-p\fR, \fB\-\-partition\fR[=]<\fIpartition name\fR>
-Request a specific partition for the resource allocation. If not specified, the default behaviour is to allow the slurm controller to select the default partition as designated by the system administrator.
+Request a specific partition for the resource allocation. If not specified,
+the default behaviour is to allow the slurm controller to select the default
+partition as designated by the system administrator.
+
+.TP
+\fB\-\-contiguous\fR
+Demand a contiguous range of nodes. The default is "yes". Specify
+--contiguous=no if a contiguous range of nodes is not required.
+
+.TP
+\fB\-\-mail\-type\fR=\fItype\fR
+Notify user by email when certain event types occur.
+Valid \fItype\fR values are BEGIN, END, FAIL, ALL (any state change).
+The user to be notified is indicated with \fB\-\-mail\-user\fR.
+
+.TP
+\fB\-\-mail\-user\fR=\fIuser\fR
+User to receive email notification of state changes as defined by
+\fB\-\-mail\-type\fR.
+The default value is the username of the submitting user.
+
+.TP
+\fB\-\-uid\fR[=]<\fIuser\fR>
+Attempt to submit and/or run a job as \fIuser\fR instead of the
+invoking user id. The invoking user's credentials will be used
+to check access permissions for the target partition. User root
+may use this option to run jobs as a normal user in a RootOnly
+partition for example. If run as root, \fBsalloc\fR will drop
+its permissions to the uid specified after node allocation is
+successful. \fIuser\fR may be the user name or numerical user ID.
+
+.TP
+\fB\-\-gid\fR[=]<\fIgroup\fR>
+If \fBsalloc\fR is run as root, and the \fB\-\-gid\fR option is used,
+submit the job with \fIgroup\fR's group access permissions. \fIgroup\fR
+may be the group name or the numerical group ID.
+
.TP
-\fB\-c\fR, \fB\-\-cpus\-per\-task\fR=<\fIncpus\fR>
+\fB\-c\fR, \fB\-\-cpus\-per\-task\fR[=]<\fIncpus\fR>
+Advise the SLURM controller that ensuing job steps will require \fIncpus\fR
+number of processors per task. Without this option, the controller will
+just try to allocate one processor per task.
+
+For instance,
+consider an application that has 4 tasks, each requiring 3 processors. If our
+cluster is comprised of quad-processors nodes and we simply ask for
+12 processors, the controller might give us only 3 nodes. However, by using
+the --cpus-per-task=3 options, the controller knows that each task requires
+3 processors on the same node, and the controller will grant an allocation
+of 4 nodes, one for each of the 4 tasks.
+
.TP
\fB\-K\fR, \fB\-\-kill\-command\fR[=\fIsignal\fR]
-salloc always runs a user\-specified command once the allocation is granted. salloc will wait indefinitely for that command to exit. If you specify the \-\-kill\-command option salloc will send a signal to your command any time that the SLURM controller tells salloc that its job allocation has been revoked. The job allocation can be revoked for a couple of reasons: someone used \fBscancel\fR to revoke the allocation, or the allocation reached its time limit. If you do not specify a signal name or number, the default signal is SIGTERM.
+salloc always runs a user\-specified command once the allocation is
+granted. salloc will wait indefinitely for that command to exit.
+If you specify the \-\-kill\-command option salloc will send a signal to
+your command any time that the SLURM controller tells salloc that its job
+allocation has been revoked. The job allocation can be revoked for a
+couple of reasons: someone used \fBscancel\fR to revoke the allocation,
+or the allocation reached its time limit. If you do not specify a signal
+name or number, the default signal is SIGTERM.
+
.TP
\fB\-\-bell\fR
-Force salloc to ring the terminal bell when the job allocation is granted. By default, salloc only rings the bell if the allocation is pending for more than ten seconds.
+Force salloc to ring the terminal bell when the job allocation is granted.
+By default, salloc only rings the bell if the allocation is pending for more
+than ten seconds.
+
.TP
\fB\-\-no\-bell\fR
Silence salloc's use of the terminal bell.
+.TP
+\fB\-\-mincpus\fR[=]<\fIn\fR>
+Specify minimum number of cpus per node.
+
+.TP
+\fB\-\-mem\fR[=]<\fIMB\fR>
+Specify a minimum amount of real memory.
+
+.TP
+\fB\-\-tmp\fR[=]<\fIMB\fR>
+Specify a minimum amount of temporary disk space.
+
+.TP
+\fB\-C\fR, \fB\-\-constraint\fR[=]<\fIlist\fR>
+Specify a list of constraints.
+The constraints are features that have been assigned to the nodes by
+the slurm administrator.
+The \fIlist\fR of constraints may include multiple features separated
+by ampersand (AND) and/or vertical bar (OR) operators.
+For example: \fB\-\-constraint="opteron&video"\fR or
+\fB\-\-constraint="fast|faster"\fR.
+If no nodes have the requested features, then the job will be rejected
+by the slurm job manager.
.TP
-\fB\-\-help\fR
-Output help information and exit.
+\fB\-w\fR, \fB\-\-nodelist\fR[=]<\fInode name list\fR>
+Request a specific list of node names. The list may be specified as a
+comma\-separated list of node names, or a range of node names
+(e.g. mynode[1\-5,7,...]). Duplicate node names in the list will be ignored.
+The order of the node names in the list is not important; the node names
+will be sorted my SLURM.
+
+.TP
+\fB\-F\fR, \fB\-\-nodefile\fR[=]<\fInode file\fR>
+Much like \-\-nodelist, but the list is contained in a file of name
+\fInode file\fR. The node names of the list may also span multiple lines
+in the file. Duplicate node names in the file will be ignored.
+The order of the node names in the list is not important; the node names
+will be sorted my SLURM.
+
+.TP
+\fB\-x\fR, \fB\-\-exclude\fR[=]<\fInode name list\fR>
+Explicitly exclude certain nodes from the resources granted to the job.
+
+.TP
+\fB\-D\fR, \fB\-\-workdir\fR[=]<\fIdirectory\fR>
+Set the working directory of the batch script to \fIdirectory\fR before
+it it executed.
+
+.TP
+\fB\-k\fR, \fB\-\-no\-kill\fR
+Do not automatically terminate a job of one of the nodes it has been
+allocated fails. The user will assume the responsibilities for fault\-tolerance
+should a node fail. When there is a node failure, any active job steps (usually
+MPI jobs) on that node will almost certainly suffer a fatal error, but with
+\-\-no\-kill, the job allocation will not be revoked so the user may launch
+new job steps on the remaining nodes in their allocation.
+
+By default SLURM terminates the entire job allocation if any node fails in its
+range of allocated nodes.
+
+.TP
+\fB\-U\fR, \fB\-\-account\fR[=]<\fIaccount\fR>
+Change resource use by this job to specified account.
+The \fIaccount\fR is an arbitrary string. The account name may
+be changed after job submission using the \fBscontrol\fR
+command.
+
+.TP
+\fB\-\-begin\fR[=]<\fItime\fR>
+Submit the batch script to the SLURM controller immediately, like normal, but
+tell the controller to defer the allocation of the job until the specified time.
+
+Time may be of the form \fIHH:MM:SS\fR to run a job at
+a specific time of day (seconds are optional).
+(If that time is already past, the next day is assumed.)
+You may also specify \fImidnight\fR, \fInoon\fR, or
+\fIteatime\fR (4pm) and you can have a time-of-day suffixed
+with \fIAM\fR or \fIPM\fR for running in the morning or the evening.
+You can also say what day the job will be run, by giving
+a date in the form \fImonth-name\fR day with an optional year,
+or giving a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
+or \fIDD.MM.YY\fR. You can also
+give times like \fInow + count time-units\fR, where the time-units
+can be \fIminutes\fR, \fIhours\fR, \fIdays\fR, or \fIweeks\fR
+and you can tell SLURM to run the job today with the keyword
+\fItoday\fR and to run the job tomorrow with the keyword
+\fItomorrow\fR.
+The value may be changed after job submission using the
+\fBscontrol\fR command.
+
+.TP
+\fB\-\-nice\fR[=]<\fIadjustment\fR>
+Run the job with an adjusted scheduling priority. With no adjustment
+value the scheduling priority is decreased by 100. The adjustment range
+is from \-10000 (highest priority) to 10000 (lowest priority). Only
+privileged users can specify a negative adjustment. NOTE: This option
+is presently ignored if SchedulerType=sched/maui.
+
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+Suppress informational messages from salloc. Errors will still be displayed.
+
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Increase the verbosity of salloc's informational messages. Multiple \-v's
+will further increase salloc's verbosity.
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Display help information and exit.
+
+.TP
+\fB\-u\fR, \fB\-\-usage\fR
+Display brief usage message and exit.
+
.TP
\fB\-V\fR, \fB\-\-version\fR
+Display version information and exit.
+
+.PP
+The following options support Blue Gene systems, but may be
+applicable to other systems as well.
+.TP
+\fB\-g\fR, fB\-\-geometry\fR[=]<\fIXxYxZ\fR>
+Specify the geometry requirements for the job. The three numbers
+represent the required geometry giving dimensions in the X, Y and
+Z directions. For example "\-\-geometry=2x3x4", specifies a block
+of nodes having 2 x 3 x 4 = 24 nodes (actually base partions on
+Blue Gene).
+
+.TP
+\fB\-\-conn\-type\fR[=]<\fItype\fR>
+Require the partition connection type to be of a certain type.
+On Blue Gene the acceptable of \fItype\fR are MESH, TORUS and NAV.
+If NAV, or if not set, then SLURM will try to fit a TORUS else MESH.
+You should not normally set this option.
+SLURM will normally allocate a TORUS if possible for a given geometry.
+
+.TP
+\fB\-R\fR, \fB\-\-no\-rotate\fR
+Disables rotation of the job's requested geometry in order to fit an
+appropriate partition.
+By default the specified geometry can rotate in three dimensions.
+
Output version information and exit.
.SH "ENVIRONMENT VARIABLES"
.LP
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 943b2aa0287bfed9cbd9639048be1962b181f301..31af3655dddefe7faacc7907f767225f8051e9e5 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -41,7 +41,8 @@ sbatch does not launch tasks, it requests an allocation of resources and submits
a batch script. However this \-\-tasks option advizes the SLURM controller
that job steps run within this allocation will launch a maximum of \fInumber\fR
tasks. This option, possibly with collaboration with the \-\-cpus\-per\-task
-option, will directly impact the number of processors granted to the job allocation.
+option, will directly impact the number of processors granted to the job
+allocation.
.TP
\fB\-d\fR, \fB\-\-dependency\fR[=]<\fIjobid\fR>
@@ -70,7 +71,7 @@ interval between signals is specified by the SLURM configuration parameter
.TP
\fB\-I\fR,\fB\-\-immediate\fR
The batch script will only be submitted to the controller if the resources
-necessary to grant its job allocation will be granted immediately. If the
+necessary to grant its job allocation are immediately available. If the
job allocation will have to wait in a queue of pending jobs, the batch script
will not be submitted.
@@ -293,22 +294,6 @@ Display brief usage message and exit.
\fB\-V\fR, \fB\-\-version\fR
Display version information and exit.
-.PP
-The following options support AIX systems, but may be applicable to
-other systems as well. Since POE is used to launch tasks, these
-options are not normally used or are specified using the \fBSLURM_NETWORK\fR
-environment variable.
-.TP
-\fB\-\-network\fR[=]<\fItype\fR>
-Specify the communication protocol to be used.
-The interpretation of \fItype\fR is system dependent.
-For systems with an IBM Federation switch, the following
-comma\-separated and case insensitive types are recongnized:
-\fBIP\fR (the default is user\-space), \fBSN_ALL\fR, \fBSN_SINGLE\fR,
-\fBBULK_XFER\fR and adapter names. For more information, on
-IBM systems see \fIpoe\fR documenation on the environment variables
-\fBMP_EUIDEVICE\fR and \fBMP_USE_BULK_XFER\fR.
-
.PP
The following options support Blue Gene systems, but may be
applicable to other systems as well.
diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 643d51b5502bd787376daf700c53673d890326c8..8562d990802f7eb005c3fdd1158fa2bf4fd5570d 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -94,14 +94,11 @@
#define LONG_OPT_GID 0x10b
#define LONG_OPT_CORE 0x10e
#define LONG_OPT_CONNTYPE 0x111
-#define LONG_OPT_NETWORK 0x114
#define LONG_OPT_EXCLUSIVE 0x115
-#define LONG_OPT_PROPAGATE 0x116
#define LONG_OPT_BEGIN 0x119
#define LONG_OPT_MAIL_TYPE 0x11a
#define LONG_OPT_MAIL_USER 0x11b
#define LONG_OPT_NICE 0x11e
-#define LONG_OPT_NO_REQUEUE 0x123
#define LONG_OPT_BELL 0x124
#define LONG_OPT_NO_BELL 0x125
#define LONG_OPT_JOBID 0x126
@@ -477,7 +474,6 @@ static void _opt_default()
opt.kill_command_signal_set = false;
opt.immediate = false;
- opt.no_requeue = false;
opt.max_wait = 0;
opt.quiet = 0;
@@ -503,8 +499,6 @@ static void _opt_default()
opt.euid = (uid_t) -1;
opt.egid = (gid_t) -1;
- opt.propagate = NULL; /* propagate specific rlimits */
-
opt.bell = BELL_AFTER_DELAY;
}
@@ -535,7 +529,6 @@ env_vars_t env_vars[] = {
{"SALLOC_IMMEDIATE", OPT_INT, &opt.immediate, NULL },
{"SALLOC_JOBID", OPT_JOBID, NULL, NULL },
{"SALLOC_NNODES", OPT_NODES, NULL, NULL },
- {"SALLOC_NO_REQUEUE", OPT_INT, &opt.no_requeue, NULL },
{"SALLOC_NO_ROTATE", OPT_NO_ROTATE, NULL, NULL },
{"SALLOC_NPROCS", OPT_INT, &opt.nprocs, &opt.nprocs_set},
{"SALLOC_PARTITION", OPT_STRING, &opt.partition, NULL },
@@ -674,6 +667,7 @@ void set_options(const int argc, char **argv)
{"job-name", required_argument, 0, 'J'},
{"no-kill", no_argument, 0, 'k'},
{"kill-command", optional_argument, 0, 'K'},
+ {"tasks", required_argument, 0, 'n'},
{"nodes", required_argument, 0, 'N'},
{"partition", required_argument, 0, 'p'},
{"quiet", no_argument, 0, 'q'},
@@ -695,13 +689,10 @@ void set_options(const int argc, char **argv)
{"uid", required_argument, 0, LONG_OPT_UID},
{"gid", required_argument, 0, LONG_OPT_GID},
{"conn-type", required_argument, 0, LONG_OPT_CONNTYPE},
- {"network", required_argument, 0, LONG_OPT_NETWORK},
- {"propagate", optional_argument, 0, LONG_OPT_PROPAGATE},
{"begin", required_argument, 0, LONG_OPT_BEGIN},
{"mail-type", required_argument, 0, LONG_OPT_MAIL_TYPE},
{"mail-user", required_argument, 0, LONG_OPT_MAIL_USER},
{"nice", optional_argument, 0, LONG_OPT_NICE},
- {"no-requeue", no_argument, 0, LONG_OPT_NO_REQUEUE},
{"bell", no_argument, 0, LONG_OPT_BELL},
{"no-bell", no_argument, 0, LONG_OPT_NO_BELL},
{"jobid", required_argument, 0, LONG_OPT_JOBID},
@@ -862,18 +853,6 @@ void set_options(const int argc, char **argv)
case LONG_OPT_CONNTYPE:
opt.conn_type = _verify_conn_type(optarg);
break;
- case LONG_OPT_NETWORK:
- xfree(opt.network);
- opt.network = xstrdup(optarg);
-#ifdef HAVE_AIX
- setenv("SLURM_NETWORK", opt.network, 1);
-#endif
- break;
- case LONG_OPT_PROPAGATE:
- xfree(opt.propagate);
- if (optarg) opt.propagate = xstrdup(optarg);
- else opt.propagate = xstrdup("ALL");
- break;
case LONG_OPT_BEGIN:
opt.begin = parse_time(optarg);
if (opt.begin == 0) {
@@ -902,9 +881,6 @@ void set_options(const int argc, char **argv)
exit(1);
}
break;
- case LONG_OPT_NO_REQUEUE:
- opt.no_requeue = true;
- break;
case LONG_OPT_BELL:
opt.bell = BELL_ALWAYS;
break;
@@ -932,13 +908,6 @@ static void _opt_args(int argc, char **argv)
set_options(argc, argv);
-#ifdef HAVE_AIX
- if (opt.network == NULL) {
- opt.network = "us,sn_all,bulk_xfer";
- setenv("SLURM_NETWORK", opt.network, 1);
- }
-#endif
-
command_argc = 0;
if (optind < argc) {
rest = argv + optind;
@@ -1035,11 +1004,6 @@ static bool _opt_verify(void)
if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid))
opt.gid = opt.egid;
- if (opt.propagate && parse_rlimits( opt.propagate, PROPAGATE_RLIMITS)) {
- error( "--propagate=%s is not valid.", opt.propagate );
- verified = false;
- }
-
return verified;
}
@@ -1228,7 +1192,6 @@ static void _opt_list()
info("jobid : %u", opt.jobid);
info("verbose : %d", opt.verbose);
info("immediate : %s", tf_(opt.immediate));
- info("no-requeue : %s", tf_(opt.no_requeue));
if (opt.time_limit == INFINITE)
info("time_limit : INFINITE");
else
@@ -1250,9 +1213,6 @@ static void _opt_list()
info("geometry : %s", str);
xfree(str);
info("rotate : %s", opt.no_rotate ? "yes" : "no");
- info("network : %s", opt.network);
- info("propagate : %s",
- opt.propagate == NULL ? "NONE" : opt.propagate);
if (opt.begin) {
char time_str[32];
slurm_make_time_str(&opt.begin, time_str, sizeof(time_str));
@@ -1277,12 +1237,10 @@ static void _usage(void)
" [-W sec]\n"
" [--contiguous] [--mincpus=n] [--mem=MB] [--tmp=MB] [-C list]\n"
" [--account=name] [--dependency=jobid]\n"
-" [--propagate[=rlimits] ]\n"
#ifdef HAVE_BG /* Blue gene specific options */
" [--geometry=XxYxZ] [--conn-type=type] [--no-rotate]\n"
#endif
" [--mail-type=type] [--mail-user=user][--nice[=value]]\n"
-" [--no-requeue]\n"
" [-w hosts...] [-x hosts...] executable [args...]\n");
}
@@ -1310,11 +1268,9 @@ static void _help(void)
" -d, --dependency=jobid defer job until specified jobid completes\n"
" --nice[=value] decrease secheduling priority by value\n"
" -U, --account=name charge job to specified account\n"
-" --propagate[=rlimits] propagate all [or specific list of] rlimits\n"
" --begin=time defer job until HH:MM DD/MM/YY\n"
" --mail-type=type notify on state change: BEGIN, END, FAIL or ALL\n"
" --mail-user=user who to send email notification for job state changes\n"
-" --no-requeue if set, do not permit the job to be requeued\n"
"\n"
"Constraint options:\n"
" --mincpus=n minimum number of cpus per node\n"
@@ -1332,11 +1288,6 @@ static void _help(void)
printf("\n");
printf(
-#ifdef HAVE_AIX /* AIX/Federation specific options */
- "AIX related options:\n"
- " --network=type communication protocol to be used\n"
- "\n"
-#endif
#ifdef HAVE_BG /* Blue gene specific options */
"Blue Gene related options:\n"
diff --git a/src/salloc/opt.h b/src/salloc/opt.h
index bb2ad5cc73181410dafe8b73fc37230cb38a1721..e43c275d5c20806c456c2b47dea6c41f8e505c82 100644
--- a/src/salloc/opt.h
+++ b/src/salloc/opt.h
@@ -78,12 +78,10 @@ typedef struct salloc_options {
bool no_kill; /* --no-kill, -k */
int kill_command_signal;/* --kill-command, -K */
bool kill_command_signal_set;
- bool no_requeue; /* --no-requeue */
bool share; /* --share, -s */
int max_wait; /* --wait, -W */
int quiet;
int verbose;
- char *propagate; /* --propagate[=RLIMIT_CORE,...]*/
/* constraint options */
int mincpus; /* --mincpus=n */
@@ -93,7 +91,6 @@ typedef struct salloc_options {
bool contiguous; /* --contiguous */
char *nodelist; /* --nodelist=node1,node2,... */
char *exc_nodes; /* --exclude=node1,node2,... -x */
- char *network; /* --network= */
bool exclusive; /* --exclusive */
uint16_t geometry[SYSTEM_DIMENSIONS]; /* --geometry, -g */
diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index 5af47959ddb361194451e503d0f59b7fe256769f..e91e55ff48aeec4a4e909099754d0ae7b8d4cb36 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -248,8 +248,6 @@ static int fill_job_desc_from_opts(job_desc_msg_t *desc)
desc->mail_user = xstrdup(opt.mail_user);
if (opt.begin)
desc->begin_time = opt.begin;
- if (opt.network)
- desc->network = xstrdup(opt.network);
if (opt.account)
desc->account = xstrdup(opt.account);
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 3a2c3aa3b2c853b2c46088df2e459a93f64f1d2e..f9cf28af0bd7737aa2b21ec049a3b04a1fc30deb 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -92,7 +92,6 @@
#define LONG_OPT_GID 0x10b
#define LONG_OPT_CORE 0x10e
#define LONG_OPT_CONNTYPE 0x111
-#define LONG_OPT_NETWORK 0x114
#define LONG_OPT_EXCLUSIVE 0x115
#define LONG_OPT_BEGIN 0x119
#define LONG_OPT_MAIL_TYPE 0x11a
@@ -620,7 +619,6 @@ static struct option long_options[] = {
{"uid", required_argument, 0, LONG_OPT_UID},
{"gid", required_argument, 0, LONG_OPT_GID},
{"conn-type", required_argument, 0, LONG_OPT_CONNTYPE},
- {"network", required_argument, 0, LONG_OPT_NETWORK},
{"begin", required_argument, 0, LONG_OPT_BEGIN},
{"mail-type", required_argument, 0, LONG_OPT_MAIL_TYPE},
{"mail-user", required_argument, 0, LONG_OPT_MAIL_USER},
@@ -736,12 +734,6 @@ int process_options_second_pass(int argc, char *argv[],
/* set options from command line */
_set_options(argc, argv);
-#ifdef HAVE_AIX
- if (opt.network == NULL) {
- opt.network = "us,sn_all,bulk_xfer";
- setenv("SLURM_NETWORK", opt.network, 1);
- }
-#endif
if (!_opt_verify())
exit(1);
@@ -1079,13 +1071,6 @@ static void _set_options(int argc, char **argv)
case LONG_OPT_CONNTYPE:
opt.conn_type = _verify_conn_type(optarg);
break;
- case LONG_OPT_NETWORK:
- xfree(opt.network);
- opt.network = xstrdup(optarg);
-#ifdef HAVE_AIX
- setenv("SLURM_NETWORK", opt.network, 1);
-#endif
- break;
case LONG_OPT_BEGIN:
opt.begin = parse_time(optarg);
break;
@@ -1476,7 +1461,6 @@ static void _opt_list()
info("geometry : %s", str);
xfree(str);
info("rotate : %s", opt.no_rotate ? "yes" : "no");
- info("network : %s", opt.network);
if (opt.begin) {
char time_str[32];
slurm_make_time_str(&opt.begin, time_str, sizeof(time_str));
@@ -1556,12 +1540,6 @@ static void _help(void)
printf("\n");
printf(
-#ifdef HAVE_AIX /* AIX/Federation specific options */
- "AIX related options:\n"
- " --network=type communication protocol to be used\n"
- "\n"
-#endif
-
#ifdef HAVE_BG /* Blue gene specific options */
"Blue Gene related options:\n"
" -g, --geometry=XxYxZ geometry constraints of the job\n"
diff --git a/src/sbatch/opt.h b/src/sbatch/opt.h
index 42ff600ffc362b0f73debff2cc15d78047f03ad8..bac5deea6f786b173ac0375e60286b0ef44166fb 100644
--- a/src/sbatch/opt.h
+++ b/src/sbatch/opt.h
@@ -90,7 +90,6 @@ typedef struct sbatch_options {
bool contiguous; /* --contiguous */
char *nodelist; /* --nodelist=node1,node2,... */
char *exc_nodes; /* --exclude=node1,node2,... -x */
- char *network; /* --network= */
bool exclusive; /* --exclusive */
uint16_t geometry[SYSTEM_DIMENSIONS]; /* --geometry, -g */
diff --git a/src/sbatch/sbatch.c b/src/sbatch/sbatch.c
index 6c77c86623ed4f0b94c8a401ae548ec37a56d09f..1ae2636b872a85a1e5fa048ca87900aa6fd98c10 100644
--- a/src/sbatch/sbatch.c
+++ b/src/sbatch/sbatch.c
@@ -148,8 +148,6 @@ static int fill_job_desc_from_opts(job_desc_msg_t *desc)
desc->mail_user = xstrdup(opt.mail_user);
if (opt.begin)
desc->begin_time = opt.begin;
- if (opt.network)
- desc->network = xstrdup(opt.network);
if (opt.account)
desc->account = xstrdup(opt.account);