Skip to content

Commit 8049cbd

Browse files
committed
Drop legacy Exacloud/COVID setting
1 parent 9ac2561 commit 8049cbd

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public List<ToolParameterDescriptor> getParams()
3333
}}, 1028),
3434
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),
3535
ToolParameterDescriptor.create("useLustre", "Use Old Lustre Working Space", "If selected, this job will use the older Lustre working space.", "checkbox", null, null),
36-
//ToolParameterDescriptor.create("useExclusive", "Use Exclusive Flag", "If selected, the job allocation can not share nodes with other running jobs. This should not be selected unless you are sure about this. It can help protect memory-intensive, long-running jobs.", "checkbox", null, null),
3736
ToolParameterDescriptor.create("requireInfiniband", "Require InfiniBand", "If selected, this job will be flagged as -C IB to force the node to have InfiniBand.", "checkbox", null, null),
38-
ToolParameterDescriptor.create("covidRelated", "COVID Related Job", "If selected, this job will be flagged as --comment=COVID to help ACC track these jobs.", "checkbox", null, null),
3937
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)
4038
);
4139
}

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -280,28 +280,6 @@ public void addExtraSubmitScriptLines(PipelineJob job, RemoteExecutionEngine eng
280280
possiblyAddGpus(job, engine, lines);
281281
possiblyAddExclusive(job, engine, lines);
282282
possiblyAddInfiniband(job, engine, lines);
283-
possiblyAddCOVID(job, lines);
284-
}
285-
}
286-
287-
private void possiblyAddCOVID(PipelineJob job, List<String> lines)
288-
{
289-
Map<String, String> params = ((HasJobParams)job).getJobParams();
290-
String val = StringUtils.trimToNull(params.get("resourceSettings.resourceSettings.covidRelated"));
291-
if (val == null)
292-
{
293-
return;
294-
}
295-
296-
boolean parsed = Boolean.parseBoolean(val);
297-
if (parsed)
298-
{
299-
job.getLogger().info("Flagging as COVID-related");
300-
String line = "#SBATCH --comment=COVID";
301-
if (!lines.contains(line))
302-
{
303-
lines.add(line);
304-
}
305283
}
306284
}
307285

0 commit comments

Comments
 (0)