Skip to content

Commit e0fa755

Browse files
committed
Remove unused cluster params
1 parent 0f2378b commit e0fa755

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ public List<ToolParameterDescriptor> getParams()
3232
put("storeValues", "Default;LongJobs;VeryLongJobs");
3333
put("multiSelect", false);
3434
}}, null),
35-
ToolParameterDescriptor.create("highIO", "Add HighIO Flag", "If selected, --qos=highio will be added, which limits the number of concurrent jobs that can run.", "checkbox", null, null),
35+
//ToolParameterDescriptor.create("highIO", "Add HighIO Flag", "If selected, --qos=highio will be added, which limits the number of concurrent jobs that can run.", "checkbox", null, null),
3636
ToolParameterDescriptor.create("time", "Requested Time (days/hours)", "If provided, this is passed to the --time argument. This cannot be higher than the limit for your requested partition. Examples are: '2124', '1-0' (1 day, 0 hours), '10-0' (10 days), and '0-72' (72 hours). If left blank, this will be automatically assigned.", "textfield", null, null),
3737
ToolParameterDescriptor.create("javaProcessXmx", "Java Process Xmx (GB)", "The value to be used as -Xmx for the LabKey remote java process. Unless you have a good reason, do not change this", "ldk-integerfield", null, null),
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("gpus", "GPUs", "The number of GPUs requested for this job. If non-zero, the gpu partition will be used.", "ldk-integerfield", null, null),
42-
ToolParameterDescriptor.create("useExperimentalPartition", "Use RHEL 9.6 Partition", "If selected, jobs will be submitted to the experimental rhel96TESTING partition.", "checkbox", null, null)
41+
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
);
4443
}
4544

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -404,18 +404,6 @@ private boolean needsGPUs(PipelineJob job)
404404
return hasCellBender(job) || StringUtils.trimToNull(params.get("resourceSettings.resourceSettings.gpus")) != null;
405405
}
406406

407-
private boolean useExperimentalPartition(PipelineJob job)
408-
{
409-
Map<String, String> params = ((HasJobParams) job).getJobParams();
410-
String rawVal = StringUtils.trimToNull(params.get("resourceSettings.resourceSettings.useExperimentalPartition"));
411-
if (rawVal == null)
412-
{
413-
return false;
414-
}
415-
416-
return Boolean.parseBoolean(rawVal);
417-
}
418-
419407
private boolean hasCellBender(PipelineJob job)
420408
{
421409
if (!isSequenceSequenceOutputHandlerTask(job))
@@ -573,10 +561,6 @@ private String getPartition(PipelineJob job)
573561
{
574562
return "gpu";
575563
}
576-
else if (useExperimentalPartition(job))
577-
{
578-
return "rhel96TESTING";
579-
}
580564

581565
return "batch";
582566
}

0 commit comments

Comments
 (0)