-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
VSEARCH 2.10.4: Fixes x86_64 SIMD alignment bug and others
- Loading branch information
Showing
6 changed files
with
44 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
VSEARCH: a versatile open source tool for metagenomics | ||
|
||
Copyright (C) 2014-2018, Torbjorn Rognes, Frederic Mahe and Tomas Flouri | ||
Copyright (C) 2014-2019, Torbjorn Rognes, Frederic Mahe and Tomas Flouri | ||
All rights reserved. | ||
|
||
Contact: Torbjorn Rognes <[email protected]>, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# Process this file with autoconf to produce a configure script. | ||
|
||
AC_PREREQ([2.63]) | ||
AC_INIT([vsearch], [2.10.3], [[email protected]]) | ||
AC_INIT([vsearch], [2.10.4], [[email protected]]) | ||
AC_CANONICAL_TARGET | ||
AM_INIT_AUTOMAKE([subdir-objects]) | ||
AC_LANG([C++]) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
VSEARCH: a versatile open source tool for metagenomics | ||
Copyright (C) 2014-2018, Torbjorn Rognes, Frederic Mahe and Tomas Flouri | ||
Copyright (C) 2014-2019, Torbjorn Rognes, Frederic Mahe and Tomas Flouri | ||
All rights reserved. | ||
Contact: Torbjorn Rognes <[email protected]>, | ||
|
@@ -162,7 +162,7 @@ const uint16x8_t neon_mask = | |
typedef __m128i VECTOR_SHORT; | ||
|
||
#define v_init(a,b,c,d,e,f,g,h) _mm_set_epi16(h,g,f,e,d,c,b,a) | ||
#define v_load(a) _mm_load_si128((VECTOR_SHORT *)a) | ||
#define v_load(a) _mm_load_si128((VECTOR_SHORT *)(a)) | ||
#define v_store(a, b) _mm_store_si128((VECTOR_SHORT *)(a), (b)) | ||
#define v_merge_lo_16(a, b) _mm_unpacklo_epi16((a),(b)) | ||
#define v_merge_hi_16(a, b) _mm_unpackhi_epi16((a),(b)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
VSEARCH: a versatile open source tool for metagenomics | ||
Copyright (C) 2014-2018, Torbjorn Rognes, Frederic Mahe and Tomas Flouri | ||
Copyright (C) 2014-2019, Torbjorn Rognes, Frederic Mahe and Tomas Flouri | ||
All rights reserved. | ||
Contact: Torbjorn Rognes <[email protected]>, | ||
|
@@ -197,15 +197,28 @@ void results_show_uc_one(FILE * fp, | |
strand: + or - | ||
0 | ||
0 | ||
compressed alignment, e.g. 9I92M14D, or "=" if prefect alignment | ||
compressed alignment, e.g. 9I92M14D, or "=" if perfect alignment | ||
query label | ||
target label | ||
*/ | ||
|
||
if (hp) | ||
{ | ||
bool perfect = (hp->matches == qseqlen) && | ||
((uint64_t)(qseqlen) == db_getsequencelen(hp->target)); | ||
bool perfect; | ||
|
||
if (opt_cluster_fast) | ||
{ | ||
/* cluster_fast */ | ||
/* use = for identical sequences ignoring terminal gaps */ | ||
perfect = (hp->matches == hp->internal_alignmentlength); | ||
} | ||
else | ||
{ | ||
/* cluster_size, cluster_smallmem, cluster_unoise */ | ||
/* usearch_global, search_exact, allpairs_global */ | ||
/* use = for strictly identical sequences */ | ||
perfect = (hp->matches == hp->nwalignmentlength); | ||
} | ||
|
||
fprintf(fp, | ||
"H\t%d\t%" PRId64 "\t%.1f\t%c\t0\t0\t%s\t%s\t%s\n", | ||
|
8e3dd8b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixes #216, #355 and #356.