From 959381cdb807f7154aa5e00612dbfad08a56a1d8 Mon Sep 17 00:00:00 2001 From: searchivairus Date: Wed, 7 Feb 2018 13:48:08 -0500 Subject: [PATCH] Trying to fix this Travis compilation error once again. --- similarity_search/include/portable_intrinsics.h | 7 +++---- similarity_search/src/distcomp_l2sqr_sift.cc | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/similarity_search/include/portable_intrinsics.h b/similarity_search/include/portable_intrinsics.h index 917fce8..37afc3e 100644 --- a/similarity_search/include/portable_intrinsics.h +++ b/similarity_search/include/portable_intrinsics.h @@ -33,9 +33,11 @@ #endif -#if defined(PORTABLE_SSE4) +#if defined(PORTABLE_SSE2) #include +#endif +#if defined(PORTABLE_SSE4) /* * Based on explanations/suggestions from here * http://stackoverflow.com/questions/5526658/intel-sse-why-does-mm-extract-ps-return-int-instead-of-float @@ -50,9 +52,6 @@ * not to use the above MM_EXTRACT_FLOAT (https://github.com/searchivarius/BlogCode/tree/master/2016/bench_sums) * */ - -#elif defined(PORTABLE_SSE2) -#include #endif diff --git a/similarity_search/src/distcomp_l2sqr_sift.cc b/similarity_search/src/distcomp_l2sqr_sift.cc index 38e7f6d..dd5089e 100644 --- a/similarity_search/src/distcomp_l2sqr_sift.cc +++ b/similarity_search/src/distcomp_l2sqr_sift.cc @@ -17,7 +17,6 @@ #include "utils.h" #include "pow.h" #include "portable_intrinsics.h" -#include "portable_simd.h" #include #include