summaryrefslogtreecommitdiffstats
path: root/graphics/colmap/files/patch-no-sse
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/colmap/files/patch-no-sse')
-rw-r--r--graphics/colmap/files/patch-no-sse50
1 files changed, 50 insertions, 0 deletions
diff --git a/graphics/colmap/files/patch-no-sse b/graphics/colmap/files/patch-no-sse
new file mode 100644
index 0000000..5b3204e
--- /dev/null
+++ b/graphics/colmap/files/patch-no-sse
@@ -0,0 +1,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)
OpenPOWER on IntegriCloud