[med-svn] [Git][med-team/plast][simde] 3 commits: Attempt enabling simde

[Nilesh Patra]

Nilesh Patra pushed to branch simde at Debian Med / plast


Commits:
7d7bfae4 by Nilesh Patra at 2020-12-06T00:55:49+05:30
Attempt enabling simde

- - - - -
538640d5 by Nilesh Patra at 2020-12-06T00:55:54+05:30
Add Build-Dep and Built-Using since the license is AGPL

- - - - -
a2e06f5d by Nilesh Patra at 2020-12-06T00:55:54+05:30
Enable simde flags

- - - - -


4 changed files:

- debian/control
- debian/patches/series
- + debian/patches/simde.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -6,7 +6,8 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
                libpcre3-dev,
-               default-jdk
+               default-jdk,
+               libsimde-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/plast
 Vcs-Git: https://salsa.debian.org/med-team/plast.git
@@ -14,7 +15,9 @@ Homepage: https://plast.inria.fr/
 Rules-Requires-Root: no
 
 Package: plast
-Architecture: any-amd64 x32
+Architecture: any
+# Since the license of this package is AGPL, adding a Built-Using
+Built-Using: ${simde:Built-Using}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${java:Depends}


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ use_debian_packaged_pcre.patch
 adapt_auto_test_script.sh
 no_msse3.patch
 reproducible.patch
+simde.patch


=====================================
debian/patches/simde.patch
=====================================
@@ -0,0 +1,60 @@
+--- a/src/algo/hits/gap/SmallGapHitIteratorSSE8.cpp
++++ b/src/algo/hits/gap/SmallGapHitIteratorSSE8.cpp
+@@ -19,15 +19,8 @@
+ 
+ #include <algo/hits/gap/SmallGapHitIteratorSSE8.hpp>
+ 
+-#if __SSE3__
+-    #include <pmmintrin.h>
+-#else
+-    #if __SSE2__
+-        #include <emmintrin.h>
+-    #else
+-        #warning error undefined __SSE3__ or __SSE2__
+-    #endif
+-#endif
++#define SIMDE_ENABLE_NATIVE_ALIASES
++#include <simde/x86/sse3.h>
+ 
+ using namespace std;
+ using namespace misc;
+--- a/src/algo/hits/ungap/UngapHitIteratorSSE16.cpp
++++ b/src/algo/hits/ungap/UngapHitIteratorSSE16.cpp
+@@ -21,15 +21,8 @@
+ 
+ #include <algo/hits/ungap/UngapHitIteratorSSE16.hpp>
+ 
+-#if __SSE3__
+-    #include <pmmintrin.h>
+-#else
+-#if __SSE2__
+-    #include <emmintrin.h>
+-#else
+-    #warning error undefined __SSE3__ or __SSE2__
+-#endif
+-#endif
++#define SIMDE_ENABLE_NATIVE_ALIASES
++#include <simde/x86/sse3.h>
+ 
+ using namespace std;
+ using namespace misc;
+--- a/src/algo/hits/ungap/UngapHitIteratorSSE8.cpp
++++ b/src/algo/hits/ungap/UngapHitIteratorSSE8.cpp
+@@ -20,15 +20,8 @@
+ 
+ #include <algo/hits/ungap/UngapHitIteratorSSE8.hpp>
+ 
+-#if __SSE3__
+-    #include <pmmintrin.h>
+-#else
+-#if __SSE2__
+-    #include <emmintrin.h>
+-#else
+-    #warning error undefined __SSE3__ or __SSE2__
+-#endif
+-#endif
++#define SIMDE_ENABLE_NATIVE_ALIASES
++#include <simde/x86/sse3.h>
+ 
+ using namespace std;
+ using namespace misc;


=====================================
debian/rules
=====================================
@@ -8,6 +8,8 @@ BUILD_DIR := obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 BUILD_DATE := $(shell TZ=UTC LC_ALL=C dpkg-parsechangelog | grep Date: | cut -d' ' -f2-7)
 export BDATE=$(shell TZ=UTC LC_ALL=C date -d"$(BUILD_DATE)" +'%Y-%m-%d')
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND += -DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
+export DEB_CXXFLAGS_MAINT_APPEND += -DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
 
 %:
 	dh $@ --buildsystem=cmake
@@ -22,6 +24,9 @@ override_dh_install-arch:
 override_dh_auto_install-indep:
 	echo "I: Do not install anything on arch:indep binary"
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vsimde:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W "libsimde-dev")"
+
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	scripts/test-plast.sh



View it on GitLab: https://salsa.debian.org/med-team/plast/-/compare/db43c784bc23883070b1f64de62e24f2db89f356...a2e06f5d4fe39325fdbec6239b69ebf9d386ca36

-- 
View it on GitLab: https://salsa.debian.org/med-team/plast/-/compare/db43c784bc23883070b1f64de62e24f2db89f356...a2e06f5d4fe39325fdbec6239b69ebf9d386ca36
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201205/9f3acd18/attachment-0001.html>