Skip to content

Commit

Permalink
Enable canu bamoutput branch. Update Makefile to agree with latest, a…
Browse files Browse the repository at this point in the history 
…dd htslib, etc.
  • Loading branch information
@brianwalenz @skoren
brianwalenz authored and skoren committed Jul 8, 2024
1 parent 38a7109 commit 69760aa
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 63 deletions.
2 changes: 1 addition & 1 deletion src/canu
Submodule canu updated 30 files
+30 −2 README.md
+36 −0 scripts/build-all-compilers.sh
+3 −3 src/Makefile
+6 −6 src/Makefile.boilermake
+1 −1 src/gfa/alignGFA.C
+1 −1 src/haplotyping/splitHaplotype.C
+57 −11 src/main.mk
+1 −1 src/meryl
+16 −1 src/overlapErrorAdjustment/findErrors-Output.C
+4 −4 src/overlapInCore/edalign.C
+2 −1 src/pipelines/canu.pl
+56 −13 src/pipelines/canu/Consensus.pm
+44 −1 src/pipelines/canu/Defaults.pm
+5 −3 src/pipelines/canu/HaplotypeReads.pm
+1 −1 src/seqrequester
+6 −1 src/stores/sqCache.C
+1 −1 src/stores/sqStoreCreate.C
+179 −33 src/stores/tgTig.C
+22 −12 src/stores/tgTig.H
+14 −13 src/utgcns/layoutToPackage.C
+35 −3 src/utgcns/libpbutgcns/AlnGraphBoost.C
+10 −4 src/utgcns/libpbutgcns/AlnGraphBoost.H
+397 −489 src/utgcns/unitigConsensus.C
+49 −50 src/utgcns/unitigConsensus.H
+8 −6 src/utgcns/utgcns-parameters.C
+31 −46 src/utgcns/utgcns-processTigs.C
+61 −2 src/utgcns/utgcns.C
+12 −0 src/utgcns/utgcns.H
+4 −1 src/utgcns/utgcns.mk
+1 −1 src/utility
113 changes: 51 additions & 62 deletions src/main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,18 @@ SOURCES := ${CANUROOT}utility/src/align/align-ksw2-driver.C \
${CANUROOT}utility/src/kmers-v1/kmers-writer.C \
${CANUROOT}utility/src/kmers-v1/kmers.C \
\
${CANUROOT}utility/src/kmers-v2/kmers-exact.C \
${CANUROOT}utility/src/kmers-v2/kmers-files.C \
${CANUROOT}utility/src/kmers-v2/kmers-histogram.C \
${CANUROOT}utility/src/kmers-v2/kmers-reader-dump.C \
${CANUROOT}utility/src/kmers-v2/kmers-reader.C \
${CANUROOT}utility/src/kmers-v2/kmers-writer-block.C \
${CANUROOT}utility/src/kmers-v2/kmers-writer-stream.C \
${CANUROOT}utility/src/kmers-v2/kmers-writer.C \
${CANUROOT}utility/src/kmers-v2/kmers.C \
\
${CANUROOT}utility/src/math/md5-v1.C \
${CANUROOT}utility/src/math/mt19937ar-v1.C \
${CANUROOT}utility/src/math/sampledDistribution-v1.C \
\
${CANUROOT}utility/src/parasail/cpuid.c \
${CANUROOT}utility/src/parasail/cigar.c \
${CANUROOT}utility/src/parasail/memory.c \
${CANUROOT}utility/src/parasail/sg.c \
${CANUROOT}utility/src/parasail/sg_trace.c \
${CANUROOT}utility/src/parasail/sg_qx_dispatch.c \
${CANUROOT}utility/src/parasail/sg_qb_de_dispatch.c \
${CANUROOT}utility/src/parasail/sg_qe_db_dispatch.c \
${CANUROOT}utility/src/parasail/cigar.c \
${CANUROOT}utility/src/parasail/sg_qx_dispatch.c \
\
${CANUROOT}utility/src/sequence/dnaSeq-v1.C \
${CANUROOT}utility/src/sequence/bufSeqFile-v1.C \
Expand Down Expand Up @@ -122,56 +112,55 @@ SOURCES := ${CANUROOT}utility/src/align/align-ksw2-driver.C \
${CANUROOT}gfa/gfa.C \
${CANUROOT}gfa/bed.C

