Changeset 5990


Ignore:
Timestamp:
Aug 19, 2020, 11:12:21 AM (16 months ago)
Author:
Nicklas Nordborg
Message:

References #1259: Add support for Slurm

Added options that should be ignored since if they are set by the user they may interfere with other things.

Location:
extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/config/JobConfig.java

    r5989 r5990  
    263263    script file using the #SBATCH prefix. It is not recommended
    264264    to override options that are automatically set when submitting
    265     the job. This is currently: TODO (-terse, -S, -N, -wd, -o, -e
    266     and -p).
     265    the job. This is currently: (--parsable, --job-name, -J, --chdir, -D,
     266    --output, -o, --error, -e).
    267267   
    268268    @param option The name of the option (with or without the hyphen)
  • extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/engine/SlurmEngine.java

    r5989 r5990  
    3636      LoggerFactory.getLogger(SlurmEngine.class);
    3737
     38  // All sbatch options that are automatically set by
     39  // our script (including short versions)
    3840  private static final Set<String> ignoredSbatchOptions =
    39       new HashSet<>(); // TODO
     41      new HashSet<>(Arrays.asList(
     42          "parsable",
     43          "job-name", "J",
     44          "chdir", "D",
     45          "output", "o",
     46          "error", "e"));
    4047
    4148  public SlurmEngine()
     
    7683    script.append("#SBATCH --output=stdout\n"); // Stdout is saved to this file
    7784    script.append("#SBATCH --error=stderr\n"); // Stderr is saved to this file
    78     script.append("#SBATCH --nodes=1\n"); // 1 task on 1 node
    79     script.append("#SBATCH --ntasks=1\n");
     85//    script.append("#SBATCH --nodes=1\n"); // 1 task on 1 node
     86//    script.append("#SBATCH --ntasks=1\n");
    8087//    script.append("#SBATCH --cpus-per-task=2\n");
    8188   
Note: See TracChangeset for help on using the changeset viewer.