blob: 5b3204ed219a6ace4e5d01f8a8e48d1a90c00c51 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
build: don't force SSE on i386
--- src/ext/PBA/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC
+++ src/ext/PBA/CMakeLists.txt
@@ -1,7 +1,3 @@
-if(NOT IS_MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O3 -pthread -march=core2 -mfpmath=sse -Wno-c++11-narrowing")
-endif()
-
if(CUDA_ENABLED)
# Fix for Ubuntu 16.04.
add_definitions("-D_FORCE_INLINES")
--- src/ext/PBA/SparseBundleCPU.cpp.orig 2017-06-15 14:32:01 UTC
+++ src/ext/PBA/SparseBundleCPU.cpp
@@ -52,15 +52,16 @@ using std::max;
#if defined(_M_ARM) && _M_ARM >= 7 && !defined(DISABLE_CPU_NEON)
#include <arm_neon.h>
#define CPUPBA_USE_NEON
-#elif defined(__ARM_NEON__) && !defined(DISABLE_CPU_NEON)
+#elif defined(__ARM_NEON) && !defined(DISABLE_CPU_NEON)
#include <arm_neon.h>
#define CPUPBA_USE_NEON
#endif
-#elif defined(CPUPBA_USE_AVX) // Using AVX
+#elif defined(__AVX__) && !defined(DISABLE_CPU_AVX) // Using AVX
#include <immintrin.h>
+#define CPUPBA_USE_AVX
#undef CPUPBA_USE_SSE
#undef POINT_DATA_ALIGN4
-#elif !defined(DISABLE_CPU_SSE) // Using SSE
+#elif defined(__SSE__) && !defined(DISABLE_CPU_SSE) // Using SSE
#define CPUPBA_USE_SSE
#include <xmmintrin.h>
#include <emmintrin.h>
--- src/ext/SiftGPU/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC
+++ src/ext/SiftGPU/CMakeLists.txt
@@ -1,13 +1,9 @@
set(SIFT_GPU_ENABLE_OPENCL FALSE)
-set(SIFT_GPU_ENABLE_SSE TRUE)
set(SIFT_GPU_ENABLE_DEVIL FALSE)
set(SIFT_GPU_PREFER_GLUT TRUE)
if(NOT IS_MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- if(SIFT_GPU_ENABLE_SSE)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=core2 -mfpmath=sse")
- endif()
endif()
if(SIFT_GPU_PREFER_GLUT)
|
