Skip to content

Commit 5718211

Browse files
committed
Drop deprecated ssd exacloud property
1 parent 261a871 commit 5718211

2 files changed

Lines changed: 0 additions & 23 deletions

File tree

primeseq/src/org/labkey/primeseq/pipeline/ExacloudResourceSettings.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public List<ToolParameterDescriptor> getParams()
3838
ToolParameterDescriptor.create("localDisk", "Local Disk (GB)", "Do not change this unless you are certain. Each job requests and uses local space (/mnt/scratch) for temp files. If your job will require more space, consider increasing this.", "ldk-integerfield", new JSONObject(){{
3939
put("minValue", 512);
4040
}}, 1028),
41-
ToolParameterDescriptor.create("localSSD", "Request Nodes With SSD Scratch", "If selected, -C ssdscratch will be added to the submit script, which limits to node with faster SSD scratch space. This might be important for I/O intense jobs.", "checkbox", null, null),
4241
ToolParameterDescriptor.create("gpus", "GPUs", "The number of GPUs requested for this job. If non-zero, the gpu partition will be used.", "ldk-integerfield", null, null),
4342
ToolParameterDescriptor.create("useExperimentalPartition", "Use RHEL 9.6 Partition", "If selected, jobs will be submitted to the experimental rhel96TESTING partition.", "checkbox", null, null)
4443
);

primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ public void addExtraSubmitScriptLines(PipelineJob job, RemoteExecutionEngine<?>
330330
possiblyAddQOS(job, engine, lines);
331331
possiblyAddHighIO(job, engine, lines);
332332
possiblyAddDisk(job, engine, lines);
333-
possiblyAddSSD(job, engine, lines);
334333
possiblyAddGpus(job, engine, lines);
335334
possiblyAddExclusive(job, engine, lines);
336335
}
@@ -490,27 +489,6 @@ private void possiblyAddExclusive(PipelineJob job, RemoteExecutionEngine<?> engi
490489
}
491490
}
492491

493-
private void possiblyAddSSD(PipelineJob job, RemoteExecutionEngine<?> engine, List<String> lines)
494-
{
495-
Map<String, String> params = ((HasJobParams)job).getJobParams();
496-
String val = StringUtils.trimToNull(params.get("resourceSettings.resourceSettings.localSSD"));
497-
if (val == null)
498-
{
499-
return;
500-
}
501-
502-
boolean parsed = Boolean.parseBoolean(val);
503-
if (parsed)
504-
{
505-
job.getLogger().info("Requiring local SSD scratch space");
506-
String line = "#SBATCH -C ssdscratch";
507-
if (!lines.contains(line))
508-
{
509-
lines.add(line);
510-
}
511-
}
512-
}
513-
514492
private void possiblyAddQOS(PipelineJob job, RemoteExecutionEngine<?> engine, List<String> lines)
515493
{
516494
//first remove existing

0 commit comments

Comments
 (0)