[lua-torch-torch7] 04/05: patche: refresh cmake-disable-simd-for-compatibility.patch

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository lua-torch-torch7.

commit 461608182a8daa4473e6ff951c166d2381fb7ed4
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue Mar 14 08:36:29 2017 +0000

    patche: refresh cmake-disable-simd-for-compatibility.patch
---
 debian/changelog                                          |  1 +
 debian/patches/cmake-disable-simd-for-compatibility.patch | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ca2a96..1749ecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 lua-torch-torch7 (0~20170304-g329dff5-1) UNRELEASED; urgency=medium
 
   * Import upstream snapshot.
+  * Refresh patch: cmake-disable-simd-for-compatibility.patch .
 
  -- Zhou Mo <cdluminate at gmail.com>  Tue, 14 Mar 2017 08:13:33 +0000
 
diff --git a/debian/patches/cmake-disable-simd-for-compatibility.patch b/debian/patches/cmake-disable-simd-for-compatibility.patch
index 5e8a8f9..6cefdd6 100644
--- a/debian/patches/cmake-disable-simd-for-compatibility.patch
+++ b/debian/patches/cmake-disable-simd-for-compatibility.patch
@@ -6,10 +6,10 @@ Author: Zhou Mo
 Forward: No. Debian specific patch.
 
 diff --git a/lib/TH/cmake/FindSSE.cmake b/lib/TH/cmake/FindSSE.cmake
-index f6aac07..e4b3334 100644
+index f84ce89..75eafde 100644
 --- a/lib/TH/cmake/FindSSE.cmake
 +++ b/lib/TH/cmake/FindSSE.cmake
-@@ -97,15 +97,26 @@ MACRO(CHECK_SSE lang type flags)
+@@ -108,18 +108,29 @@ MACRO(CHECK_SSE lang type flags)
  
  ENDMACRO()
  
@@ -19,32 +19,38 @@ index f6aac07..e4b3334 100644
 -CHECK_SSE(C "SSE4_1" " ;-msse4.1;-msse4;/arch:SSE4")
 -CHECK_SSE(C "SSE4_2" " ;-msse4.2;-msse4;/arch:SSE4")
 -CHECK_SSE(C "AVX" " ;-mavx;/arch:AVX")
+-CHECK_SSE(C "AVX2" " ;-mavx2 -mfma;/arch:AVX2")
 -
 -CHECK_SSE(CXX "SSE1" " ;-msse;/arch:SSE")
 -CHECK_SSE(CXX "SSE2" " ;-msse2;/arch:SSE2")
 -CHECK_SSE(CXX "SSE3" " ;-msse3;/arch:SSE3")
 -CHECK_SSE(CXX "SSE4_1" " ;-msse4.1;-msse4;/arch:SSE4")
 -CHECK_SSE(CXX "SSE4_2" " ;-msse4.2;-msse4;/arch:SSE4")
+-CHECK_SSE(CXX "AVX" " ;-mavx;/arch:AVX")
+-CHECK_SSE(CXX "AVX2" " ;-mavx2 -mfma;/arch:AVX2")
 +IF(DEBIAN_I386)
 +  # no SSE at all for i386
 +ELSEIF(DEBIAN_AMD64)
-+  # nothing higher than SSE2, no AVX
++  # nothing higher than SSE2, no AVX. (Debian)
 +  CHECK_SSE(C "SSE1" " ;-msse;/arch:SSE")
 +  CHECK_SSE(C "SSE2" " ;-msse2;/arch:SSE2")
 +  CHECK_SSE(CXX "SSE1" " ;-msse;/arch:SSE")
 +  CHECK_SSE(CXX "SSE2" " ;-msse2;/arch:SSE2")
 +ELSE()
-+  # General case
++  # Upstream
 +  CHECK_SSE(C "SSE1" " ;-msse;/arch:SSE")
 +  CHECK_SSE(C "SSE2" " ;-msse2;/arch:SSE2")
 +  CHECK_SSE(C "SSE3" " ;-msse3;/arch:SSE3")
 +  CHECK_SSE(C "SSE4_1" " ;-msse4.1;-msse4;/arch:SSE4")
 +  CHECK_SSE(C "SSE4_2" " ;-msse4.2;-msse4;/arch:SSE4")
 +  CHECK_SSE(C "AVX" " ;-mavx;/arch:AVX")
++  CHECK_SSE(C "AVX2" " ;-mavx2 -mfma;/arch:AVX2")
 +  
 +  CHECK_SSE(CXX "SSE1" " ;-msse;/arch:SSE")
 +  CHECK_SSE(CXX "SSE2" " ;-msse2;/arch:SSE2")
 +  CHECK_SSE(CXX "SSE3" " ;-msse3;/arch:SSE3")
 +  CHECK_SSE(CXX "SSE4_1" " ;-msse4.1;-msse4;/arch:SSE4")
 +  CHECK_SSE(CXX "SSE4_2" " ;-msse4.2;-msse4;/arch:SSE4")
++  CHECK_SSE(CXX "AVX" " ;-mavx;/arch:AVX")
++  CHECK_SSE(CXX "AVX2" " ;-mavx2 -mfma;/arch:AVX2")
 +ENDIF()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lua-torch-torch7.git