diff --git a/NEWS b/NEWS index e11fed0ad5b1142d58ba204d096fd23814b89b50..ec21d3ba7a283a970abce469330d5a501553476b 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,7 @@ documents those changes that are of interest to users and admins. -- BGQ - added head ppcfloor as an include dir when building. -- BGQ - Better debug messages in runjob_mux plugin. -- PMI2 Updated the Makefile.am to build a versioned library. + -- CRAY - Fix srun --mem_bind=local option with launch/aprun. * Changes in Slurm 2.6.0 ======================== diff --git a/src/plugins/launch/aprun/launch_aprun.c b/src/plugins/launch/aprun/launch_aprun.c index a1ea1e53caac57b7bd029dcb248e2523b363e391..4502557a3b829c3c841ecf7c5c83524336f97bf2 100644 --- a/src/plugins/launch/aprun/launch_aprun.c +++ b/src/plugins/launch/aprun/launch_aprun.c @@ -582,7 +582,7 @@ extern int launch_p_setup_srun_opt(char **rest) "%u", opt.sockets_per_node); } - if (opt.mem_bind && strstr(opt.mem_bind, "local")) { + if (opt.mem_bind_type & MEM_BIND_LOCAL) { opt.argc += 1; xrealloc(opt.argv, opt.argc * sizeof(char *)); opt.argv[command_pos++] = xstrdup("-ss");