[sundials] 09/09: turned on optional features

Dima Kogan dima at secretsauce.net
Sat Feb 11 03:39:56 UTC 2017


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

dkogan pushed a commit to branch master_optional_stuff_enabled
in repository sundials.

commit 26d465d9dff18866d0fe5a4ffa942e49771ef7e5
Author: Dima Kogan <dima at secretsauce.net>
Date:   Fri Feb 10 19:39:37 2017 -0800

    turned on optional features
---
 debian/control                     |  3 ++-
 debian/libsundials-arkode1.symbols |  6 ++++++
 debian/libsundials-cvode2.symbols  |  3 +++
 debian/libsundials-cvodes2.symbols |  6 ++++++
 debian/libsundials-ida2.symbols    |  3 +++
 debian/libsundials-idas1.symbols   |  6 ++++++
 debian/libsundials-kinsol2.symbols |  3 +++
 debian/rules                       | 23 +++++++++++++++++++----
 8 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 31fb174..8c19d7b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 10),
                gfortran,
                mpi-default-dev,
                libblas-dev | libblas-3gf.so,
-               liblapack-dev | liblapack-3gf.so
+               liblapack-dev | liblapack-3gf.so,
+               libpetsc3.7.5-dev, libsuitesparse-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/sundials.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/sundials.git
diff --git a/debian/libsundials-arkode1.symbols b/debian/libsundials-arkode1.symbols
index 717deef..aa80910 100644
--- a/debian/libsundials-arkode1.symbols
+++ b/debian/libsundials-arkode1.symbols
@@ -20,10 +20,16 @@ libsundials_arkode.so.1 libsundials-arkode1 #MINVER#
  ARKDlsSetBandMassFn at Base 2.7.0+dfsg-1
  ARKDlsSetDenseJacFn at Base 2.7.0+dfsg-1
  ARKDlsSetDenseMassFn at Base 2.7.0+dfsg-1
+ ARKKLU at Base 2.7.0+dfsg-1
+ ARKKLUReInit at Base 2.7.0+dfsg-1
+ ARKKLUSetOrdering at Base 2.7.0+dfsg-1
  ARKLapackBand at Base 2.7.0+dfsg-1
  ARKLapackDense at Base 2.7.0+dfsg-1
  ARKMassBand at Base 2.7.0+dfsg-1
  ARKMassDense at Base 2.7.0+dfsg-1
+ ARKMassKLU at Base 2.7.0+dfsg-1
+ ARKMassKLUReInit at Base 2.7.0+dfsg-1
+ ARKMassKLUSetOrdering at Base 2.7.0+dfsg-1
  ARKMassLapackBand at Base 2.7.0+dfsg-1
  ARKMassLapackDense at Base 2.7.0+dfsg-1
  ARKMassPcg at Base 2.7.0+dfsg-1
diff --git a/debian/libsundials-cvode2.symbols b/debian/libsundials-cvode2.symbols
index 5945d68..3ff71e6 100644
--- a/debian/libsundials-cvode2.symbols
+++ b/debian/libsundials-cvode2.symbols
@@ -26,6 +26,9 @@ libsundials_cvode.so.2 libsundials-cvode2 #MINVER#
  CVDlsGetWorkSpace at Base 2.7.0+dfsg-1
  CVDlsSetBandJacFn at Base 2.7.0+dfsg-1
  CVDlsSetDenseJacFn at Base 2.7.0+dfsg-1
+ CVKLU at Base 2.7.0+dfsg-1
+ CVKLUReInit at Base 2.7.0+dfsg-1
+ CVKLUSetOrdering at Base 2.7.0+dfsg-1
  CVLapackBand at Base 2.7.0+dfsg-1
  CVLapackDense at Base 2.7.0+dfsg-1
  CVSlsGetLastFlag at Base 2.7.0+dfsg-1
diff --git a/debian/libsundials-cvodes2.symbols b/debian/libsundials-cvodes2.symbols
index e6214a8..ca8712d 100644
--- a/debian/libsundials-cvodes2.symbols
+++ b/debian/libsundials-cvodes2.symbols
@@ -36,6 +36,12 @@ libsundials_cvodes.so.2 libsundials-cvodes2 #MINVER#
  CVDlsSetDenseJacFn at Base 2.7.0+dfsg-1
  CVDlsSetDenseJacFnB at Base 2.7.0+dfsg-1
  CVDlsSetDenseJacFnBS at Base 2.7.0+dfsg-1
+ CVKLU at Base 2.7.0+dfsg-1
+ CVKLUB at Base 2.7.0+dfsg-1
+ CVKLUReInit at Base 2.7.0+dfsg-1
+ CVKLUReInitB at Base 2.7.0+dfsg-1
+ CVKLUSetOrdering at Base 2.7.0+dfsg-1
+ CVKLUSetOrderingB at Base 2.7.0+dfsg-1
  CVLapackBand at Base 2.7.0+dfsg-1
  CVLapackBandB at Base 2.7.0+dfsg-1
  CVLapackDense at Base 2.7.0+dfsg-1
