[petsc] 02/02: create patch superlu-dist_no-parmetis.patch

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository petsc.

commit 47c2694a85ad0e3c263912fbcbb088ea74469cab
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Nov 16 01:12:10 2017 +0800

    create patch superlu-dist_no-parmetis.patch
    
    to disconnect SuperLU-Dist from parmetis (which is not available,
    non-free)
---
 debian/changelog                              |  2 ++
 debian/patches/series                         |  1 +
 debian/patches/superlu-dist_no-parmetis.patch | 43 +++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6499fe6..0daa19a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ petsc (3.8.0+dfsg1-1exp2) UNRELEASED; urgency=medium
   * List optimised OpenBLAS and ATLAS as Build-Dep alternatives for
     BLAS and LAPACK.
   * Activate support for SuperLU-Dist.
+    - patch superlu-dist_no-parmetis.patch disconnects SuperLU-Dist
+      from parmetis (which is not available, non-free)
 
  -- Drew Parsons <dparsons at debian.org>  Wed, 15 Nov 2017 15:29:02 +0800
 
diff --git a/debian/patches/series b/debian/patches/series
index f9b49f3..bca4bab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ python_header
 soname_extension
 hurd.patch
 test_mpi_conditional_bug816101
+superlu-dist_no-parmetis.patch
diff --git a/debian/patches/superlu-dist_no-parmetis.patch b/debian/patches/superlu-dist_no-parmetis.patch
new file mode 100644
index 0000000..5cf5b0a
--- /dev/null
+++ b/debian/patches/superlu-dist_no-parmetis.patch
@@ -0,0 +1,43 @@
+Parmetis (non-free) is not included in Debian, so allow for
+SuperLU-Dist without it.Index: petsc/config/BuildSystem/config/packages/SuperLU_DIST.py
+===================================================================
+Index: petsc/config/BuildSystem/config/packages/SuperLU_DIST.py
+===================================================================
+--- petsc.orig/config/BuildSystem/config/packages/SuperLU_DIST.py
++++ petsc/config/BuildSystem/config/packages/SuperLU_DIST.py
+@@ -27,15 +27,15 @@ class Configure(config.package.CMakePack
+   def setupDependencies(self, framework):
+     config.package.CMakePackage.setupDependencies(self, framework)
+     self.blasLapack     = framework.require('config.packages.BlasLapack',self)
+-    self.metis          = framework.require('config.packages.metis',self)
+-    self.parmetis       = framework.require('config.packages.parmetis',self)
+     self.mpi            = framework.require('config.packages.MPI',self)
+     if self.framework.argDB['download-superlu_dist-gpu']:
+       self.cuda           = framework.require('config.packages.cuda',self)
+       self.openmp         = framework.require('config.packages.openmp',self)
++      self.metis          = framework.require('config.packages.metis',self)
++      self.parmetis       = framework.require('config.packages.parmetis',self)
+       self.deps           = [self.mpi,self.blasLapack,self.parmetis,self.metis,self.cuda,self.openmp]
+     else:
+-      self.deps           = [self.mpi,self.blasLapack,self.parmetis,self.metis]
++      self.deps           = [self.mpi,self.blasLapack]
+     return
+ 
+   def formCMakeConfigureArgs(self):
+@@ -43,11 +43,12 @@ class Configure(config.package.CMakePack
+     if not self.framework.argDB['download-superlu_dist-gpu']:
+       args.append('-DCMAKE_DISABLE_FIND_PACKAGE_OpenMP=TRUE')
+     args.append('-DUSE_XSDK_DEFAULTS=YES')
+-    metis_inc = self.headers.toStringNoDupes(self.metis.include)[2:]
+-    parmetis_inc = self.headers.toStringNoDupes(self.parmetis.include)[2:]
+     args.append('-DTPL_BLAS_LIBRARIES="'+self.libraries.toString(self.blasLapack.dlib)+'"')
+-    args.append('-DTPL_PARMETIS_INCLUDE_DIRS="'+metis_inc+';'+parmetis_inc+'"')
+-    args.append('-DTPL_PARMETIS_LIBRARIES="'+self.libraries.toString(self.parmetis.lib+self.metis.lib)+'"')
++    if self.parmetis:
++      metis_inc = self.headers.toStringNoDupes(self.metis.include)[2:]
++      parmetis_inc = self.headers.toStringNoDupes(self.parmetis.include)[2:]
++      args.append('-DTPL_PARMETIS_INCLUDE_DIRS="'+metis_inc+';'+parmetis_inc+'"')
++      args.append('-DTPL_PARMETIS_LIBRARIES="'+self.libraries.toString(self.parmetis.lib+self.metis.lib)+'"')
+ 
+     if self.getDefaultIndexSize() == 64:
+       args.append('-DXSDK_INDEX_SIZE=64')

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