[lua-torch-torch7] 01/01: patch: disable several ISAs on arm*

[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 431e872ae0e8be4fdfd6731e1ef32ecc5496c788
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Jan 9 13:09:13 2017 +0000

    patch: disable several ISAs on arm*
---
 debian/changelog                               |  6 ++++++
 debian/patches/cmake-disable-simd-on-arm.patch | 20 ++++++++++++++++++++
 debian/patches/series                          |  1 +
 debian/rules                                   |  3 +++
 4 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b7158ea..d8f43bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lua-torch-torch7 (0~20161115-g552b086-2) UNRELEASED; urgency=medium
+
+  * Disable the OMAP3, OMAP4 and NEON instruction sets for compatibility.
+
+ -- Zhou Mo <cdluminate at gmail.com>  Sat, 07 Jan 2017 11:48:34 +0000
+
 lua-torch-torch7 (0~20161115-g552b086-1) experimental; urgency=medium
 
   * Import upstream snapshot.
diff --git a/debian/patches/cmake-disable-simd-on-arm.patch b/debian/patches/cmake-disable-simd-on-arm.patch
new file mode 100644
index 0000000..a3204bd
--- /dev/null
+++ b/debian/patches/cmake-disable-simd-on-arm.patch
@@ -0,0 +1,20 @@
+Purpose: disable OMAP*, and NEON instruction sets for sake of compatibility
+Forward: not yet, keep it here.
+diff --git a/lib/TH/cmake/FindARM.cmake b/lib/TH/cmake/FindARM.cmake
+index 59c78d8..697a399 100644
+--- a/lib/TH/cmake/FindARM.cmake
++++ b/lib/TH/cmake/FindARM.cmake
+@@ -64,6 +64,13 @@ ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(NEON_FOUND   false CACHE BOOL "NEON not available on host")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ 
++IF(DEBIAN_ARM)
++   # build for the best compatibility even if the builder supports SIMD
++   set(CORTEXA8_FOUND   false CACHE BOOL "OMAP3 disabled")
++   set(CORTEXA9_FOUND   false CACHE BOOL "OMAP4 disabled")
++   set(NEON_FOUND   false CACHE BOOL "NEON disabled")
++ENDIF(DEBIAN_ARM)
++
+ if(NOT NEON_FOUND)
+       MESSAGE(STATUS "Could not find hardware support for NEON on this machine.")
+ endif(NOT NEON_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 622c741..373d0a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 cmake-disable-simd-for-compatibility.patch
+cmake-disable-simd-on-arm.patch
diff --git a/debian/rules b/debian/rules
index 2737efa..11e8397 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,9 @@ endif
 ifeq (i386,$(DEB_HOST_ARCH))
 ISA_FLAGS= -DDEBIAN_I386=ON
 endif
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),arm64 armel armhf))
+ISA_FLAGS= -DDEBIAN_ARM=ON
+endif
 
 %:
 	dh $@ --buildsystem=lua --with lua --parallel

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