Skip to content

Commit 07a6d29

Browse files
committed
Improve nimble debugging
1 parent 0af3c6d commit 07a6d29

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

singlecell/src/org/labkey/singlecell/run/NimbleHelper.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private File prepareReference(File genomeCsv, File genomeFasta, NimbleGenome gen
190190
genomeFasta = ensureLocalCopy(genomeFasta, output);
191191

192192
File nimbleJson = new File(getPipelineCtx().getWorkingDirectory(), FileUtil.getBaseName(genomeFasta) + ".json");
193-
runUsingDocker(Arrays.asList("generate", "/work/" + genomeFasta.getName(), "/work/" + genomeCsv.getName(), "/work/" + nimbleJson.getName()), output, "generate-" + genome.genomeId);
193+
runUsingDocker(Arrays.asList("python3", "-m", "nimble", "generate", "/work/" + genomeFasta.getName(), "/work/" + genomeCsv.getName(), "/work/" + nimbleJson.getName()), output, "generate-" + genome.genomeId);
194194
if (!nimbleJson.exists())
195195
{
196196
File doneFile = getNimbleDoneFile(getPipelineCtx().getWorkingDirectory(), "generate-" + genome.genomeId);
@@ -284,6 +284,10 @@ private File doAlignment(NimbleGenome genome, File refJson, File bam, PipelineSt
284284
File resultsTsv = new File(getPipelineCtx().getWorkingDirectory(), "results." + genome.getGenomeId() + ".txt");
285285

286286
List<String> alignArgs = new ArrayList<>();
287+
alignArgs.add("python3");
288+
alignArgs.add("-m");
289+
alignArgs.add("nimble");
290+
287291
alignArgs.add("align");
288292
Integer maxThreads = SequencePipelineService.get().getMaxThreads(getPipelineCtx().getLogger());
289293
if (maxThreads != null)
@@ -437,6 +441,7 @@ private boolean runUsingDocker(List<String> nimbleArgs, PipelineStepOutput outpu
437441
writer.println("\t-u $UID \\");
438442
writer.println("\t-e USERID=$UID \\");
439443
writer.println("\t-e TMPDIR=/work/tmpDir \\");
444+
writer.println("\t--entrypoint /bin/bash \\");
440445
writer.println("\t-w /work \\");
441446
writer.println("\t" + DOCKER_CONTAINER_NAME + " \\");
442447
// TODO: eventually remove this:

0 commit comments

Comments
 (0)