From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 2 Mar 2018 19:10:51 +0000 (+0000)
Subject: [Fix] Fix brain-damaged torch build system
X-Git-Tag: 1.7.0~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=845460a852f48af2bd506af647c5d3b9ac62622a;p=thirdparty%2Frspamd.git

[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 bf07bbed6b..da7a4bb20b 100644
--- 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 b7d5dd1d64..58c4e6d358 100644
--- 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