[scalapack] 02/05: add PBLAS tests (including timing) to scalapack-mpi-test

Tue Aug 8 02:02:33 UTC 2017

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

dparsons pushed a commit to tag experimental/2.0.2-1exp6
in repository scalapack.

commit b41ac0d9eba9993fb6acd6023d265da584ce381c
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Aug 8 01:19:00 2017 +0800

    add PBLAS tests (including timing) to scalapack-mpi-test
---
 debian/changelog                        |  1 +
 debian/control                          |  2 +-
 debian/rules                            |  2 +-
 debian/scalapack-mpi-test.README.Debian |  3 ++-
 debian/scalapack-mpi-test.dirs          |  3 ++-
 debian/scalapack-mpi-test.install       |  8 ++++++--
 debian/scalapack-mpi-test.links         | 15 +++++++++++++--
 debian/scalapack-test-common.dirs       |  4 +++-
 debian/scalapack-test-common.install    |  4 +++-
 9 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d47fb12..300296b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ scalapack (2.0.2-1exp6) UNRELEASED; urgency=medium
   * dh_auto_test: use tee to throw test output to stdout as well as
     dh_auto_test.log. Avoids buildd timeout on slower arches like
     powerpc.
+  * add PBLAS tests (including timing) to scalapack-mpi-test
 
  -- Drew Parsons <dparsons at debian.org>  Mon, 07 Aug 2017 16:04:14 +0800
 
diff --git a/debian/control b/debian/control
index 3246e02..1d23aa0 100644
--- a/debian/control
+++ b/debian/control
@@ -136,7 +136,7 @@ Description: Scalable Linear Algebra Package - Test files for MPI
     - PBLAS, Parallel Basic Linear Algebra Subprograms
     - BLACS, Basic Linear Algebra Communication Subprograms
  .
- This package contains ScaLAPACK and BLACS test programs.
+ This package contains ScaLAPACK, PBLAS and BLACS test programs.
 
 Package: scalapack-test-common
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 678b05a..3a17aca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ override_dh_install-arch:
 	dh_missing --list-missing
 	# test executables contain RUNPATH. Remove it.
 	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/x*
-	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/blacs/x*
+	chrpath -d debian/scalapack-mpi-test/usr/lib/$(DEB_HOST_MULTIARCH)/scalapack/*-tests/BLACS/x*
 
 # add --max-parallel=1 to force test in sequential mode
 # MPICH testsuite disabled as some tests fail -- why???
diff --git a/debian/scalapack-mpi-test.README.Debian b/debian/scalapack-mpi-test.README.Debian
index 231172a..dbaff98 100755
--- a/debian/scalapack-mpi-test.README.Debian
+++ b/debian/scalapack-mpi-test.README.Debian
@@ -1,7 +1,8 @@
 Test executables for scalapack are provided in /usr/lib/<arch>/scalapack, 
 for both openmpi and mpich versions.
 
-Test executables for BLACS are provided in the blacs subdirectory.
+Test executables for PBLAS and BLACS are provided in the PBLAS and 
+BLACS subdirectories.
 
 These tests are most conveniently launched by running cmake's ctest in the 
 directory containing the executables (and CTestTestfile.cmake). Copy the 
diff --git a/debian/scalapack-mpi-test.dirs b/debian/scalapack-mpi-test.dirs
index 57e257a..e637041 100755
--- a/debian/scalapack-mpi-test.dirs
+++ b/debian/scalapack-mpi-test.dirs
@@ -1,4 +1,5 @@
 #! /bin/sh
 for flavour in openmpi mpich; do
-  echo usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/blacs
+  echo usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS
+  echo usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/TIMING
 done
\ No newline at end of file
diff --git a/debian/scalapack-mpi-test.install b/debian/scalapack-mpi-test.install
index 21007a4..22c3886 100755
--- a/debian/scalapack-mpi-test.install
+++ b/debian/scalapack-mpi-test.install
@@ -2,6 +2,10 @@
 for flavour in openmpi mpich; do
   echo build-${flavour}/TESTING/x* usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests
   echo build-${flavour}/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests
-  echo build-${flavour}/BLACS/TESTING/x* usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/blacs
-  echo build-${flavour}/BLACS/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/blacs
+  echo build-${flavour}/BLACS/TESTING/x* usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS
+  echo build-${flavour}/BLACS/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS
+  echo build-${flavour}/PBLAS/TESTING/*tst usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS
+  echo build-${flavour}/PBLAS/TESTING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS
+  echo build-${flavour}/PBLAS/TIMING/*tim usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/TIMING
+  echo build-${flavour}/PBLAS/TIMING/CTestTestfile.cmake usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/TIMING
 done
diff --git a/debian/scalapack-mpi-test.links b/debian/scalapack-mpi-test.links
index b1a3c39..35f798d 100755
--- a/debian/scalapack-mpi-test.links
+++ b/debian/scalapack-mpi-test.links
@@ -1,5 +1,4 @@
 #! /bin/sh
-
 for d in TESTING/*.dat; do
   datafile=`basename $d`
   for flavour in openmpi mpich; do
@@ -9,6 +8,18 @@ done
 for d in BLACS/TESTING/*.dat; do
   datafile=`basename $d`
   for flavour in openmpi mpich; do
-    echo usr/share/scalapack/blacs/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/blacs/${datafile}
+    echo usr/share/scalapack/BLACS/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/BLACS/${datafile}
+  done
+done
+for d in PBLAS/TESTING/*.dat; do
+  datafile=`basename $d`
+  for flavour in openmpi mpich; do
+    echo usr/share/scalapack/PBLAS/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/${datafile}
+  done
+done
+for d in PBLAS/TIMING/*.dat; do
+  datafile=`basename $d`
+  for flavour in openmpi mpich; do
+    echo usr/share/scalapack/PBLAS/TIMING/${datafile} usr/lib/${DEB_HOST_MULTIARCH}/scalapack/${flavour}-tests/PBLAS/TIMING/${datafile}
   done
 done
diff --git a/debian/scalapack-test-common.dirs b/debian/scalapack-test-common.dirs
index 2f94d39..aad1aa0 100644
--- a/debian/scalapack-test-common.dirs
+++ b/debian/scalapack-test-common.dirs
@@ -1,2 +1,4 @@
 usr/share/scalapack
-usr/share/scalapack/blacs
+usr/share/scalapack/BLACS
+usr/share/scalapack/PBLAS
+usr/share/scalapack/PBLAS/TIMING
diff --git a/debian/scalapack-test-common.install b/debian/scalapack-test-common.install
index beb19a7..61de929 100644
--- a/debian/scalapack-test-common.install
+++ b/debian/scalapack-test-common.install
@@ -1,2 +1,4 @@
 TESTING/*.dat usr/share/scalapack
-BLACS/TESTING/*.dat usr/share/scalapack/blacs
+BLACS/TESTING/*.dat usr/share/scalapack/BLACS
+PBLAS/TESTING/*.dat usr/share/scalapack/PBLAS
+PBLAS/TIMING/*.dat usr/share/scalapack/PBLAS/TIMING

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

