Skip to content

Commit 19cfaba

Browse files
committed
Cleanup LIBBWA mess: binary blob on root level and several references to the binary loader through hmftools/common/bwa helper
1 parent 9820cff commit 19cfaba

File tree

5 files changed

+0
-75
lines changed

5 files changed

+0
-75
lines changed

esvee/src/main/java/com/hartwig/hmftools/esvee/assembly/AssemblyConfig.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.hartwig.hmftools.esvee.assembly;
22

33
import static com.hartwig.hmftools.common.bamops.BamToolName.BAMTOOL_PATH;
4-
import static com.hartwig.hmftools.common.bwa.BwaUtils.BWA_LIB_PATH;
5-
import static com.hartwig.hmftools.common.bwa.BwaUtils.BWA_LIB_PATH_DESC;
6-
import static com.hartwig.hmftools.common.bwa.BwaUtils.loadAlignerLibrary;
74
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.REF_GENOME;
85
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.addRefGenomeConfig;
96
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.loadRefGenome;
@@ -225,8 +222,6 @@ public AssemblyConfig(final ConfigBuilder configBuilder)
225222
AlignmentFile = AlignmentCache.filename(configBuilder);
226223
RunAlignment = AlignmentFile != null || WriteType.requiresAlignment(WriteTypes);
227224

228-
loadAlignerLibrary(configBuilder.getValue(BWA_LIB_PATH));
229-
230225
setSequencingType(configBuilder);
231226
setLowBaseQualThreshold(configBuilder);
232227

@@ -338,8 +333,6 @@ public static void registerConfig(final ConfigBuilder configBuilder)
338333
configBuilder.addPath(REF_GENOME_IMAGE, false, REFERENCE_BAM_DESC);
339334
configBuilder.addPath(DECOY_GENOME, false, "Decoy genome image file");
340335

341-
configBuilder.addPath(BWA_LIB_PATH, false, BWA_LIB_PATH_DESC);
342-
343336
if(!configBuilder.isRegistered(WRITE_TYPES))
344337
configBuilder.addConfigItem(WRITE_TYPES, false, enumValueSelectionAsStr(WriteType.values(), "Write types"));
345338

gene-utils/src/main/java/com/hartwig/hmftools/geneutils/mapping/BwaSeqTester.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.hartwig.hmftools.geneutils.mapping;
22

33
import static com.hartwig.hmftools.common.bam.CigarUtils.calcCigarAlignedLength;
4-
import static com.hartwig.hmftools.common.bwa.BwaUtils.BWA_LIB_PATH;
5-
import static com.hartwig.hmftools.common.bwa.BwaUtils.loadAlignerLibrary;
64
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.REF_GENOME;
75
import static com.hartwig.hmftools.common.utils.PerformanceCounter.runTimeMinsStr;
86
import static com.hartwig.hmftools.common.utils.file.FileDelimiters.TSV_DELIM;
@@ -36,7 +34,6 @@ public BwaSeqTester(final SeqTestConfig config, final ConfigBuilder configBuilde
3634

3735
String refGenomeImageFile = configBuilder.getValue(REF_GENOME) + ".img";
3836

39-
loadAlignerLibrary(configBuilder.getValue(BWA_LIB_PATH));
4037
mAligner = initialiseBwaAligner(refGenomeImageFile);
4138
}
4239

gene-utils/src/main/java/com/hartwig/hmftools/geneutils/mapping/SeqTestConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.hartwig.hmftools.geneutils.mapping;
22

33
import static com.hartwig.hmftools.common.blastn.BlastnRunner.registerBlastn;
4-
import static com.hartwig.hmftools.common.bwa.BwaUtils.BWA_LIB_PATH;
5-
import static com.hartwig.hmftools.common.bwa.BwaUtils.BWA_LIB_PATH_DESC;
64
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.REF_GENOME;
75
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.addRefGenomeFile;
86
import static com.hartwig.hmftools.common.genome.refgenome.RefGenomeSource.deriveRefGenomeVersion;
@@ -47,7 +45,6 @@ public static void registerConfig(final ConfigBuilder configBuilder)
4745
{
4846
configBuilder.addPath(INPUT_FILE, true, "Input regions and sequences");
4947

50-
configBuilder.addPath(BWA_LIB_PATH, false, BWA_LIB_PATH_DESC);
5148
registerBlastn(configBuilder, false);
5249

5350
addOutputOptions(configBuilder, false);

hmf-common/src/main/java/com/hartwig/hmftools/common/bwa/BwaUtils.java

Lines changed: 0 additions & 62 deletions
This file was deleted.

libbwa.Darwin.dylib

-251 KB
Binary file not shown.

0 commit comments

Comments
 (0)