mirror of
https://github.com/lh3/minimap2.git
synced 2026-09-24 17:48:12 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7bc87b4175 | ||
|
|
6762368cf0 | ||
|
|
c2aec88b84 | ||
|
|
97f67a2a0a | ||
|
|
189555503a | ||
|
|
69af86657e | ||
|
|
49c6d83a8e | ||
|
|
f64e426a5a | ||
|
|
2bb8cbbeef | ||
|
|
e80759c97a | ||
|
|
f4c844b143 | ||
|
|
be171aa2dc | ||
|
|
cdc730d573 | ||
|
|
6420acca6d | ||
|
|
371bc9513a | ||
|
|
169216bfff |
@@ -1,3 +1,31 @@
|
|||||||
|
Release 2.17-r941 (4 May 2019)
|
||||||
|
------------------------------
|
||||||
|
|
||||||
|
Changes since the last release:
|
||||||
|
|
||||||
|
* Fixed flawed CIGARs like `5I6D7I` (#392).
|
||||||
|
|
||||||
|
* Bugfix: TLEN should be 0 when either end is unmapped (#373 and #365).
|
||||||
|
|
||||||
|
* Bugfix: mappy is unable to write index (#372).
|
||||||
|
|
||||||
|
* Added option `--junc-bed` to load known gene annotations in the BED12
|
||||||
|
format. Minimap2 prefers annotated junctions over novel junctions (#197 and
|
||||||
|
#348). GTF can be converted to BED12 with `paftools.js gff2bed`.
|
||||||
|
|
||||||
|
* Added option `--sam-hit-only` to suppress unmapped hits in SAM (#377).
|
||||||
|
|
||||||
|
* Added preset `splice:hq` for high-quality CCS or mRNA sequences. It applies
|
||||||
|
better scoring and improves the sensitivity to small exons. This preset may
|
||||||
|
introduce false small introns, but the overall accuracy should be higher.
|
||||||
|
|
||||||
|
This version produces nearly identical alignments to v2.16, except for CIGARs
|
||||||
|
affected by the bug mentioned above.
|
||||||
|
|
||||||
|
(2.17: 5 May 2019, r941)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Release 2.16-r922 (28 February 2019)
|
Release 2.16-r922 (28 February 2019)
|
||||||
------------------------------------
|
------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ cd minimap2 && make
|
|||||||
./minimap2 -ax sr ref.fa read1.fa read2.fa > aln.sam # short genomic paired-end reads
|
./minimap2 -ax sr ref.fa read1.fa read2.fa > aln.sam # short genomic paired-end reads
|
||||||
./minimap2 -ax splice ref.fa rna-reads.fa > aln.sam # spliced long reads (strand unknown)
|
./minimap2 -ax splice ref.fa rna-reads.fa > aln.sam # spliced long reads (strand unknown)
|
||||||
./minimap2 -ax splice -uf -k14 ref.fa reads.fa > aln.sam # noisy Nanopore Direct RNA-seq
|
./minimap2 -ax splice -uf -k14 ref.fa reads.fa > aln.sam # noisy Nanopore Direct RNA-seq
|
||||||
./minimap2 -ax splice -uf -C5 ref.fa query.fa > aln.sam # Final PacBio Iso-seq or traditional cDNA
|
./minimap2 -ax splice:hq -uf ref.fa query.fa > aln.sam # Final PacBio Iso-seq or traditional cDNA
|
||||||
./minimap2 -cx asm5 asm1.fa asm2.fa > aln.paf # intra-species asm-to-asm alignment
|
./minimap2 -cx asm5 asm1.fa asm2.fa > aln.paf # intra-species asm-to-asm alignment
|
||||||
./minimap2 -x ava-pb reads.fa reads.fa > overlaps.paf # PacBio read overlap
|
./minimap2 -x ava-pb reads.fa reads.fa > overlaps.paf # PacBio read overlap
|
||||||
./minimap2 -x ava-ont reads.fa reads.fa > overlaps.paf # Nanopore read overlap
|
./minimap2 -x ava-ont reads.fa reads.fa > overlaps.paf # Nanopore read overlap
|
||||||
@@ -71,8 +71,8 @@ Detailed evaluations are available from the [minimap2 paper][doi] or the
|
|||||||
Minimap2 is optimized for x86-64 CPUs. You can acquire precompiled binaries from
|
Minimap2 is optimized for x86-64 CPUs. You can acquire precompiled binaries from
|
||||||
the [release page][release] with:
|
the [release page][release] with:
|
||||||
```sh
|
```sh
|
||||||
curl -L https://github.com/lh3/minimap2/releases/download/v2.16/minimap2-2.16_x64-linux.tar.bz2 | tar -jxvf -
|
curl -L https://github.com/lh3/minimap2/releases/download/v2.17/minimap2-2.17_x64-linux.tar.bz2 | tar -jxvf -
|
||||||
./minimap2-2.16_x64-linux/minimap2
|
./minimap2-2.17_x64-linux/minimap2
|
||||||
```
|
```
|
||||||
If you want to compile from the source, you need to have a C compiler, GNU make
|
If you want to compile from the source, you need to have a C compiler, GNU make
|
||||||
and zlib development files installed. Then type `make` in the source code
|
and zlib development files installed. Then type `make` in the source code
|
||||||
@@ -139,7 +139,7 @@ Nanopore reads.
|
|||||||
#### <a name="map-long-splice"></a>Map long mRNA/cDNA reads
|
#### <a name="map-long-splice"></a>Map long mRNA/cDNA reads
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
minimap2 -ax splice -uf -C5 ref.fa iso-seq.fq > aln.sam # PacBio Iso-seq/traditional cDNA
|
minimap2 -ax splice:hq -uf ref.fa iso-seq.fq > aln.sam # PacBio Iso-seq/traditional cDNA
|
||||||
minimap2 -ax splice ref.fa nanopore-cdna.fa > aln.sam # Nanopore 2D cDNA-seq
|
minimap2 -ax splice ref.fa nanopore-cdna.fa > aln.sam # Nanopore 2D cDNA-seq
|
||||||
minimap2 -ax splice -uf -k14 ref.fa direct-rna.fq > aln.sam # Nanopore Direct RNA-seq
|
minimap2 -ax splice -uf -k14 ref.fa direct-rna.fq > aln.sam # Nanopore Direct RNA-seq
|
||||||
minimap2 -ax splice --splice-flank=no SIRV.fa SIRV-seq.fa # mapping against SIRV control
|
minimap2 -ax splice --splice-flank=no SIRV.fa SIRV-seq.fa # mapping against SIRV control
|
||||||
|
|||||||
@@ -123,6 +123,25 @@ static void mm_fix_cigar(mm_reg1_t *r, const uint8_t *qseq, const uint8_t *tseq,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
assert(qoff == r->qe - r->qs && toff == r->re - r->rs);
|
assert(qoff == r->qe - r->qs && toff == r->re - r->rs);
|
||||||
|
for (k = 0; k < p->n_cigar - 2; ++k) { // fix CIGAR like 5I6D7I
|
||||||
|
if ((p->cigar[k]&0xf) > 0 && (p->cigar[k]&0xf) + (p->cigar[k+1]&0xf) == 3) {
|
||||||
|
uint32_t l, s[3] = {0,0,0};
|
||||||
|
for (l = k; l < p->n_cigar; ++l) { // count number of adjacent I and D
|
||||||
|
uint32_t op = p->cigar[l]&0xf;
|
||||||
|
if (op == 1 || op == 2 || p->cigar[l]>>4 == 0)
|
||||||
|
s[op] += p->cigar[l] >> 4;
|
||||||
|
else break;
|
||||||
|
}
|
||||||
|
if (s[1] > 0 && s[2] > 0 && l - k > 2) { // turn to a single I and a single D
|
||||||
|
p->cigar[k] = s[1]<<4|1;
|
||||||
|
p->cigar[k+1] = s[2]<<4|2;
|
||||||
|
for (k += 2; k < l; ++k)
|
||||||
|
p->cigar[k] &= 0xf;
|
||||||
|
to_shrink = 1;
|
||||||
|
}
|
||||||
|
k = l;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (to_shrink) { // squeeze out zero-length operations
|
if (to_shrink) { // squeeze out zero-length operations
|
||||||
int32_t l = 0;
|
int32_t l = 0;
|
||||||
for (k = 0; k < p->n_cigar; ++k) // squeeze out zero-length operations
|
for (k = 0; k < p->n_cigar; ++k) // squeeze out zero-length operations
|
||||||
@@ -291,7 +310,7 @@ static void mm_append_cigar(mm_reg1_t *r, uint32_t n_cigar, uint32_t *cigar) //
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mm_align_pair(void *km, const mm_mapopt_t *opt, int qlen, const uint8_t *qseq, int tlen, const uint8_t *tseq, const int8_t *mat, int w, int end_bonus, int zdrop, int flag, ksw_extz_t *ez)
|
static void mm_align_pair(void *km, const mm_mapopt_t *opt, int qlen, const uint8_t *qseq, int tlen, const uint8_t *tseq, const uint8_t *junc, const int8_t *mat, int w, int end_bonus, int zdrop, int flag, ksw_extz_t *ez)
|
||||||
{
|
{
|
||||||
if (mm_dbg_flag & MM_DBG_PRINT_ALN_SEQ) {
|
if (mm_dbg_flag & MM_DBG_PRINT_ALN_SEQ) {
|
||||||
int i;
|
int i;
|
||||||
@@ -305,7 +324,7 @@ static void mm_align_pair(void *km, const mm_mapopt_t *opt, int qlen, const uint
|
|||||||
ksw_reset_extz(ez);
|
ksw_reset_extz(ez);
|
||||||
ez->zdropped = 1;
|
ez->zdropped = 1;
|
||||||
} else if (opt->flag & MM_F_SPLICE)
|
} else if (opt->flag & MM_F_SPLICE)
|
||||||
ksw_exts2_sse(km, qlen, qseq, tlen, tseq, 5, mat, opt->q, opt->e, opt->q2, opt->noncan, zdrop, flag, ez);
|
ksw_exts2_sse(km, qlen, qseq, tlen, tseq, 5, mat, opt->q, opt->e, opt->q2, opt->noncan, zdrop, opt->junc_bonus, flag, junc, ez);
|
||||||
else if (opt->q == opt->q2 && opt->e == opt->e2)
|
else if (opt->q == opt->q2 && opt->e == opt->e2)
|
||||||
ksw_extz2_sse(km, qlen, qseq, tlen, tseq, 5, mat, opt->q, opt->e, w, zdrop, end_bonus, flag, ez);
|
ksw_extz2_sse(km, qlen, qseq, tlen, tseq, 5, mat, opt->q, opt->e, w, zdrop, end_bonus, flag, ez);
|
||||||
else
|
else
|
||||||
@@ -547,7 +566,7 @@ static void mm_align1(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int
|
|||||||
{
|
{
|
||||||
int is_sr = !!(opt->flag & MM_F_SR), is_splice = !!(opt->flag & MM_F_SPLICE);
|
int is_sr = !!(opt->flag & MM_F_SR), is_splice = !!(opt->flag & MM_F_SPLICE);
|
||||||
int32_t rid = a[r->as].x<<1>>33, rev = a[r->as].x>>63, as1, cnt1;
|
int32_t rid = a[r->as].x<<1>>33, rev = a[r->as].x>>63, as1, cnt1;
|
||||||
uint8_t *tseq, *qseq;
|
uint8_t *tseq, *qseq, *junc;
|
||||||
int32_t i, l, bw, dropped = 0, extra_flag = 0, rs0, re0, qs0, qe0;
|
int32_t i, l, bw, dropped = 0, extra_flag = 0, rs0, re0, qs0, qe0;
|
||||||
int32_t rs, re, qs, qe;
|
int32_t rs, re, qs, qe;
|
||||||
int32_t rs1, qs1, re1, qe1;
|
int32_t rs1, qs1, re1, qe1;
|
||||||
@@ -666,13 +685,16 @@ static void mm_align1(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int
|
|||||||
|
|
||||||
assert(re0 > rs0);
|
assert(re0 > rs0);
|
||||||
tseq = (uint8_t*)kmalloc(km, re0 - rs0);
|
tseq = (uint8_t*)kmalloc(km, re0 - rs0);
|
||||||
|
junc = (uint8_t*)kmalloc(km, re0 - rs0);
|
||||||
|
|
||||||
if (qs > 0 && rs > 0) { // left extension; probably the condition can be changed to "qs > qs0 && rs > rs0"
|
if (qs > 0 && rs > 0) { // left extension; probably the condition can be changed to "qs > qs0 && rs > rs0"
|
||||||
qseq = &qseq0[rev][qs0];
|
qseq = &qseq0[rev][qs0];
|
||||||
mm_idx_getseq(mi, rid, rs0, rs, tseq);
|
mm_idx_getseq(mi, rid, rs0, rs, tseq);
|
||||||
|
mm_idx_bed_junc(mi, rid, rs0, rs, junc);
|
||||||
mm_seq_rev(qs - qs0, qseq);
|
mm_seq_rev(qs - qs0, qseq);
|
||||||
mm_seq_rev(rs - rs0, tseq);
|
mm_seq_rev(rs - rs0, tseq);
|
||||||
mm_align_pair(km, opt, qs - qs0, qseq, rs - rs0, tseq, mat, bw, opt->end_bonus, r->split_inv? opt->zdrop_inv : opt->zdrop, extra_flag|KSW_EZ_EXTZ_ONLY|KSW_EZ_RIGHT|KSW_EZ_REV_CIGAR, ez);
|
mm_seq_rev(rs - rs0, junc);
|
||||||
|
mm_align_pair(km, opt, qs - qs0, qseq, rs - rs0, tseq, junc, mat, bw, opt->end_bonus, r->split_inv? opt->zdrop_inv : opt->zdrop, extra_flag|KSW_EZ_EXTZ_ONLY|KSW_EZ_RIGHT|KSW_EZ_REV_CIGAR, ez);
|
||||||
if (ez->n_cigar > 0) {
|
if (ez->n_cigar > 0) {
|
||||||
mm_append_cigar(r, ez->n_cigar, ez->cigar);
|
mm_append_cigar(r, ez->n_cigar, ez->cigar);
|
||||||
r->p->dp_score += ez->max;
|
r->p->dp_score += ez->max;
|
||||||
@@ -698,6 +720,7 @@ static void mm_align1(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int
|
|||||||
// perform alignment
|
// perform alignment
|
||||||
qseq = &qseq0[rev][qs];
|
qseq = &qseq0[rev][qs];
|
||||||
mm_idx_getseq(mi, rid, rs, re, tseq);
|
mm_idx_getseq(mi, rid, rs, re, tseq);
|
||||||
|
mm_idx_bed_junc(mi, rid, rs, re, junc);
|
||||||
if (is_sr) { // perform ungapped alignment
|
if (is_sr) { // perform ungapped alignment
|
||||||
assert(qe - qs == re - rs);
|
assert(qe - qs == re - rs);
|
||||||
ksw_reset_extz(ez);
|
ksw_reset_extz(ez);
|
||||||
@@ -707,11 +730,11 @@ static void mm_align1(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int
|
|||||||
}
|
}
|
||||||
ez->cigar = ksw_push_cigar(km, &ez->n_cigar, &ez->m_cigar, ez->cigar, 0, qe - qs);
|
ez->cigar = ksw_push_cigar(km, &ez->n_cigar, &ez->m_cigar, ez->cigar, 0, qe - qs);
|
||||||
} else { // perform normal gapped alignment
|
} else { // perform normal gapped alignment
|
||||||
mm_align_pair(km, opt, qe - qs, qseq, re - rs, tseq, mat, bw1, -1, opt->zdrop, extra_flag|KSW_EZ_APPROX_MAX, ez); // first pass: with approximate Z-drop
|
mm_align_pair(km, opt, qe - qs, qseq, re - rs, tseq, junc, mat, bw1, -1, opt->zdrop, extra_flag|KSW_EZ_APPROX_MAX, ez); // first pass: with approximate Z-drop
|
||||||
}
|
}
|
||||||
// test Z-drop and inversion Z-drop
|
// test Z-drop and inversion Z-drop
|
||||||
if ((zdrop_code = mm_test_zdrop(km, opt, qseq, tseq, ez->n_cigar, ez->cigar, mat)) != 0)
|
if ((zdrop_code = mm_test_zdrop(km, opt, qseq, tseq, ez->n_cigar, ez->cigar, mat)) != 0)
|
||||||
mm_align_pair(km, opt, qe - qs, qseq, re - rs, tseq, mat, bw1, -1, zdrop_code == 2? opt->zdrop_inv : opt->zdrop, extra_flag, ez); // second pass: lift approximate
|
mm_align_pair(km, opt, qe - qs, qseq, re - rs, tseq, junc, mat, bw1, -1, zdrop_code == 2? opt->zdrop_inv : opt->zdrop, extra_flag, ez); // second pass: lift approximate
|
||||||
// update CIGAR
|
// update CIGAR
|
||||||
if (ez->n_cigar > 0)
|
if (ez->n_cigar > 0)
|
||||||
mm_append_cigar(r, ez->n_cigar, ez->cigar);
|
mm_append_cigar(r, ez->n_cigar, ez->cigar);
|
||||||
@@ -737,7 +760,8 @@ static void mm_align1(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int
|
|||||||
if (!dropped && qe < qe0 && re < re0) { // right extension
|
if (!dropped && qe < qe0 && re < re0) { // right extension
|
||||||
qseq = &qseq0[rev][qe];
|
qseq = &qseq0[rev][qe];
|
||||||
mm_idx_getseq(mi, rid, re, re0, tseq);
|
mm_idx_getseq(mi, rid, re, re0, tseq);
|
||||||
mm_align_pair(km, opt, qe0 - qe, qseq, re0 - re, tseq, mat, bw, opt->end_bonus, opt->zdrop, extra_flag|KSW_EZ_EXTZ_ONLY, ez);
|
mm_idx_bed_junc(mi, rid, re, re0, junc);
|
||||||
|
mm_align_pair(km, opt, qe0 - qe, qseq, re0 - re, tseq, junc, mat, bw, opt->end_bonus, opt->zdrop, extra_flag|KSW_EZ_EXTZ_ONLY, ez);
|
||||||
if (ez->n_cigar > 0) {
|
if (ez->n_cigar > 0) {
|
||||||
mm_append_cigar(r, ez->n_cigar, ez->cigar);
|
mm_append_cigar(r, ez->n_cigar, ez->cigar);
|
||||||
r->p->dp_score += ez->max;
|
r->p->dp_score += ez->max;
|
||||||
@@ -760,6 +784,7 @@ static void mm_align1(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int
|
|||||||
}
|
}
|
||||||
|
|
||||||
kfree(km, tseq);
|
kfree(km, tseq);
|
||||||
|
kfree(km, junc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mm_align1_inv(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int qlen, uint8_t *qseq0[2], const mm_reg1_t *r1, const mm_reg1_t *r2, mm_reg1_t *r_inv, ksw_extz_t *ez)
|
static int mm_align1_inv(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, int qlen, uint8_t *qseq0[2], const mm_reg1_t *r1, const mm_reg1_t *r2, mm_reg1_t *r_inv, ksw_extz_t *ez)
|
||||||
@@ -793,7 +818,7 @@ static int mm_align1_inv(void *km, const mm_mapopt_t *opt, const mm_idx_t *mi, i
|
|||||||
mm_seq_rev(tl, tseq);
|
mm_seq_rev(tl, tseq);
|
||||||
if (score < opt->min_dp_max) goto end_align1_inv;
|
if (score < opt->min_dp_max) goto end_align1_inv;
|
||||||
q_off = ql - (q_off + 1), t_off = tl - (t_off + 1);
|
q_off = ql - (q_off + 1), t_off = tl - (t_off + 1);
|
||||||
mm_align_pair(km, opt, ql - q_off, qseq + q_off, tl - t_off, tseq + t_off, mat, (int)(opt->bw * 1.5), -1, opt->zdrop, KSW_EZ_EXTZ_ONLY, ez);
|
mm_align_pair(km, opt, ql - q_off, qseq + q_off, tl - t_off, tseq + t_off, 0, mat, (int)(opt->bw * 1.5), -1, opt->zdrop, KSW_EZ_EXTZ_ONLY, ez);
|
||||||
if (ez->n_cigar == 0) goto end_align1_inv; // should never be here
|
if (ez->n_cigar == 0) goto end_align1_inv; // should never be here
|
||||||
mm_append_cigar(r_inv, ez->n_cigar, ez->cigar);
|
mm_append_cigar(r_inv, ez->n_cigar, ez->cigar);
|
||||||
r_inv->p->dp_score = ez->max;
|
r_inv->p->dp_score = ez->max;
|
||||||
|
|||||||
+2
-2
@@ -31,8 +31,8 @@ To acquire the data used in this cookbook and to install minimap2 and paftools,
|
|||||||
please follow the command lines below:
|
please follow the command lines below:
|
||||||
```sh
|
```sh
|
||||||
# install minimap2 executables
|
# install minimap2 executables
|
||||||
curl -L https://github.com/lh3/minimap2/releases/download/v2.16/minimap2-2.16_x64-linux.tar.bz2 | tar jxf -
|
curl -L https://github.com/lh3/minimap2/releases/download/v2.17/minimap2-2.17_x64-linux.tar.bz2 | tar jxf -
|
||||||
cp minimap2-2.16_x64-linux/{minimap2,k8,paftools.js} . # copy executables
|
cp minimap2-2.17_x64-linux/{minimap2,k8,paftools.js} . # copy executables
|
||||||
export PATH="$PATH:"`pwd` # put the current directory on PATH
|
export PATH="$PATH:"`pwd` # put the current directory on PATH
|
||||||
# download example datasets
|
# download example datasets
|
||||||
curl -L https://github.com/lh3/minimap2/releases/download/v2.10/cookbook-data.tgz | tar zxf -
|
curl -L https://github.com/lh3/minimap2/releases/download/v2.10/cookbook-data.tgz | tar zxf -
|
||||||
|
|||||||
@@ -460,17 +460,17 @@ void mm_write_sam3(kstring_t *s, const mm_idx_t *mi, const mm_bseq1_t *t, int se
|
|||||||
int tlen = 0;
|
int tlen = 0;
|
||||||
if (this_rid >= 0 && r_next) {
|
if (this_rid >= 0 && r_next) {
|
||||||
if (this_rid == r_next->rid) {
|
if (this_rid == r_next->rid) {
|
||||||
int this_pos5 = r && r->rev? r->re - 1 : this_pos;
|
if (r) {
|
||||||
int next_pos5 = r_next->rev? r_next->re - 1 : r_next->rs;
|
int this_pos5 = r->rev? r->re - 1 : this_pos;
|
||||||
tlen = next_pos5 - this_pos5;
|
int next_pos5 = r_next->rev? r_next->re - 1 : r_next->rs;
|
||||||
|
tlen = next_pos5 - this_pos5;
|
||||||
|
}
|
||||||
mm_sprintf_lite(s, "\t=\t");
|
mm_sprintf_lite(s, "\t=\t");
|
||||||
} else mm_sprintf_lite(s, "\t%s\t", mi->seq[r_next->rid].name);
|
} else mm_sprintf_lite(s, "\t%s\t", mi->seq[r_next->rid].name);
|
||||||
mm_sprintf_lite(s, "%d\t", r_next->rs + 1);
|
mm_sprintf_lite(s, "%d\t", r_next->rs + 1);
|
||||||
} else if (r_next) { // && this_rid < 0
|
} else if (r_next) { // && this_rid < 0
|
||||||
mm_sprintf_lite(s, "\t%s\t%d\t", mi->seq[r_next->rid].name, r_next->rs + 1);
|
mm_sprintf_lite(s, "\t%s\t%d\t", mi->seq[r_next->rid].name, r_next->rs + 1);
|
||||||
} else if (this_rid >= 0) { // && r_next == NULL
|
} else if (this_rid >= 0) { // && r_next == NULL
|
||||||
int this_pos5 = this_rev? r->re - 1 : this_pos; // this_rev is only true when r != NULL
|
|
||||||
tlen = this_pos - this_pos5; // next_pos5 will be this_pos
|
|
||||||
mm_sprintf_lite(s, "\t=\t%d\t", this_pos + 1); // next segment will take r's coordinate
|
mm_sprintf_lite(s, "\t=\t%d\t", this_pos + 1); // next segment will take r's coordinate
|
||||||
} else mm_sprintf_lite(s, "\t*\t0\t"); // neither has coordinates
|
} else mm_sprintf_lite(s, "\t*\t0\t"); // neither has coordinates
|
||||||
if (tlen > 0) ++tlen;
|
if (tlen > 0) ++tlen;
|
||||||
|
|||||||
@@ -31,6 +31,16 @@ typedef struct mm_idx_bucket_s {
|
|||||||
void *h; // hash table indexing _p_ and minimizers appearing once
|
void *h; // hash table indexing _p_ and minimizers appearing once
|
||||||
} mm_idx_bucket_t;
|
} mm_idx_bucket_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int32_t st, en, max; // max is not used for now
|
||||||
|
int32_t score:30, strand:2;
|
||||||
|
} mm_idx_intv1_t;
|
||||||
|
|
||||||
|
typedef struct mm_idx_intv_s {
|
||||||
|
int32_t n, m;
|
||||||
|
mm_idx_intv1_t *a;
|
||||||
|
} mm_idx_intv_t;
|
||||||
|
|
||||||
mm_idx_t *mm_idx_init(int w, int k, int b, int flag)
|
mm_idx_t *mm_idx_init(int w, int k, int b, int flag)
|
||||||
{
|
{
|
||||||
mm_idx_t *mi;
|
mm_idx_t *mi;
|
||||||
@@ -55,6 +65,11 @@ void mm_idx_destroy(mm_idx_t *mi)
|
|||||||
kh_destroy(idx, (idxhash_t*)mi->B[i].h);
|
kh_destroy(idx, (idxhash_t*)mi->B[i].h);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (mi->I) {
|
||||||
|
for (i = 0; i < mi->n_seq; ++i)
|
||||||
|
free(mi->I[i].a);
|
||||||
|
free(mi->I);
|
||||||
|
}
|
||||||
if (!mi->km) {
|
if (!mi->km) {
|
||||||
for (i = 0; i < mi->n_seq; ++i)
|
for (i = 0; i < mi->n_seq; ++i)
|
||||||
free(mi->seq[i].name);
|
free(mi->seq[i].name);
|
||||||
@@ -585,3 +600,127 @@ int mm_idx_reader_eof(const mm_idx_reader_t *r) // TODO: in extremely rare cases
|
|||||||
{
|
{
|
||||||
return r->is_idx? (feof(r->fp.idx) || ftell(r->fp.idx) == r->idx_size) : mm_bseq_eof(r->fp.seq);
|
return r->is_idx? (feof(r->fp.idx) || ftell(r->fp.idx) == r->idx_size) : mm_bseq_eof(r->fp.seq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <zlib.h>
|
||||||
|
#include "ksort.h"
|
||||||
|
#include "kseq.h"
|
||||||
|
KSTREAM_DECLARE(gzFile, gzread)
|
||||||
|
|
||||||
|
#define sort_key_bed(a) ((a).st)
|
||||||
|
KRADIX_SORT_INIT(bed, mm_idx_intv1_t, sort_key_bed, 4)
|
||||||
|
|
||||||
|
mm_idx_intv_t *mm_idx_read_bed(const mm_idx_t *mi, const char *fn, int read_junc)
|
||||||
|
{
|
||||||
|
gzFile fp;
|
||||||
|
kstream_t *ks;
|
||||||
|
kstring_t str = {0,0,0};
|
||||||
|
mm_idx_intv_t *I;
|
||||||
|
|
||||||
|
fp = fn && strcmp(fn, "-")? gzopen(fn, "r") : gzdopen(fileno(stdin), "r");
|
||||||
|
if (fp == 0) return 0;
|
||||||
|
I = (mm_idx_intv_t*)calloc(mi->n_seq, sizeof(*I));
|
||||||
|
ks = ks_init(fp);
|
||||||
|
while (ks_getuntil(ks, KS_SEP_LINE, &str, 0) >= 0) {
|
||||||
|
mm_idx_intv_t *r;
|
||||||
|
mm_idx_intv1_t t = {-1,-1,-1,-1,0};
|
||||||
|
char *p, *q, *bl, *bs;
|
||||||
|
int32_t i, id = -1, n_blk = 0;
|
||||||
|
for (p = q = str.s, i = 0;; ++p) {
|
||||||
|
if (*p == 0 || isspace(*p)) {
|
||||||
|
int32_t c = *p;
|
||||||
|
*p = 0;
|
||||||
|
if (i == 0) { // chr
|
||||||
|
id = mm_idx_name2id(mi, q);
|
||||||
|
if (id < 0) break; // unknown name; TODO: throw a warning
|
||||||
|
} else if (i == 1) { // start
|
||||||
|
t.st = atol(q); // TODO: watch out integer overflow!
|
||||||
|
if (t.st < 0) break;
|
||||||
|
} else if (i == 2) { // end
|
||||||
|
t.en = atol(q);
|
||||||
|
if (t.en < 0) break;
|
||||||
|
} else if (i == 4) { // BED score
|
||||||
|
t.score = atol(q);
|
||||||
|
} else if (i == 5) { // strand
|
||||||
|
t.strand = *q == '+'? 1 : *q == '-'? -1 : 0;
|
||||||
|
} else if (i == 9) {
|
||||||
|
if (!isdigit(*q)) break;
|
||||||
|
n_blk = atol(q);
|
||||||
|
} else if (i == 10) {
|
||||||
|
bl = q;
|
||||||
|
} else if (i == 11) {
|
||||||
|
bs = q;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (c == 0) break;
|
||||||
|
++i, q = p + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (id < 0 || t.st < 0 || t.st >= t.en) continue;
|
||||||
|
r = &I[id];
|
||||||
|
if (i >= 11 && read_junc) { // BED12
|
||||||
|
int32_t st, sz, en;
|
||||||
|
st = strtol(bs, &bs, 10); ++bs;
|
||||||
|
sz = strtol(bl, &bl, 10); ++bl;
|
||||||
|
en = t.st + st + sz;
|
||||||
|
for (i = 1; i < n_blk; ++i) {
|
||||||
|
mm_idx_intv1_t s = t;
|
||||||
|
if (r->n == r->m) {
|
||||||
|
r->m = r->m? r->m + (r->m>>1) : 16;
|
||||||
|
r->a = (mm_idx_intv1_t*)realloc(r->a, sizeof(*r->a) * r->m);
|
||||||
|
}
|
||||||
|
st = strtol(bs, &bs, 10); ++bs;
|
||||||
|
sz = strtol(bl, &bl, 10); ++bl;
|
||||||
|
s.st = en, s.en = t.st + st;
|
||||||
|
en = t.st + st + sz;
|
||||||
|
if (s.en > s.st) r->a[r->n++] = s;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (r->n == r->m) {
|
||||||
|
r->m = r->m? r->m + (r->m>>1) : 16;
|
||||||
|
r->a = (mm_idx_intv1_t*)realloc(r->a, sizeof(*r->a) * r->m);
|
||||||
|
}
|
||||||
|
r->a[r->n++] = t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(str.s);
|
||||||
|
ks_destroy(ks);
|
||||||
|
gzclose(fp);
|
||||||
|
return I;
|
||||||
|
}
|
||||||
|
|
||||||
|
int mm_idx_bed_read(mm_idx_t *mi, const char *fn, int read_junc)
|
||||||
|
{
|
||||||
|
int32_t i;
|
||||||
|
if (mi->h == 0) mm_idx_index_name(mi);
|
||||||
|
mi->I = mm_idx_read_bed(mi, fn, read_junc);
|
||||||
|
if (mi->I == 0) return -1;
|
||||||
|
for (i = 0; i < mi->n_seq; ++i) // TODO: eliminate redundant intervals
|
||||||
|
radix_sort_bed(mi->I[i].a, mi->I[i].a + mi->I[i].n);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int mm_idx_bed_junc(const mm_idx_t *mi, int32_t ctg, int32_t st, int32_t en, uint8_t *s)
|
||||||
|
{
|
||||||
|
int32_t i, left, right;
|
||||||
|
mm_idx_intv_t *r;
|
||||||
|
memset(s, 0, en - st);
|
||||||
|
if (mi->I == 0 || ctg < 0 || ctg >= mi->n_seq) return -1;
|
||||||
|
r = &mi->I[ctg];
|
||||||
|
left = 0, right = r->n;
|
||||||
|
while (right > left) {
|
||||||
|
int32_t mid = left + ((right - left) >> 1);
|
||||||
|
if (r->a[mid].st >= st) right = mid;
|
||||||
|
else left = mid + 1;
|
||||||
|
}
|
||||||
|
for (i = left; i < r->n; ++i) {
|
||||||
|
if (st <= r->a[i].st && en >= r->a[i].en && r->a[i].strand != 0) {
|
||||||
|
if (r->a[i].strand > 0) {
|
||||||
|
s[r->a[i].st - st] |= 1, s[r->a[i].en - 1 - st] |= 2;
|
||||||
|
} else {
|
||||||
|
s[r->a[i].st - st] |= 8, s[r->a[i].en - 1 - st] |= 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return left;
|
||||||
|
}
|
||||||
|
|||||||
@@ -37,6 +37,14 @@
|
|||||||
#define KS_SEP_LINE 2 // line separator: "\n" (Unix) or "\r\n" (Windows)
|
#define KS_SEP_LINE 2 // line separator: "\n" (Unix) or "\r\n" (Windows)
|
||||||
#define KS_SEP_MAX 2
|
#define KS_SEP_MAX 2
|
||||||
|
|
||||||
|
#ifndef klib_unused
|
||||||
|
#if (defined __clang__ && __clang_major__ >= 3) || (defined __GNUC__ && __GNUC__ >= 3)
|
||||||
|
#define klib_unused __attribute__ ((__unused__))
|
||||||
|
#else
|
||||||
|
#define klib_unused
|
||||||
|
#endif
|
||||||
|
#endif /* klib_unused */
|
||||||
|
|
||||||
#define __KS_TYPE(type_t) \
|
#define __KS_TYPE(type_t) \
|
||||||
typedef struct __kstream_t { \
|
typedef struct __kstream_t { \
|
||||||
int begin, end; \
|
int begin, end; \
|
||||||
@@ -64,7 +72,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
#define __KS_INLINED(__read) \
|
#define __KS_INLINED(__read) \
|
||||||
static inline int ks_getc(kstream_t *ks) \
|
static inline klib_unused int ks_getc(kstream_t *ks) \
|
||||||
{ \
|
{ \
|
||||||
if (ks->is_eof && ks->begin >= ks->end) return -1; \
|
if (ks->is_eof && ks->begin >= ks->end) return -1; \
|
||||||
if (ks->begin >= ks->end) { \
|
if (ks->begin >= ks->end) { \
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ void ksw_extd2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uin
|
|||||||
int8_t gapo, int8_t gape, int8_t gapo2, int8_t gape2, int w, int zdrop, int end_bonus, int flag, ksw_extz_t *ez);
|
int8_t gapo, int8_t gape, int8_t gapo2, int8_t gape2, int w, int zdrop, int end_bonus, int flag, ksw_extz_t *ez);
|
||||||
|
|
||||||
void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t gapo, int8_t gape, int8_t gapo2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez);
|
int8_t gapo, int8_t gape, int8_t gapo2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez);
|
||||||
|
|
||||||
void ksw_extf2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t mch, int8_t mis, int8_t e, int w, int xdrop, ksw_extz_t *ez);
|
void ksw_extf2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t mch, int8_t mis, int8_t e, int w, int xdrop, ksw_extz_t *ez);
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -80,17 +80,17 @@ void ksw_extd2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uin
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez)
|
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez)
|
||||||
{
|
{
|
||||||
extern void ksw_exts2_sse2(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
extern void ksw_exts2_sse2(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez);
|
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez);
|
||||||
extern void ksw_exts2_sse41(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
extern void ksw_exts2_sse41(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez);
|
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez);
|
||||||
if (ksw_simd < 0) ksw_simd = x86_simd();
|
if (ksw_simd < 0) ksw_simd = x86_simd();
|
||||||
if (ksw_simd & SIMD_SSE4_1)
|
if (ksw_simd & SIMD_SSE4_1)
|
||||||
ksw_exts2_sse41(km, qlen, query, tlen, target, m, mat, q, e, q2, noncan, zdrop, flag, ez);
|
ksw_exts2_sse41(km, qlen, query, tlen, target, m, mat, q, e, q2, noncan, zdrop, junc_bonus, flag, junc, ez);
|
||||||
else if (ksw_simd & SIMD_SSE2)
|
else if (ksw_simd & SIMD_SSE2)
|
||||||
ksw_exts2_sse2(km, qlen, query, tlen, target, m, mat, q, e, q2, noncan, zdrop, flag, ez);
|
ksw_exts2_sse2(km, qlen, query, tlen, target, m, mat, q, e, q2, noncan, zdrop, junc_bonus, flag, junc, ez);
|
||||||
else abort();
|
else abort();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+49
-16
@@ -17,14 +17,14 @@
|
|||||||
#ifdef KSW_CPU_DISPATCH
|
#ifdef KSW_CPU_DISPATCH
|
||||||
#ifdef __SSE4_1__
|
#ifdef __SSE4_1__
|
||||||
void ksw_exts2_sse41(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
void ksw_exts2_sse41(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez)
|
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez)
|
||||||
#else
|
#else
|
||||||
void ksw_exts2_sse2(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
void ksw_exts2_sse2(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez)
|
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez)
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uint8_t *target, int8_t m, const int8_t *mat,
|
||||||
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int flag, ksw_extz_t *ez)
|
int8_t q, int8_t e, int8_t q2, int8_t noncan, int zdrop, int8_t junc_bonus, int flag, const uint8_t *junc, ksw_extz_t *ez)
|
||||||
#endif // ~KSW_CPU_DISPATCH
|
#endif // ~KSW_CPU_DISPATCH
|
||||||
{
|
{
|
||||||
#define __dp_code_block1 \
|
#define __dp_code_block1 \
|
||||||
@@ -113,20 +113,53 @@ void ksw_exts2_sse(void *km, int qlen, const uint8_t *query, int tlen, const uin
|
|||||||
if (flag & (KSW_EZ_SPLICE_FOR|KSW_EZ_SPLICE_REV)) {
|
if (flag & (KSW_EZ_SPLICE_FOR|KSW_EZ_SPLICE_REV)) {
|
||||||
int semi_cost = flag&KSW_EZ_SPLICE_FLANK? -noncan/2 : 0; // GTr or yAG is worth 0.5 bit; see PMID:18688272
|
int semi_cost = flag&KSW_EZ_SPLICE_FLANK? -noncan/2 : 0; // GTr or yAG is worth 0.5 bit; see PMID:18688272
|
||||||
memset(donor, -noncan, tlen_ * 16);
|
memset(donor, -noncan, tlen_ * 16);
|
||||||
for (t = 0; t < tlen - 4; ++t) {
|
|
||||||
int can_type = 0; // type of canonical site: 0=none, 1=GT/AG only, 2=GTr/yAG
|
|
||||||
if ((flag & KSW_EZ_SPLICE_FOR) && target[t+1] == 2 && target[t+2] == 3) can_type = 1; // GTr...
|
|
||||||
if ((flag & KSW_EZ_SPLICE_REV) && target[t+1] == 1 && target[t+2] == 3) can_type = 1; // CTr...
|
|
||||||
if (can_type && (target[t+3] == 0 || target[t+3] == 2)) can_type = 2;
|
|
||||||
if (can_type) ((int8_t*)donor)[t] = can_type == 2? 0 : semi_cost;
|
|
||||||
}
|
|
||||||
memset(acceptor, -noncan, tlen_ * 16);
|
memset(acceptor, -noncan, tlen_ * 16);
|
||||||
for (t = 2; t < tlen; ++t) {
|
if (!(flag & KSW_EZ_REV_CIGAR)) {
|
||||||
int can_type = 0;
|
for (t = 0; t < tlen - 4; ++t) {
|
||||||
if ((flag & KSW_EZ_SPLICE_FOR) && target[t-1] == 0 && target[t] == 2) can_type = 1; // ...yAG
|
int can_type = 0; // type of canonical site: 0=none, 1=GT/AG only, 2=GTr/yAG
|
||||||
if ((flag & KSW_EZ_SPLICE_REV) && target[t-1] == 0 && target[t] == 1) can_type = 1; // ...yAC
|
if ((flag & KSW_EZ_SPLICE_FOR) && target[t+1] == 2 && target[t+2] == 3) can_type = 1; // GTr...
|
||||||
if (can_type && (target[t-2] == 1 || target[t-2] == 3)) can_type = 2;
|
if ((flag & KSW_EZ_SPLICE_REV) && target[t+1] == 1 && target[t+2] == 3) can_type = 1; // CTr...
|
||||||
if (can_type) ((int8_t*)acceptor)[t] = can_type == 2? 0 : semi_cost;
|
if (can_type && (target[t+3] == 0 || target[t+3] == 2)) can_type = 2;
|
||||||
|
if (can_type) ((int8_t*)donor)[t] = can_type == 2? 0 : semi_cost;
|
||||||
|
}
|
||||||
|
if (junc)
|
||||||
|
for (t = 0; t < tlen - 1; ++t)
|
||||||
|
if (((flag & KSW_EZ_SPLICE_FOR) && (junc[t+1]&1)) || ((flag & KSW_EZ_SPLICE_REV) && (junc[t+1]&8)))
|
||||||
|
((int8_t*)donor)[t] += junc_bonus;
|
||||||
|
for (t = 2; t < tlen; ++t) {
|
||||||
|
int can_type = 0;
|
||||||
|
if ((flag & KSW_EZ_SPLICE_FOR) && target[t-1] == 0 && target[t] == 2) can_type = 1; // ...yAG
|
||||||
|
if ((flag & KSW_EZ_SPLICE_REV) && target[t-1] == 0 && target[t] == 1) can_type = 1; // ...yAC
|
||||||
|
if (can_type && (target[t-2] == 1 || target[t-2] == 3)) can_type = 2;
|
||||||
|
if (can_type) ((int8_t*)acceptor)[t] = can_type == 2? 0 : semi_cost;
|
||||||
|
}
|
||||||
|
if (junc)
|
||||||
|
for (t = 0; t < tlen; ++t)
|
||||||
|
if (((flag & KSW_EZ_SPLICE_FOR) && (junc[t]&2)) || ((flag & KSW_EZ_SPLICE_REV) && (junc[t]&4)))
|
||||||
|
((int8_t*)acceptor)[t] += junc_bonus;
|
||||||
|
} else {
|
||||||
|
for (t = 0; t < tlen - 4; ++t) {
|
||||||
|
int can_type = 0; // type of canonical site: 0=none, 1=GT/AG only, 2=GTr/yAG
|
||||||
|
if ((flag & KSW_EZ_SPLICE_FOR) && target[t+1] == 2 && target[t+2] == 0) can_type = 1; // GAy...
|
||||||
|
if ((flag & KSW_EZ_SPLICE_REV) && target[t+1] == 1 && target[t+2] == 0) can_type = 1; // CAy...
|
||||||
|
if (can_type && (target[t+3] == 1 || target[t+3] == 3)) can_type = 2;
|
||||||
|
if (can_type) ((int8_t*)donor)[t] = can_type == 2? 0 : semi_cost;
|
||||||
|
}
|
||||||
|
if (junc)
|
||||||
|
for (t = 0; t < tlen - 1; ++t)
|
||||||
|
if (((flag & KSW_EZ_SPLICE_FOR) && (junc[t+1]&2)) || ((flag & KSW_EZ_SPLICE_REV) && (junc[t+1]&4)))
|
||||||
|
((int8_t*)donor)[t] += junc_bonus;
|
||||||
|
for (t = 2; t < tlen; ++t) {
|
||||||
|
int can_type = 0;
|
||||||
|
if ((flag & KSW_EZ_SPLICE_FOR) && target[t-1] == 3 && target[t] == 2) can_type = 1; // ...rTG
|
||||||
|
if ((flag & KSW_EZ_SPLICE_REV) && target[t-1] == 3 && target[t] == 1) can_type = 1; // ...rTC
|
||||||
|
if (can_type && (target[t-2] == 0 || target[t-2] == 2)) can_type = 2;
|
||||||
|
if (can_type) ((int8_t*)acceptor)[t] = can_type == 2? 0 : semi_cost;
|
||||||
|
}
|
||||||
|
if (junc)
|
||||||
|
for (t = 0; t < tlen; ++t)
|
||||||
|
if (((flag & KSW_EZ_SPLICE_FOR) && (junc[t]&1)) || ((flag & KSW_EZ_SPLICE_REV) && (junc[t]&8)))
|
||||||
|
((int8_t*)acceptor)[t] += junc_bonus;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include "mmpriv.h"
|
#include "mmpriv.h"
|
||||||
#include "ketopt.h"
|
#include "ketopt.h"
|
||||||
|
|
||||||
#define MM_VERSION "2.16-r922"
|
#define MM_VERSION "2.17-r941"
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
@@ -63,6 +63,9 @@ static ko_longopt_t long_options[] = {
|
|||||||
{ "cap-sw-mem", ko_required_argument, 337 },
|
{ "cap-sw-mem", ko_required_argument, 337 },
|
||||||
{ "max-qlen", ko_required_argument, 338 },
|
{ "max-qlen", ko_required_argument, 338 },
|
||||||
{ "max-chain-iter", ko_required_argument, 339 },
|
{ "max-chain-iter", ko_required_argument, 339 },
|
||||||
|
{ "junc-bed", ko_required_argument, 340 },
|
||||||
|
{ "junc-bonus", ko_required_argument, 341 },
|
||||||
|
{ "sam-hit-only", ko_no_argument, 342 },
|
||||||
{ "help", ko_no_argument, 'h' },
|
{ "help", ko_no_argument, 'h' },
|
||||||
{ "max-intron-len", ko_required_argument, 'G' },
|
{ "max-intron-len", ko_required_argument, 'G' },
|
||||||
{ "version", ko_no_argument, 'V' },
|
{ "version", ko_no_argument, 'V' },
|
||||||
@@ -105,7 +108,7 @@ int main(int argc, char *argv[])
|
|||||||
mm_mapopt_t opt;
|
mm_mapopt_t opt;
|
||||||
mm_idxopt_t ipt;
|
mm_idxopt_t ipt;
|
||||||
int i, c, n_threads = 3, n_parts, old_best_n = -1;
|
int i, c, n_threads = 3, n_parts, old_best_n = -1;
|
||||||
char *fnw = 0, *rg = 0, *s;
|
char *fnw = 0, *rg = 0, *junc_bed = 0, *s;
|
||||||
FILE *fp_help = stderr;
|
FILE *fp_help = stderr;
|
||||||
mm_idx_reader_t *idx_rdr;
|
mm_idx_reader_t *idx_rdr;
|
||||||
mm_idx_t *mi;
|
mm_idx_t *mi;
|
||||||
@@ -204,6 +207,8 @@ int main(int argc, char *argv[])
|
|||||||
else if (c == 336) opt.flag |= MM_F_HARD_MLEVEL; // --hard-mask-level
|
else if (c == 336) opt.flag |= MM_F_HARD_MLEVEL; // --hard-mask-level
|
||||||
else if (c == 337) opt.max_sw_mat = mm_parse_num(o.arg); // --cap-sw-mat
|
else if (c == 337) opt.max_sw_mat = mm_parse_num(o.arg); // --cap-sw-mat
|
||||||
else if (c == 338) opt.max_qlen = mm_parse_num(o.arg); // --max-qlen
|
else if (c == 338) opt.max_qlen = mm_parse_num(o.arg); // --max-qlen
|
||||||
|
else if (c == 340) junc_bed = o.arg; // --junc-bed
|
||||||
|
else if (c == 342) opt.flag |= MM_F_SAM_HIT_ONLY; // --sam-hit-only
|
||||||
else if (c == 314) { // --frag
|
else if (c == 314) { // --frag
|
||||||
yes_or_no(&opt, MM_F_FRAG_MODE, o.longidx, o.arg, 1);
|
yes_or_no(&opt, MM_F_FRAG_MODE, o.longidx, o.arg, 1);
|
||||||
} else if (c == 315) { // --secondary
|
} else if (c == 315) { // --secondary
|
||||||
@@ -363,6 +368,7 @@ int main(int argc, char *argv[])
|
|||||||
__func__, realtime() - mm_realtime0, cputime() / (realtime() - mm_realtime0), mi->n_seq);
|
__func__, realtime() - mm_realtime0, cputime() / (realtime() - mm_realtime0), mi->n_seq);
|
||||||
if (argc != o.ind + 1) mm_mapopt_update(&opt, mi);
|
if (argc != o.ind + 1) mm_mapopt_update(&opt, mi);
|
||||||
if (mm_verbose >= 3) mm_idx_stat(mi);
|
if (mm_verbose >= 3) mm_idx_stat(mi);
|
||||||
|
if (junc_bed) mm_idx_bed_read(mi, junc_bed, 1);
|
||||||
if (!(opt.flag & MM_F_FRAG_MODE)) {
|
if (!(opt.flag & MM_F_FRAG_MODE)) {
|
||||||
for (i = o.ind + 1; i < argc; ++i)
|
for (i = o.ind + 1; i < argc; ++i)
|
||||||
mm_map_file(mi, argv[i], &opt, n_threads);
|
mm_map_file(mi, argv[i], &opt, n_threads);
|
||||||
|
|||||||
@@ -589,7 +589,7 @@ static void *worker_pipeline(void *shared, int step, void *in)
|
|||||||
mm_write_paf3(&p->str, mi, t, r, km, p->opt->flag, s->rep_len[i]);
|
mm_write_paf3(&p->str, mi, t, r, km, p->opt->flag, s->rep_len[i]);
|
||||||
mm_err_puts(p->str.s);
|
mm_err_puts(p->str.s);
|
||||||
}
|
}
|
||||||
} else if (p->opt->flag & (MM_F_OUT_SAM|MM_F_PAF_NO_HIT)) { // output an empty hit, if requested
|
} else if ((p->opt->flag & MM_F_PAF_NO_HIT) || ((p->opt->flag & MM_F_OUT_SAM) && !(p->opt->flag & MM_F_SAM_HIT_ONLY))) { // output an empty hit, if requested
|
||||||
if (p->opt->flag & MM_F_OUT_SAM)
|
if (p->opt->flag & MM_F_OUT_SAM)
|
||||||
mm_write_sam3(&p->str, mi, t, i - seg_st, -1, s->n_seg[k], &s->n_reg[seg_st], (const mm_reg1_t*const*)&s->reg[seg_st], km, p->opt->flag, s->rep_len[i]);
|
mm_write_sam3(&p->str, mi, t, i - seg_st, -1, s->n_seg[k], &s->n_reg[seg_st], (const mm_reg1_t*const*)&s->reg[seg_st], km, p->opt->flag, s->rep_len[i]);
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
#define MM_F_PAF_NO_HIT 0x8000000 // output unmapped reads to PAF
|
#define MM_F_PAF_NO_HIT 0x8000000 // output unmapped reads to PAF
|
||||||
#define MM_F_NO_END_FLT 0x10000000
|
#define MM_F_NO_END_FLT 0x10000000
|
||||||
#define MM_F_HARD_MLEVEL 0x20000000
|
#define MM_F_HARD_MLEVEL 0x20000000
|
||||||
|
#define MM_F_SAM_HIT_ONLY 0x40000000
|
||||||
|
|
||||||
#define MM_I_HPC 0x1
|
#define MM_I_HPC 0x1
|
||||||
#define MM_I_NO_SEQ 0x2
|
#define MM_I_NO_SEQ 0x2
|
||||||
@@ -66,6 +67,7 @@ typedef struct {
|
|||||||
mm_idx_seq_t *seq; // sequence name, length and offset
|
mm_idx_seq_t *seq; // sequence name, length and offset
|
||||||
uint32_t *S; // 4-bit packed sequence
|
uint32_t *S; // 4-bit packed sequence
|
||||||
struct mm_idx_bucket_s *B; // index (hidden)
|
struct mm_idx_bucket_s *B; // index (hidden)
|
||||||
|
struct mm_idx_intv_s *I; // intervals (hidden)
|
||||||
void *km, *h;
|
void *km, *h;
|
||||||
} mm_idx_t;
|
} mm_idx_t;
|
||||||
|
|
||||||
@@ -103,9 +105,9 @@ typedef struct {
|
|||||||
} mm_idxopt_t;
|
} mm_idxopt_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
int64_t flag; // see MM_F_* macros
|
||||||
int seed;
|
int seed;
|
||||||
int sdust_thres; // score threshold for SDUST; 0 to disable
|
int sdust_thres; // score threshold for SDUST; 0 to disable
|
||||||
int flag; // see MM_F_* macros
|
|
||||||
|
|
||||||
int max_qlen; // max query length
|
int max_qlen; // max query length
|
||||||
|
|
||||||
@@ -127,6 +129,7 @@ typedef struct {
|
|||||||
int a, b, q, e, q2, e2; // matching score, mismatch, gap-open and gap-ext penalties
|
int a, b, q, e, q2, e2; // matching score, mismatch, gap-open and gap-ext penalties
|
||||||
int sc_ambi; // score when one or both bases are "N"
|
int sc_ambi; // score when one or both bases are "N"
|
||||||
int noncan; // cost of non-canonical splicing sites
|
int noncan; // cost of non-canonical splicing sites
|
||||||
|
int junc_bonus;
|
||||||
int zdrop, zdrop_inv; // break alignment if alignment score drops too fast along the diagonal
|
int zdrop, zdrop_inv; // break alignment if alignment score drops too fast along the diagonal
|
||||||
int end_bonus;
|
int end_bonus;
|
||||||
int min_dp_max; // drop an alignment if the score of the max scoring segment is below this threshold
|
int min_dp_max; // drop an alignment if the score of the max scoring segment is below this threshold
|
||||||
@@ -365,6 +368,9 @@ int mm_idx_index_name(mm_idx_t *mi);
|
|||||||
int mm_idx_name2id(const mm_idx_t *mi, const char *name);
|
int mm_idx_name2id(const mm_idx_t *mi, const char *name);
|
||||||
int mm_idx_getseq(const mm_idx_t *mi, uint32_t rid, uint32_t st, uint32_t en, uint8_t *seq);
|
int mm_idx_getseq(const mm_idx_t *mi, uint32_t rid, uint32_t st, uint32_t en, uint8_t *seq);
|
||||||
|
|
||||||
|
int mm_idx_bed_read(mm_idx_t *mi, const char *fn, int read_junc);
|
||||||
|
int mm_idx_bed_junc(const mm_idx_t *mi, int32_t ctg, int32_t st, int32_t en, uint8_t *s);
|
||||||
|
|
||||||
// deprecated APIs for backward compatibility
|
// deprecated APIs for backward compatibility
|
||||||
void mm_mapopt_init(mm_mapopt_t *opt);
|
void mm_mapopt_init(mm_mapopt_t *opt);
|
||||||
mm_idx_t *mm_idx_build(const char *fn, int w, int k, int flag, int n_threads);
|
mm_idx_t *mm_idx_build(const char *fn, int w, int k, int flag, int n_threads);
|
||||||
|
|||||||
+25
-5
@@ -1,4 +1,4 @@
|
|||||||
.TH minimap2 1 "28 Feburary 2019" "minimap2-2.16-dirty (r922)" "Bioinformatics tools"
|
.TH minimap2 1 "4 May 2019" "minimap2-2.17 (r941)" "Bioinformatics tools"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
.PP
|
.PP
|
||||||
minimap2 - mapping and alignment between collections of DNA sequences
|
minimap2 - mapping and alignment between collections of DNA sequences
|
||||||
@@ -364,6 +364,17 @@ on SIRV data, please add
|
|||||||
.B --splice-flank=no
|
.B --splice-flank=no
|
||||||
to the command line.
|
to the command line.
|
||||||
.TP
|
.TP
|
||||||
|
.BR --junc-bed \ FILE
|
||||||
|
Gene annotations in the BED12 format (aka 12-column BED), or intron positions
|
||||||
|
in 5-column BED. With this option, minimap2 prefers splicing in annotations.
|
||||||
|
BED12 file can be converted from GTF/GFF3 with `paftools.js gff2bed anno.gtf'
|
||||||
|
[].
|
||||||
|
.TP
|
||||||
|
.BR --junc-bonus \ INT
|
||||||
|
Score bonus for a splice donor or acceptor found in annotation (effective with
|
||||||
|
.BR --junc-bed )
|
||||||
|
[0].
|
||||||
|
.TP
|
||||||
.BI --end-seed-pen \ INT
|
.BI --end-seed-pen \ INT
|
||||||
Drop a terminal anchor if
|
Drop a terminal anchor if
|
||||||
.IR s <log( g )+ INT ,
|
.IR s <log( g )+ INT ,
|
||||||
@@ -478,6 +489,9 @@ In PAF, output unmapped queries; the strand and the reference name fields are
|
|||||||
set to `*'. Warning: some paftools.js commands may not work with such output
|
set to `*'. Warning: some paftools.js commands may not work with such output
|
||||||
for the moment.
|
for the moment.
|
||||||
.TP
|
.TP
|
||||||
|
.B --sam-hit-only
|
||||||
|
In SAM, don't output unmapped reads.
|
||||||
|
.TP
|
||||||
.B --version
|
.B --version
|
||||||
Print version number to stdout
|
Print version number to stdout
|
||||||
.SS Preset options
|
.SS Preset options
|
||||||
@@ -507,7 +521,7 @@ is determined by the sequencing error mode.
|
|||||||
.B asm5
|
.B asm5
|
||||||
Long assembly to reference mapping
|
Long assembly to reference mapping
|
||||||
.RB ( -k19
|
.RB ( -k19
|
||||||
.B -w19 -A1 -B19 -O39,81 -E3,1 -s200 -z200
|
.B -w19 -A1 -B19 -O39,81 -E3,1 -s200 -z200 -N50
|
||||||
.BR --min-occ-floor=100 ).
|
.BR --min-occ-floor=100 ).
|
||||||
Typically, the alignment will not extend to regions with 5% or higher sequence
|
Typically, the alignment will not extend to regions with 5% or higher sequence
|
||||||
divergence. Only use this preset if the average divergence is far below 5%.
|
divergence. Only use this preset if the average divergence is far below 5%.
|
||||||
@@ -515,14 +529,14 @@ divergence. Only use this preset if the average divergence is far below 5%.
|
|||||||
.B asm10
|
.B asm10
|
||||||
Long assembly to reference mapping
|
Long assembly to reference mapping
|
||||||
.RB ( -k19
|
.RB ( -k19
|
||||||
.B -w19 -A1 -B9 -O16,41 -E2,1 -s200 -z200
|
.B -w19 -A1 -B9 -O16,41 -E2,1 -s200 -z200 -N50
|
||||||
.BR --min-occ-floor=100 ).
|
.BR --min-occ-floor=100 ).
|
||||||
Up to 10% sequence divergence.
|
Up to 10% sequence divergence.
|
||||||
.TP
|
.TP
|
||||||
.B asm20
|
.B asm20
|
||||||
Long assembly to reference mapping
|
Long assembly to reference mapping
|
||||||
.RB ( -k19
|
.RB ( -k19
|
||||||
.B -w10 -A1 -B4 -O6,26 -E2,1 -s200 -z200
|
.B -w10 -A1 -B4 -O6,26 -E2,1 -s200 -z200 -N50
|
||||||
.BR --min-occ-floor=100 ).
|
.BR --min-occ-floor=100 ).
|
||||||
Up to 20% sequence divergence.
|
Up to 20% sequence divergence.
|
||||||
.TP
|
.TP
|
||||||
@@ -544,7 +558,7 @@ is that this preset is not using HPC minimizers.
|
|||||||
.B splice
|
.B splice
|
||||||
Long-read spliced alignment
|
Long-read spliced alignment
|
||||||
.RB ( -k15
|
.RB ( -k15
|
||||||
.B -w5 --splice -g2000 -G200k -A1 -B2 -O2,32 -E1,0 -C9 -z200 -ub
|
.B -w5 --splice -g2000 -G200k -A1 -B2 -O2,32 -E1,0 -C9 -z200 -ub --junc-bonus=9
|
||||||
.BR --splice-flank=yes ).
|
.BR --splice-flank=yes ).
|
||||||
In the splice mode, 1) long deletions are taken as introns and represented as
|
In the splice mode, 1) long deletions are taken as introns and represented as
|
||||||
the
|
the
|
||||||
@@ -554,6 +568,12 @@ costs are different during chaining; 4) the computation of the
|
|||||||
.RB ` ms '
|
.RB ` ms '
|
||||||
tag ignores introns to demote hits to pseudogenes.
|
tag ignores introns to demote hits to pseudogenes.
|
||||||
.TP
|
.TP
|
||||||
|
.B splice:hq
|
||||||
|
Long-read splice alignment for PacBio CCS reads
|
||||||
|
.RB ( -xsplice
|
||||||
|
.B -C5 -O6,24
|
||||||
|
.BR -B4 ).
|
||||||
|
.TP
|
||||||
.B sr
|
.B sr
|
||||||
Short single-end reads without splicing
|
Short single-end reads without splicing
|
||||||
.RB ( -k21
|
.RB ( -k21
|
||||||
|
|||||||
+18
-7
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env k8
|
#!/usr/bin/env k8
|
||||||
|
|
||||||
var paftools_version = '2.16-r922';
|
var paftools_version = '2.17-r941';
|
||||||
|
|
||||||
/*****************************
|
/*****************************
|
||||||
***** Library functions *****
|
***** Library functions *****
|
||||||
@@ -1469,15 +1469,21 @@ function paf_view(args)
|
|||||||
|
|
||||||
function paf_gff2bed(args)
|
function paf_gff2bed(args)
|
||||||
{
|
{
|
||||||
var c, fn_ucsc_fai = null, is_short = false, keep_gff = false;
|
var c, fn_ucsc_fai = null, is_short = false, keep_gff = false, print_junc = false;
|
||||||
while ((c = getopt(args, "u:sg")) != null) {
|
while ((c = getopt(args, "u:sgj")) != null) {
|
||||||
if (c == 'u') fn_ucsc_fai = getopt.arg;
|
if (c == 'u') fn_ucsc_fai = getopt.arg;
|
||||||
else if (c == 's') is_short = true;
|
else if (c == 's') is_short = true;
|
||||||
else if (c == 'g') keep_gff = true;
|
else if (c == 'g') keep_gff = true;
|
||||||
|
else if (c == 'j') print_junc = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getopt.ind == args.length) {
|
if (getopt.ind == args.length) {
|
||||||
print("Usage: paftools.js gff2bed [-g] [-u ucsc-genome.fa.fai] <in.gff>");
|
print("Usage: paftools.js gff2bed [options] <in.gff>");
|
||||||
|
print("Options:");
|
||||||
|
print(" -j Output junction BED");
|
||||||
|
print(" -s Print names in the short form");
|
||||||
|
print(" -u FILE hg38.fa.fai for chr name conversion");
|
||||||
|
print(" -g Output GFF (used with -u)");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1509,11 +1515,16 @@ function paf_gff2bed(args)
|
|||||||
'misc_RNA':'0,192,0'
|
'misc_RNA':'0,192,0'
|
||||||
};
|
};
|
||||||
|
|
||||||
function print_bed12(exons, cds_st, cds_en, is_short)
|
function print_bed12(exons, cds_st, cds_en, is_short, print_junc)
|
||||||
{
|
{
|
||||||
if (exons.length == 0) return;
|
if (exons.length == 0) return;
|
||||||
var name = is_short? exons[0][7] + "|" + exons[0][5] : exons[0].slice(4, 7).join("|");
|
var name = is_short? exons[0][7] + "|" + exons[0][5] : exons[0].slice(4, 7).join("|");
|
||||||
var a = exons.sort(function(a,b) {return a[1]-b[1]});
|
var a = exons.sort(function(a,b) {return a[1]-b[1]});
|
||||||
|
if (print_junc) {
|
||||||
|
for (var i = 1; i < a.length; ++i)
|
||||||
|
print(a[i][0], a[i-1][2], a[i][1], name, 1000, a[i][3]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
var sizes = [], starts = [], st, en;
|
var sizes = [], starts = [], st, en;
|
||||||
st = a[0][1];
|
st = a[0][1];
|
||||||
en = a[a.length - 1][2];
|
en = a[a.length - 1][2];
|
||||||
@@ -1566,7 +1577,7 @@ function paf_gff2bed(args)
|
|||||||
if (type == "" && biotype != "") type = biotype;
|
if (type == "" && biotype != "") type = biotype;
|
||||||
if (id == null) throw Error("No transcript_id");
|
if (id == null) throw Error("No transcript_id");
|
||||||
if (id != last_id) {
|
if (id != last_id) {
|
||||||
print_bed12(exons, cds_st, cds_en, is_short);
|
print_bed12(exons, cds_st, cds_en, is_short, print_junc);
|
||||||
exons = [], cds_st = 1<<30, cds_en = 0;
|
exons = [], cds_st = 1<<30, cds_en = 0;
|
||||||
last_id = id;
|
last_id = id;
|
||||||
}
|
}
|
||||||
@@ -1584,7 +1595,7 @@ function paf_gff2bed(args)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (last_id != null)
|
if (last_id != null)
|
||||||
print_bed12(exons, cds_st, cds_en, is_short);
|
print_bed12(exons, cds_st, cds_en, is_short, print_junc);
|
||||||
|
|
||||||
file.close();
|
file.close();
|
||||||
buf.destroy();
|
buf.destroy();
|
||||||
|
|||||||
@@ -120,13 +120,16 @@ int mm_set_opt(const char *preset, mm_idxopt_t *io, mm_mapopt_t *mo)
|
|||||||
mo->mid_occ = 1000;
|
mo->mid_occ = 1000;
|
||||||
mo->max_occ = 5000;
|
mo->max_occ = 5000;
|
||||||
mo->mini_batch_size = 50000000;
|
mo->mini_batch_size = 50000000;
|
||||||
} else if (strcmp(preset, "splice") == 0 || strcmp(preset, "cdna") == 0) {
|
} else if (strncmp(preset, "splice", 6) == 0 || strcmp(preset, "cdna") == 0) {
|
||||||
io->flag = 0, io->k = 15, io->w = 5;
|
io->flag = 0, io->k = 15, io->w = 5;
|
||||||
mo->flag |= MM_F_SPLICE | MM_F_SPLICE_FOR | MM_F_SPLICE_REV | MM_F_SPLICE_FLANK;
|
mo->flag |= MM_F_SPLICE | MM_F_SPLICE_FOR | MM_F_SPLICE_REV | MM_F_SPLICE_FLANK;
|
||||||
mo->max_gap = 2000, mo->max_gap_ref = mo->bw = 200000;
|
mo->max_gap = 2000, mo->max_gap_ref = mo->bw = 200000;
|
||||||
mo->a = 1, mo->b = 2, mo->q = 2, mo->e = 1, mo->q2 = 32, mo->e2 = 0;
|
mo->a = 1, mo->b = 2, mo->q = 2, mo->e = 1, mo->q2 = 32, mo->e2 = 0;
|
||||||
mo->noncan = 9;
|
mo->noncan = 9;
|
||||||
|
mo->junc_bonus = 9;
|
||||||
mo->zdrop = 200, mo->zdrop_inv = 100; // because mo->a is halved
|
mo->zdrop = 200, mo->zdrop_inv = 100; // because mo->a is halved
|
||||||
|
if (strcmp(preset, "splice:hq") == 0)
|
||||||
|
mo->junc_bonus = 5, mo->b = 4, mo->q = 6, mo->q2 = 24;
|
||||||
} else return -1;
|
} else return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -10,9 +10,9 @@ cdef extern from "minimap.h":
|
|||||||
uint64_t batch_size
|
uint64_t batch_size
|
||||||
|
|
||||||
ctypedef struct mm_mapopt_t:
|
ctypedef struct mm_mapopt_t:
|
||||||
|
int64_t flag
|
||||||
int seed
|
int seed
|
||||||
int sdust_thres
|
int sdust_thres
|
||||||
int flag
|
|
||||||
int max_qlen
|
int max_qlen
|
||||||
int bw
|
int bw
|
||||||
int max_gap, max_gap_ref
|
int max_gap, max_gap_ref
|
||||||
@@ -29,6 +29,7 @@ cdef extern from "minimap.h":
|
|||||||
int a, b, q, e, q2, e2
|
int a, b, q, e, q2, e2
|
||||||
int sc_ambi
|
int sc_ambi
|
||||||
int noncan
|
int noncan
|
||||||
|
int junc_bonus
|
||||||
int zdrop, zdrop_inv
|
int zdrop, zdrop_inv
|
||||||
int end_bonus
|
int end_bonus
|
||||||
int min_dp_max
|
int min_dp_max
|
||||||
|
|||||||
+2
-2
@@ -3,7 +3,7 @@ from libc.stdlib cimport free
|
|||||||
cimport cmappy
|
cimport cmappy
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
__version__ = '2.16'
|
__version__ = '2.17'
|
||||||
|
|
||||||
cmappy.mm_reset_timer()
|
cmappy.mm_reset_timer()
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ cdef class Aligner:
|
|||||||
if fn_idx_out is None:
|
if fn_idx_out is None:
|
||||||
r = cmappy.mm_idx_reader_open(str.encode(fn_idx_in), &self.idx_opt, NULL)
|
r = cmappy.mm_idx_reader_open(str.encode(fn_idx_in), &self.idx_opt, NULL)
|
||||||
else:
|
else:
|
||||||
r = cmappy.mm_idx_reader_open(str.encode(fn_idx_in), &self.idx_opt, fn_idx_out)
|
r = cmappy.mm_idx_reader_open(str.encode(fn_idx_in), &self.idx_opt, str.encode(fn_idx_out))
|
||||||
if r is not NULL:
|
if r is not NULL:
|
||||||
self._idx = cmappy.mm_idx_reader_read(r, n_threads) # NB: ONLY read the first part
|
self._idx = cmappy.mm_idx_reader_read(r, n_threads) # NB: ONLY read the first part
|
||||||
cmappy.mm_idx_reader_close(r)
|
cmappy.mm_idx_reader_close(r)
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ def readme():
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name = 'mappy',
|
name = 'mappy',
|
||||||
version = '2.16',
|
version = '2.17',
|
||||||
url = 'https://github.com/lh3/minimap2',
|
url = 'https://github.com/lh3/minimap2',
|
||||||
description = 'Minimap2 python binding',
|
description = 'Minimap2 python binding',
|
||||||
long_description = readme(),
|
long_description = readme(),
|
||||||
|
|||||||
Reference in New Issue
Block a user