mirror of
https://github.com/lh3/minimap2.git
synced 2026-09-24 23:58:11 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7358a1ead1 | ||
|
|
32f552957e | ||
|
|
59488f0271 | ||
|
|
5cc3d2239f |
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
CFLAGS= -g -Wall -O2 -Wc++-compat #-Wextra
|
CFLAGS= -g -Wall -O2 -Wc++-compat #-Wextra
|
||||||
CPPFLAGS= -DHAVE_KALLOC -DUSE_SIMDE -DSIMDE_ENABLE_NATIVE_ALIASES
|
CPPFLAGS= -DHAVE_KALLOC -DUSE_SIMDE -DSIMDE_ENABLE_NATIVE_ALIASES
|
||||||
INCLUDES= -Ilib/simde
|
INCLUDES= -Ilib/simde
|
||||||
OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o index.o chain.o align.o hit.o map.o format.o pe.o esterr.o splitidx.o \
|
OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o index.o lchain.o align.o hit.o map.o format.o pe.o seed.o esterr.o splitidx.o \
|
||||||
ksw2_extz2_simde.o ksw2_extd2_simde.o ksw2_exts2_simde.o ksw2_ll_simde.o
|
ksw2_extz2_simde.o ksw2_extd2_simde.o ksw2_exts2_simde.o ksw2_ll_simde.o
|
||||||
PROG= minimap2
|
PROG= minimap2
|
||||||
PROG_EXTRA= sdust minimap2-lite
|
PROG_EXTRA= sdust minimap2-lite
|
||||||
|
|||||||
@@ -1,3 +1,28 @@
|
|||||||
|
Release 2.22-r1101 (7 August 2021)
|
||||||
|
----------------------------------
|
||||||
|
|
||||||
|
When choosing the best alignment, this release uses logarithm gap penalty and
|
||||||
|
query-specific mismatch penalty. It improves the sensitivity to long INDELs in
|
||||||
|
repetitive regions.
|
||||||
|
|
||||||
|
Other notable changes:
|
||||||
|
|
||||||
|
* Bugfix: fixed an indirect memory leak that may waste a large amount of
|
||||||
|
memory given highly repetitive reference such as a 16S RNA database (#749).
|
||||||
|
All versions of minimap2 have this issue.
|
||||||
|
|
||||||
|
* New feature: added --cap-kalloc to reduce the peak memory. This option is
|
||||||
|
not enabled by default but may become the default in future releases.
|
||||||
|
|
||||||
|
Known issue:
|
||||||
|
|
||||||
|
* Minimap2 may take a long time to map a read (#771). So far it is not clear
|
||||||
|
if this happens to v2.18 and earlier versions.
|
||||||
|
|
||||||
|
(2.22: 7 August 2021, r1101)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Release 2.21-r1071 (6 July 2021)
|
Release 2.21-r1071 (6 July 2021)
|
||||||
--------------------------------
|
--------------------------------
|
||||||
|
|
||||||
@@ -5,7 +30,7 @@ This release fixed a regression in short-read mapping introduced in v2.19
|
|||||||
(#776). It also fixed invalid comparisons of uninitialized variables, though
|
(#776). It also fixed invalid comparisons of uninitialized variables, though
|
||||||
these are harmless (#752). Long-read alignment should be identical to v2.20.
|
these are harmless (#752). Long-read alignment should be identical to v2.20.
|
||||||
|
|
||||||
(2.21: 6 July 2021)
|
(2.21: 6 July 2021, r1071)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -74,8 +74,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.21/minimap2-2.21_x64-linux.tar.bz2 | tar -jxvf -
|
curl -L https://github.com/lh3/minimap2/releases/download/v2.22/minimap2-2.22_x64-linux.tar.bz2 | tar -jxvf -
|
||||||
./minimap2-2.21_x64-linux/minimap2
|
./minimap2-2.22_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
|
||||||
|
|||||||
+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.21/minimap2-2.21_x64-linux.tar.bz2 | tar jxf -
|
curl -L https://github.com/lh3/minimap2/releases/download/v2.22/minimap2-2.22_x64-linux.tar.bz2 | tar jxf -
|
||||||
cp minimap2-2.21_x64-linux/{minimap2,k8,paftools.js} . # copy executables
|
cp minimap2-2.22_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 -
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#include "mmpriv.h"
|
#include "mmpriv.h"
|
||||||
#include "ketopt.h"
|
#include "ketopt.h"
|
||||||
|
|
||||||
#define MM_VERSION "2.21-dev-r1094-dirty"
|
#define MM_VERSION "2.22-r1101"
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
@@ -410,7 +410,10 @@ int main(int argc, char *argv[])
|
|||||||
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 (junc_bed) mm_idx_bed_read(mi, junc_bed, 1);
|
||||||
if (alt_list) mm_idx_alt_read(mi, alt_list);
|
if (alt_list) mm_idx_alt_read(mi, alt_list);
|
||||||
if (argc - (o.ind + 1) == 0) continue; // no query files
|
if (argc - (o.ind + 1) == 0) {
|
||||||
|
mm_idx_destroy(mi);
|
||||||
|
continue; // no query files
|
||||||
|
}
|
||||||
ret = 0;
|
ret = 0;
|
||||||
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) {
|
||||||
|
|||||||
+6
-1
@@ -1,4 +1,4 @@
|
|||||||
.TH minimap2 1 "6 July 2021" "minimap2-2.21 (r1071)" "Bioinformatics tools"
|
.TH minimap2 1 "7 August 2021" "minimap2-2.22 (r1101)" "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
|
||||||
@@ -423,6 +423,11 @@ alignment.
|
|||||||
Skip alignment if the DP matrix size is above
|
Skip alignment if the DP matrix size is above
|
||||||
.IR NUM .
|
.IR NUM .
|
||||||
Set 0 to disable [100m].
|
Set 0 to disable [100m].
|
||||||
|
.TP
|
||||||
|
.BI --cap-kalloc \ NUM
|
||||||
|
Free thread-local kalloc memory reservoir if after the alignment the size of the reservoir above
|
||||||
|
.IR NUM .
|
||||||
|
Set 0 to disable [0].
|
||||||
.SS Input/output options
|
.SS Input/output options
|
||||||
.TP 10
|
.TP 10
|
||||||
.B -a
|
.B -a
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env k8
|
#!/usr/bin/env k8
|
||||||
|
|
||||||
var paftools_version = '2.21-r1071';
|
var paftools_version = '2.22-r1101';
|
||||||
|
|
||||||
/*****************************
|
/*****************************
|
||||||
***** Library functions *****
|
***** Library functions *****
|
||||||
|
|||||||
@@ -45,6 +45,9 @@ cdef extern from "minimap.h":
|
|||||||
int anchor_ext_len, anchor_ext_shift
|
int anchor_ext_len, anchor_ext_shift
|
||||||
float max_clip_ratio
|
float max_clip_ratio
|
||||||
|
|
||||||
|
int rank_min_len
|
||||||
|
float rank_frac
|
||||||
|
|
||||||
int pe_ori, pe_bonus
|
int pe_ori, pe_bonus
|
||||||
|
|
||||||
float mid_occ_frac
|
float mid_occ_frac
|
||||||
@@ -53,6 +56,7 @@ cdef extern from "minimap.h":
|
|||||||
int32_t max_occ
|
int32_t max_occ
|
||||||
int64_t mini_batch_size
|
int64_t mini_batch_size
|
||||||
int64_t max_sw_mat
|
int64_t max_sw_mat
|
||||||
|
int64_t cap_kalloc
|
||||||
|
|
||||||
const char *split_prefix
|
const char *split_prefix
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ from libc.stdlib cimport free
|
|||||||
cimport cmappy
|
cimport cmappy
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
__version__ = '2.21'
|
__version__ = '2.22'
|
||||||
|
|
||||||
cmappy.mm_reset_timer()
|
cmappy.mm_reset_timer()
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ def readme():
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name = 'mappy',
|
name = 'mappy',
|
||||||
version = '2.21',
|
version = '2.22',
|
||||||
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