[superlu-dist] 01/05: Activate "Parmetis" support via Scotch emulation

[Drew Parsons]

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

dparsons pushed a commit to tag debian/5.2.2+dfsg1-3
in repository superlu-dist.

commit fc34ebd216b235a36304ea79a9bd8ae2edf89f19
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Nov 17 01:35:52 2017 +0800

    Activate "Parmetis" support via Scotch emulation
    
    Build-Depends:
           libscotchparmetis-dev | libparmetis-dev,
           libscotchmetis-dev | libmetis-dev
    
    (allows for users to rebuild against true Parmetis)
---
 debian/changelog                      |  7 ++++
 debian/control                        |  4 +-
 debian/patches/parmetis_null_op.patch | 70 -----------------------------------
 debian/patches/series                 |  1 -
 debian/rules                          |  6 ++-
 5 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 763fd6c..cfd168b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+superlu-dist (5.2.2+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Activate "Parmetis" support via Scotch emulation.
+
+ -- Drew Parsons <dparsons at debian.org>  Fri, 17 Nov 2017 01:33:07 +0800
+
 superlu-dist (5.2.2+dfsg1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 123bdc4..dc5e2fd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,9 @@ Build-Depends: debhelper (>= 10),
 	cmake (>= 2.8.12),
 	mpi-default-dev,
 	gfortran,
-	libblas-dev | libopenblas-dev | libatlas-base-dev | libblas.so
+	libblas-dev | libopenblas-dev | libatlas-base-dev | libblas.so,
+	libscotchparmetis-dev | libparmetis-dev,
+	libscotchmetis-dev | libmetis-dev
 Standards-Version: 4.1.1
 Section: libs
 Homepage: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/#superlu_dist
diff --git a/debian/patches/parmetis_null_op.patch b/debian/patches/parmetis_null_op.patch
deleted file mode 100644
index 8266d72..0000000
--- a/debian/patches/parmetis_null_op.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-superlu-dist still attempts to build against parmetis even if it is
-disabled.  This patch provides a null-op alternative if HAS_PARMETIS
-is not defined.
-Index: superlu-dist/SRC/get_perm_c_parmetis.c
-===================================================================
---- superlu-dist.orig/SRC/get_perm_c_parmetis.c
-+++ superlu-dist/SRC/get_perm_c_parmetis.c
-@@ -24,9 +24,11 @@ at the top-level directory.
- /* limits.h:  the largest positive integer (INT_MAX) */
- #include <limits.h>
- #include <math.h>
--#include "parmetis.h"
- #include "superlu_ddefs.h"
- 
-+#ifdef HAS_PARMETIS
-+#include "parmetis.h"
-+
- /*
-  * Internal protypes
-  */
-@@ -918,3 +920,17 @@ a_plus_at_CompRow_loc
- } /* a_plus_at_CompRow_loc */
- 
- 
-+#else
-+
-+float
-+get_perm_c_parmetis (SuperMatrix *A, int_t *perm_r, int_t *perm_c,
-+		     int nprocs_i, int noDomains,
-+		     int_t **sizes, int_t **fstVtxSep,
-+		     gridinfo_t *grid, MPI_Comm *metis_comm)
-+
-+{
-+  ABORT("parmetis is not supported in this build of SuperLU-dist");
-+  return 0;
-+}
-+
-+#endif
-Index: superlu-dist/SRC/get_perm_c.c
-===================================================================
---- superlu-dist.orig/SRC/get_perm_c.c
-+++ superlu-dist/SRC/get_perm_c.c
-@@ -25,6 +25,7 @@ at the top-level directory.
- #include "superlu_ddefs.h"
- #include "colamd.h"
- 
-+#ifdef HAS_METIS
- 
- void
- get_metis(
-@@ -102,6 +103,19 @@ get_metis(
- #endif
-     SUPERLU_FREE(perm);
- }
-+#else
-+void
-+get_metis(
-+	  int_t n,         /* dimension of matrix B */
-+	  int_t bnz,       /* number of nonzeros in matrix A. */
-+	  int_t *b_colptr, /* column pointer of size n+1 for matrix B. */
-+	  int_t *b_rowind, /* row indices of size bnz for matrix B. */
-+	  int_t *perm_c    /* out - the column permutation vector. */
-+	  )
-+{
-+    ABORT("Metis is not supported in this build of SuperLU-Dist. Sorry.");
-+}
-+#endif
- 
- void
- get_colamd_dist(
diff --git a/debian/patches/series b/debian/patches/series
index 6456dbb..7e9220a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 mc64ad_dist-stub.patch
-parmetis_null_op.patch
diff --git a/debian/rules b/debian/rules
index 856296f..ab1fc8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,10 +29,12 @@ export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON \
-	    -Denable_parmetislib=OFF \
 	    -DCMAKE_C_COMPILER=mpicc -DCMAKE_FORTRAN_COMPILER=mpifort \
-	    -Denable_blaslib=OFF -DTPL_BLAS_LIBRARIES=/usr/lib/$(DEB_HOST_MULTIARCH)/libblas.so \
 	    -DCMAKE_INSTALL_INCLUDEDIR=include/superlu-dist \
+	    -Denable_blaslib=OFF -DTPL_BLAS_LIBRARIES=/usr/lib/$(DEB_HOST_MULTIARCH)/libblas.so \
+	    -Denable_parmetislib=ON \
+	    -DTPL_PARMETIS_INCLUDE_DIRS="/usr/include/scotch;/usr/include/parmetis;/usr/include/metis" \
+	    -DTPL_PARMETIS_LIBRARIES="/usr/lib/$(DEB_HOST_MULTIARCH)/libparmetis.so;/usr/lib/$(DEB_HOST_MULTIARCH)/libmetis.so" \
 	  || /bin/true
 
 

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