diff --git a/debian/libsundials-ida2.symbols b/debian/libsundials-ida2.symbols
index 1541c83..276fb06 100644
--- a/debian/libsundials-ida2.symbols
+++ b/debian/libsundials-ida2.symbols
@@ -62,6 +62,9 @@ libsundials_ida.so.2 libsundials-ida2 #MINVER#
  IDAGetWorkSpace at Base 2.7.0+dfsg-1
  IDAInit at Base 2.7.0+dfsg-1
  IDAInitialSetup at Base 2.7.0+dfsg-1
+ IDAKLU at Base 2.7.0+dfsg-1
+ IDAKLUReInit at Base 2.7.0+dfsg-1
+ IDAKLUSetOrdering at Base 2.7.0+dfsg-1
  IDALapackBand at Base 2.7.0+dfsg-1
  IDALapackDense at Base 2.7.0+dfsg-1
  IDAProcessError at Base 2.7.0+dfsg-1
diff --git a/debian/libsundials-idas1.symbols b/debian/libsundials-idas1.symbols
index 5eec705..cef5a79 100644
--- a/debian/libsundials-idas1.symbols
+++ b/debian/libsundials-idas1.symbols
@@ -116,6 +116,12 @@ libsundials_idas.so.1 libsundials-idas1 #MINVER#
  IDAInitB at Base 2.7.0+dfsg-1
  IDAInitBS at Base 2.7.0+dfsg-1
  IDAInitialSetup at Base 2.7.0+dfsg-1
+ IDAKLU at Base 2.7.0+dfsg-1
+ IDAKLUB at Base 2.7.0+dfsg-1
+ IDAKLUReInit at Base 2.7.0+dfsg-1
+ IDAKLUReInitB at Base 2.7.0+dfsg-1
+ IDAKLUSetOrdering at Base 2.7.0+dfsg-1
+ IDAKLUSetOrderingB at Base 2.7.0+dfsg-1
  IDALapackBand at Base 2.7.0+dfsg-1
  IDALapackBandB at Base 2.7.0+dfsg-1
  IDALapackDense at Base 2.7.0+dfsg-1
diff --git a/debian/libsundials-kinsol2.symbols b/debian/libsundials-kinsol2.symbols
index 761dabb..2604c28 100644
--- a/debian/libsundials-kinsol2.symbols
+++ b/debian/libsundials-kinsol2.symbols
@@ -42,6 +42,9 @@ libsundials_kinsol.so.2 libsundials-kinsol2 #MINVER#
  KINGetWorkSpace at Base 2.7.0+dfsg-1
  KINInfoHandler at Base 2.7.0+dfsg-1
  KINInit at Base 2.7.0+dfsg-1
+ KINKLU at Base 2.7.0+dfsg-1
+ KINKLUReInit at Base 2.7.0+dfsg-1
+ KINKLUSetOrdering at Base 2.7.0+dfsg-1
  KINLapackBand at Base 2.7.0+dfsg-1
  KINLapackDense at Base 2.7.0+dfsg-1
  KINPrintInfo at Base 2.7.0+dfsg-1
diff --git a/debian/rules b/debian/rules
index 0a1ef9e..9ea75e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,14 @@
 #workaround to start MPI-applications in chroot
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+# PETSc include directory: I ask pkg-config about all the cflags I need, then
+# look through all the include directories it gives me, and report the one that
+# has petsc.h
+PETSC_INCLUDE_DIR := $(patsubst %/petsc.h,%,$(wildcard $(addsuffix /petsc.h,$(patsubst -I%,%,$(filter -I%,$(shell pkg-config --cflags PETSc))))))
+$(if $(PETSC_INCLUDE_DIR),,$(error Could not find PETSc include directory))
+
 extra_flags +=						\
    -DCMAKE_Fortran_COMPILER=gfortran			\
    -DBUILD_SHARED_LIBS:BOOL=ON				\
@@ -14,10 +22,17 @@ extra_flags +=						\
    -DEXAMPLES_ENABLE:BOOL=ON				\
    -DEXAMPLES_INSTALL:BOOL=OFF				\
 							\
-   -DOPENMP_ENABLE:BOOL=OFF				\
-   -DPTHREAD_ENABLE:BOOL=OFF				\
-   -DKLU_ENABLE:BOOL=OFF				\
-   -DPETSC_ENABLE:BOOL=OFF				\
+   -DOPENMP_ENABLE:BOOL=ON				\
+   -DPTHREAD_ENABLE:BOOL=ON				\
+                                                        \
+   -DKLU_ENABLE:BOOL=ON					\
+   -DKLU_INCLUDE_DIR=/usr/include/suitesparse		\
+   -DKLU_LIBRARY_DIR=/usr/lib/$(DEB_HOST_GNU_TYPE)	\
+                                                        \
+   -DPETSC_ENABLE:BOOL=ON				\
+   -DPETSC_INCLUDE_DIR=$(PETSC_INCLUDE_DIR)		\
+   -DPETSC_LIBRARY_DIR=/usr/lib/$(DEB_HOST_GNU_TYPE)	\
+                                                        \
    -DSUPERLUMT_ENABLE:BOOL=OFF				\
    -DHYPRE_ENABLE:BOOL=OFF
 

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



More information about the debian-science-commits mailing list