[med-svn] [libmuscle] 01/04: Take over patches from parsnp to avoid internal copy there

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libmuscle.

commit ef790b4304f12e9839a9a4e60b3f15ef17385873
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 20 09:10:45 2016 +0200

    Take over patches from parsnp to avoid internal copy there
---
 debian/changelog                    |  6 ++++++
 debian/patches/parsnp_changes.patch | 40 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5f7cd06..d901ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libmuscle (3.7+4565-2) UNRELEASED; urgency=medium
+
+  * Take over patches from parsnp to avoid internal copy there
+
+ -- Andreas Tille <tille at debian.org>  Wed, 20 Apr 2016 09:07:57 +0200
+
 libmuscle (3.7+4565-1) unstable; urgency=medium
 
   * Initial release (Closes: #782968)
diff --git a/debian/patches/parsnp_changes.patch b/debian/patches/parsnp_changes.patch
new file mode 100644
index 0000000..7c2e6df
--- /dev/null
+++ b/debian/patches/parsnp_changes.patch
@@ -0,0 +1,40 @@
+Description: Take over patches from parsnp to avoid internal copy there
+ The package parsnp
+   https://anonscm.debian.org/git/debian-med/parsnp.git
+ contained a code copy of libMUSCLE with the only relevant changes
+ that are gathered in this patch.  Since these enhancements seem to
+ be valuable in general these are taken over here.
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 20 Apr 2016 09:07:57 +0200
+
+--- a/libMUSCLE/Makefile.am
++++ b/libMUSCLE/Makefile.am
+@@ -1,5 +1,5 @@
+ OPTIMIZATION = -O2 -funroll-loops -fomit-frame-pointer -ftree-vectorize 
+-AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@
++AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@ -fopenmp
+ AM_LDFLAGS = $(OPTIMIZATION)
+ 
+ LIBMUSCLE_H = \
+--- a/libMUSCLE/params.cpp
++++ b/libMUSCLE/params.cpp
+@@ -114,7 +114,7 @@ TLS<bool> g_bPHYS(false);
+ //TLS<int> g_scoreGapExtend(0);
+ TLS<unsigned> g_uMaxIters(8);
+ TLS<unsigned long> g_ulMaxSecs(0);
+-TLS<unsigned> g_uMaxMB(500);
++TLS<unsigned> g_uMaxMB(16000);
+ 
+ TLS<PPSCORE> g_PPScore(PPSCORE_LE);
+ TLS<OBJSCORE> g_ObjScore(OBJSCORE_SPM);
+--- a/libMUSCLE/threadstorage.h
++++ b/libMUSCLE/threadstorage.h
+@@ -9,7 +9,7 @@
+ //
+ 
+ #ifdef _OPENMP
+-#define MAX_THREAD_COUNT	16
++#define MAX_THREAD_COUNT	64
+ #define OMP_GET_THREAD_NUM	omp_get_thread_num()
+ #include <omp.h>
+ #else
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..45ba6a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+parsnp_changes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libmuscle.git