[med-svn] r18112 - in trunk/packages/raxml/trunk/debian: . bin

[Andreas Tille]

Author: tille
Date: 2014-09-24 10:14:26 +0000 (Wed, 24 Sep 2014)
New Revision: 18112

Modified:
   trunk/packages/raxml/trunk/debian/bin/raxmlHPC
   trunk/packages/raxml/trunk/debian/changelog
   trunk/packages/raxml/trunk/debian/copyright
Log:
Command line option compatibility also for SSE3 (but no AVX support), Fix some DEP5 issues in d/copyright


Modified: trunk/packages/raxml/trunk/debian/bin/raxmlHPC
===================================================================
--- trunk/packages/raxml/trunk/debian/bin/raxmlHPC	2014-09-24 09:34:10 UTC (rev 18111)
+++ trunk/packages/raxml/trunk/debian/bin/raxmlHPC	2014-09-24 10:14:26 UTC (rev 18112)
@@ -1,12 +1,28 @@
 #!/bin/sh
 
 RAXMLDIR=`dirname $0`
+NPROCESSOR=`grep -c 'processor[[:space:]:]\+[0-9]\+' /proc/cpuinfo`
+NCPUS=`grep '^cpu cores' /proc/cpuinfo | head -n 1 | sed 's/cpu cores[[:space:]:]\+//'`
+# That's wrong and lasts way longer than when using NCPUS
+# AVX_T=$((NPROCESSOR * NCPUS))
+AVX_T=$NCPUS
+
 if grep -q avx /proc/cpuinfo; then
-    echo "Use raxml with AVX support"
-    ${RAXMLDIR}/raxmlHPC-PTHREADS-AVX "$@"
+    if echo "$@" | grep -q -- '-T[[:space:]]*[0-9]' ; then
+        echo "Use raxml with AVX support with overriden number of threads"
+        ${RAXMLDIR}/raxmlHPC-PTHREADS-AVX "$@"
+    else
+        echo "Use raxml with AVX support ($AVX_T cpus)"
+        ${RAXMLDIR}/raxmlHPC-PTHREADS-AVX -T $AVX_T "$@"
+    fi
 elif grep -q sse3 /proc/cpuinfo; then
-    echo "Use raxml with SSE3 support"
-    ${RAXMLDIR}/raxmlHPC-PTHREADS-SSE3 "$@"
+    if echo "$@" | grep -q -- '-T[[:space:]]*[0-9]' ; then
+        echo "Use raxml with SSE3 support with overriden number of threads"
+        ${RAXMLDIR}/raxmlHPC-PTHREADS-SSE3 "$@"
+    else
+        echo "Use raxml with SSE3 support ($AVX_T cpus)"
+        ${RAXMLDIR}/raxmlHPC-PTHREADS-SSE3 -T $AVX_T "$@"
+    fi
 else
     echo "Use raxml with PTHREADS support"
     ${RAXMLDIR}/raxmlHPC-PTHREADS "$@"

Modified: trunk/packages/raxml/trunk/debian/changelog
===================================================================
--- trunk/packages/raxml/trunk/debian/changelog	2014-09-24 09:34:10 UTC (rev 18111)
+++ trunk/packages/raxml/trunk/debian/changelog	2014-09-24 10:14:26 UTC (rev 18112)
@@ -1,3 +1,17 @@
+raxml (8.1.1-3) unstable; urgency=medium
+
+  * Command line option compatibility also for SSE3 (but no AVX support)
+  * Fix some DEP5 issues in d/copyright
+
+ -- Andreas Tille <tille at debian.org>  Wed, 24 Sep 2014 11:27:40 +0200
+
+raxml (8.1.1-2) unstable; urgency=medium
+
+  * Make sure the command line option compatibility can be saved even if
+    AVX support needs specification of number of threads
+
+ -- Andreas Tille <tille at debian.org>  Mon, 01 Sep 2014 16:54:23 +0200
+
 raxml (8.1.1-1) unstable; urgency=medium
 
   * New upstream version

Modified: trunk/packages/raxml/trunk/debian/copyright
===================================================================
--- trunk/packages/raxml/trunk/debian/copyright	2014-09-24 09:34:10 UTC (rev 18111)
+++ trunk/packages/raxml/trunk/debian/copyright	2014-09-24 10:14:26 UTC (rev 18112)
@@ -5,15 +5,12 @@
 Files-Excluded: *.exe
                 *.dll
 
-Files: dmtcpaware.h
-Copyright: © 2009 Jason Ansel, Kapil Arya, and Gene Cooperman
-License: PD
-  This file, dmtcpaware.h, is placed in the public domain.
-  The motivation for this is to allow anybody to freely use this file
-  without restriction to statically link this file with any software.
+Files: *
+Copyright: © 2006-2014 Alexandros Stamatakis
+License: GPL-2+
 
 Files: debian/*
-Copyright: © 2011 Andreas Tille <tille at debian.org>
+Copyright: © 2011-2014 Andreas Tille <tille at debian.org>
 License: GPL-2+
 
 License: GPL-2+