[Fix] Fix brain-damaged torch build system

diff --git a/contrib/torch/torch7/lib/TH/generic/simd/convolve.c b/contrib/torch/torch7/lib/TH/generic/simd/convolve.c
index bf07bbed6bf39822e8b955099d613840620e9dc2..da7a4bb20bc4b9a27d6b73a09afd583c09957369 100644 (file)
--- a/contrib/torch/torch7/lib/TH/generic/simd/convolve.c
+++ b/contrib/torch/torch7/lib/TH/generic/simd/convolve.c
@@ -1,4 +1,4 @@
-#if defined(__AVX__)
+#if defined(USE_AVX) && defined(__AVX__)
 
 #ifdef _MSC_VER
 #include <intrin.h>
@@ -113,7 +113,7 @@ void convolve_5x5_sse(float* output, float* input, float* kernel, long outRows,
 void convolve_5x5_avx(float* output, float* input, float* kernel, long outRows, long outCols, long outStride, long inCols);
 
 void convolve_5x5(float* output, float* input, float* kernel, long outRows, long outCols, long inCols) {
-#if defined(__AVX__)
+#if defined(USE_AVX) && defined(__AVX__)
   int avx = haveCPUFeature(kCPUFeature_AVX);
   if (avx)
   {

diff --git a/contrib/torch/torch7/lib/TH/vector/AVX.c b/contrib/torch/torch7/lib/TH/vector/AVX.c
index b7d5dd1d6470deeb2919687675bcfc2c87a3051c..58c4e6d3586b9c141a8f8d7c89734095b8f0e67a 100644 (file)
--- a/contrib/torch/torch7/lib/TH/vector/AVX.c
+++ b/contrib/torch/torch7/lib/TH/vector/AVX.c
@@ -1,4 +1,4 @@
-#if defined(__AVX__)
+#if defined(USE_AVX) && defined(__AVX__)
 #ifndef _MSC_VER
 #include <x86intrin.h>
 #else