diff --git a/.gitignore b/.gitignore index af1bb41..bacc0e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ *.a *.o *.dSYM +minimap2 +minimap2.c diff --git a/main.c b/main.c index 853da1f..acb3101 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ #include "mmpriv.h" #include "getopt.h" -#define MM_VERSION "2.1.1-r369-dirty" +#define MM_VERSION "2.1.1-r372-dirty" #ifdef __linux__ #include @@ -69,6 +69,7 @@ int main(int argc, char *argv[]) mm_idx_reader_t *idx_rdr; mm_idx_t *mi; + mm_verbose = 3; liftrlimit(); mm_realtime0 = realtime(); mm_set_opt(0, &ipt, &opt); diff --git a/misc.c b/misc.c index d7dd1e4..f7b13d3 100644 --- a/misc.c +++ b/misc.c @@ -1,6 +1,6 @@ #include "minimap.h" -int mm_verbose = 3; +int mm_verbose = 1; int mm_dbg_flag = 0; double mm_realtime0; diff --git a/setup.py b/setup.py index a5afbd9..3627c85 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,9 @@ -from setuptools import setup, Extension +try: + from setuptools import setup, Extension +except ImportError: + from distutils.core import setup + from distutils.extension import Extension + from Cython.Build import cythonize import sys @@ -16,6 +21,6 @@ setup( ['python/minimap2.pyx', 'align.c', 'bseq.c', 'chain.c', 'format.c', 'hit.c', 'index.c', 'kalloc.c', 'ksw2_extd2_sse.c', 'ksw2_exts2_sse.c', 'ksw2_extz2_sse.c', 'ksw2_ll_sse.c', 'kthread.c', 'map.c', 'misc.c', 'sdust.c', 'sketch.c'], - extra_compile_args = ['-msse4'], + extra_compile_args = ['-msse4'], # WARNING: ancient x86_64 CPUs don't have SSE4 include_dirs = ['.'])]) )