SOURCES +=${CANUROOT}utility/src/htslib/hts/bcf_sr_sort.c \
${CANUROOT}utility/src/htslib/hts/bgzf.c \
${CANUROOT}utility/src/htslib/hts/errmod.c \
${CANUROOT}utility/src/htslib/hts/faidx.c \
${CANUROOT}utility/src/htslib/hts/header.c \
${CANUROOT}utility/src/htslib/hts/hfile.c \
${CANUROOT}utility/src/htslib/hts/hfile_libcurl.c \
${CANUROOT}utility/src/htslib/hts/hfile_s3.c \
${CANUROOT}utility/src/htslib/hts/hts.c \
${CANUROOT}utility/src/htslib/hts/hts_expr.c \
${CANUROOT}utility/src/htslib/hts/hts_os.c \
${CANUROOT}utility/src/htslib/hts/kfunc.c \
${CANUROOT}utility/src/htslib/hts/kstring.c \
${CANUROOT}utility/src/htslib/hts/md5.c \
${CANUROOT}utility/src/htslib/hts/multipart.c \
${CANUROOT}utility/src/htslib/hts/probaln.c \
${CANUROOT}utility/src/htslib/hts/realn.c \
${CANUROOT}utility/src/htslib/hts/regidx.c \
${CANUROOT}utility/src/htslib/hts/region.c \
${CANUROOT}utility/src/htslib/hts/sam.c \
${CANUROOT}utility/src/htslib/hts/synced_bcf_reader.c \
${CANUROOT}utility/src/htslib/hts/tbx.c \
${CANUROOT}utility/src/htslib/hts/textutils.c \
${CANUROOT}utility/src/htslib/hts/thread_pool.c \
${CANUROOT}utility/src/htslib/hts/vcf.c \
${CANUROOT}utility/src/htslib/hts/vcf_sweep.c \
${CANUROOT}utility/src/htslib/hts/vcfutils.c \
${CANUROOT}utility/src/htslib/cram/cram_codecs.c \
${CANUROOT}utility/src/htslib/cram/cram_decode.c \
${CANUROOT}utility/src/htslib/cram/cram_encode.c \
${CANUROOT}utility/src/htslib/cram/cram_external.c \
${CANUROOT}utility/src/htslib/cram/cram_index.c \
${CANUROOT}utility/src/htslib/cram/cram_io.c \
${CANUROOT}utility/src/htslib/cram/cram_stats.c \
${CANUROOT}utility/src/htslib/cram/mFILE.c \
${CANUROOT}utility/src/htslib/cram/open_trace_file.c \
${CANUROOT}utility/src/htslib/cram/pooled_alloc.c \
${CANUROOT}utility/src/htslib/cram/string_alloc.c \
${CANUROOT}utility/src/htslib/htscodecs/arith_dynamic.c \
${CANUROOT}utility/src/htslib/htscodecs/fqzcomp_qual.c \
${CANUROOT}utility/src/htslib/htscodecs/htscodecs.c \
${CANUROOT}utility/src/htslib/htscodecs/pack.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static32x16pr.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static32x16pr_neon.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static4x16pr.c \
${CANUROOT}utility/src/htslib/htscodecs/rle.c \
${CANUROOT}utility/src/htslib/htscodecs/tokenise_name3.c \
${CANUROOT}utility/src/htslib/htscodecs/utils.c

SOURCES += ${CANUROOT}utility/src/htslib/hts/bcf_sr_sort.c \
${CANUROOT}utility/src/htslib/hts/bgzf.c \
${CANUROOT}utility/src/htslib/hts/errmod.c \
${CANUROOT}utility/src/htslib/hts/faidx.c \
${CANUROOT}utility/src/htslib/hts/header.c \
${CANUROOT}utility/src/htslib/hts/hfile.c \
${CANUROOT}utility/src/htslib/hts/hfile_libcurl.c \
${CANUROOT}utility/src/htslib/hts/hfile_s3.c \
${CANUROOT}utility/src/htslib/hts/hts.c \
${CANUROOT}utility/src/htslib/hts/hts_expr.c \
${CANUROOT}utility/src/htslib/hts/hts_os.c \
${CANUROOT}utility/src/htslib/hts/kfunc.c \
${CANUROOT}utility/src/htslib/hts/kstring.c \
${CANUROOT}utility/src/htslib/hts/md5.c \
${CANUROOT}utility/src/htslib/hts/multipart.c \
${CANUROOT}utility/src/htslib/hts/probaln.c \
${CANUROOT}utility/src/htslib/hts/realn.c \
${CANUROOT}utility/src/htslib/hts/regidx.c \
${CANUROOT}utility/src/htslib/hts/region.c \
${CANUROOT}utility/src/htslib/hts/sam.c \
${CANUROOT}utility/src/htslib/hts/synced_bcf_reader.c \
${CANUROOT}utility/src/htslib/hts/tbx.c \
${CANUROOT}utility/src/htslib/hts/textutils.c \
${CANUROOT}utility/src/htslib/hts/thread_pool.c \
${CANUROOT}utility/src/htslib/hts/vcf.c \
${CANUROOT}utility/src/htslib/hts/vcf_sweep.c \
${CANUROOT}utility/src/htslib/hts/vcfutils.c \
${CANUROOT}utility/src/htslib/cram/cram_codecs.c \
${CANUROOT}utility/src/htslib/cram/cram_decode.c \
${CANUROOT}utility/src/htslib/cram/cram_encode.c \
${CANUROOT}utility/src/htslib/cram/cram_external.c \
${CANUROOT}utility/src/htslib/cram/cram_index.c \
${CANUROOT}utility/src/htslib/cram/cram_io.c \
${CANUROOT}utility/src/htslib/cram/cram_stats.c \
${CANUROOT}utility/src/htslib/cram/mFILE.c \
${CANUROOT}utility/src/htslib/cram/open_trace_file.c \
${CANUROOT}utility/src/htslib/cram/pooled_alloc.c \
${CANUROOT}utility/src/htslib/cram/string_alloc.c \
${CANUROOT}utility/src/htslib/htscodecs/arith_dynamic.c \
${CANUROOT}utility/src/htslib/htscodecs/fqzcomp_qual.c \
${CANUROOT}utility/src/htslib/htscodecs/htscodecs.c \
${CANUROOT}utility/src/htslib/htscodecs/pack.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static32x16pr.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static32x16pr_neon.c \
${CANUROOT}utility/src/htslib/htscodecs/rANS_static4x16pr.c \
${CANUROOT}utility/src/htslib/htscodecs/rle.c \
${CANUROOT}utility/src/htslib/htscodecs/tokenise_name3.c \
${CANUROOT}utility/src/htslib/htscodecs/utils.c

ifeq (${BUILDSTACKTRACE}, 1)
SOURCES += ${CANUROOT}utility/src/system/libbacktrace/atomic.c \
Expand Down

0 comments on commit 69760aa

Please sign in to comment.