Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

small additions for possible 2.3 release

  • Loading branch information...
commit 5c547756d3b03f342e02036e70f118109772d787 1 parent 4160675
@sim82 authored
Showing with 4 additions and 1 deletion.
  1. +1 −1  build_papara2.sh
  2. +1 −0  tar_release.sh
  3. +2 −0  vec_unit.h
View
2  build_papara2.sh
@@ -5,7 +5,7 @@
-g++ -o papara -O3 -march=native -I. -I ivy_mike/src/ -I ublasJama-1.0.2.3 papara.cpp pvec.cpp pars_align_seq.cpp pars_align_gapp_seq.cpp parsimony.cpp sequence_model.cpp papara2_main.cpp blast_partassign.cpp ivy_mike/src/time.cpp ivy_mike/src/tree_parser.cpp ivy_mike/src/getopt.cpp ivy_mike/src/demangle.cpp ivy_mike/src/multiple_alignment.cpp ublasJama-1.0.2.3/EigenvalueDecomposition.cpp -lpthread
+g++ -o papara -O3 -msse4.1 -I. -I ivy_mike/src/ -I ublasJama-1.0.2.3 papara.cpp pvec.cpp pars_align_seq.cpp pars_align_gapp_seq.cpp parsimony.cpp sequence_model.cpp papara2_main.cpp blast_partassign.cpp align_utils.cpp ivy_mike/src/time.cpp ivy_mike/src/tree_parser.cpp ivy_mike/src/getopt.cpp ivy_mike/src/demangle.cpp ivy_mike/src/multiple_alignment.cpp ublasJama-1.0.2.3/EigenvalueDecomposition.cpp -lpthread
#-I/usr/include/boost141/
View
1  tar_release.sh
@@ -0,0 +1 @@
+tar --exclude 'genassign_blast/*' --exclude 'genassign_blast' --exclude-vcs -c -z -f papara_nt-2.3-alpha.tar.gz papara_nt/
View
2  vec_unit.h
@@ -409,6 +409,7 @@ struct vector_unit<int, 4> {
#ifdef __SSE4_1__
return _mm_min_epi32( a, b );
#else
+ #error "probably untested code!"
const vec_t ma = _mm_cmplt_epi32( a, b );
return _mm_or_si128( _mm_and_si128( ma, a ), _mm_andnot_si128( ma, b ) );
#endif
@@ -419,6 +420,7 @@ struct vector_unit<int, 4> {
#ifdef __SSE4_1__
return _mm_max_epi32( a, b );
#else
+ #error "probably untested code!"
const vec_t ma = _mm_cmpgt_epi32( a, b );
return _mm_or_si128( _mm_and_si128( ma, a ), _mm_andnot_si128( ma, b ) );
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.