diff --git a/scripts/generate_trimmed_msas.sh b/scripts/generate_trimmed_msas.sh index 48bfbe907..550647681 100755 --- a/scripts/generate_trimmed_msas.sh +++ b/scripts/generate_trimmed_msas.sh @@ -7,6 +7,10 @@ mkdir test_msas/nogaps mkdir test_msas/noallgaps ./bin/trimal -in dataset/example.004.AA.fasta -gappyout -out test_msas/gappyout/example.004.AA.fasta + +exit 1 + + ./bin/trimal -in dataset/example.004.AA.fasta -strict -out test_msas/strict/example.004.AA.fasta ./bin/trimal -in dataset/example.004.AA.fasta -strictplus -out test_msas/strictplus/example.004.AA.fasta ./bin/trimal -in dataset/example.004.AA.fasta -automated1 -out test_msas/automated1/example.004.AA.fasta diff --git a/source/Platform/x86/AVX2.cpp b/source/Platform/x86/AVX2.cpp index 4c73a053a..8ee9dcaf2 100644 --- a/source/Platform/x86/AVX2.cpp +++ b/source/Platform/x86/AVX2.cpp @@ -131,6 +131,14 @@ class AVX2Vector { __m256i sum256 = _mm256_sad_epu8(vector, _mm256_setzero_si256()); __m128i sum128 = _mm_add_epi64(_mm256_extractf128_si256(sum256, 1), _mm256_castsi256_si128(sum256)); std::cout << "NOT CPU_FEATURES_ARCH_X86_64 \n"; + +#if (defined(_M_X64) || defined(__x86_64__)) + std::cout << "defined(_M_X64) || defined(__x86_64__) \n"; +#endif + +#if !defined(CPU_FEATURES_ARCH_VM) + std::cout << "!defined(CPU_FEATURES_ARCH_VM) \n"; +#endif exit (1); return _mm_extract_epi32(sum128, 0) + _mm_extract_epi32(sum128, 2); }