[sundials] 02/06: Initial split for all the different parallel types; common -dev

Dima Kogan dima at secretsauce.net
Mon Apr 3 02:44:37 UTC 2017


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

dkogan pushed a commit to branch master
in repository sundials.

commit c00dbdd993aef3d784d860042c517892ffc2ab09
Author: Dima Kogan <dima at secretsauce.net>
Date:   Sun Apr 2 19:16:20 2017 -0700

    Initial split for all the different parallel types; common -dev
    
    This isn't yet done. All the debian/control descriptions and dependencies need
    to be set.
    
    This patch combines ALL the -dev stuff into a single package. This possibly
    should be done differently
---
 debian/control                                     | 77 +++++++++++++++-------
 debian/libsundials-dev.install                     | 12 ++++
 debian/libsundials-nvecparallel-dev.install        |  6 --
 debian/libsundials-nvecparallel-hypre2.install     |  1 +
 ...stall => libsundials-nvecparallel-mpi2.install} |  0
 debian/libsundials-nvecparallel-openmp2.install    |  2 +
 debian/libsundials-nvecparallel-petsc2.install     |  1 +
 debian/libsundials-nvecparallel-pthread2.install   |  2 +
 debian/libsundials-nvecparallel2.symbols           | 59 -----------------
 debian/libsundials-nvecserial-dev.install          | 14 ----
 10 files changed, 73 insertions(+), 101 deletions(-)

diff --git a/debian/control b/debian/control
index e27f1a1..78274b1 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,7 @@ Description: vector operations library (SUNDIALS library)
  .
  This package contains the serial version of the library.
 
-Package: libsundials-nvecparallel2
+Package: libsundials-nvecparallel-mpi2
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@@ -110,47 +110,79 @@ Description: MPI vector operations library (SUNDIALS library)
  .
  This package contains the parallel version of the library.
 
-Package: libsundials-nvecserial-dev
+Package: libsundials-nvecparallel-pthread2
 Architecture: any
 Multi-Arch: same
-Section: libdevel
-Depends: libsundials-nvecserial2 (= ${binary:Version}),
+Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libblas-dev | libatlas-base-dev | libopenblas-dev,
-         liblapack-dev | libatlas-base-dev
-Description: vector operations library (SUNDIALS development library)
+         mpi-default-run
+Description: MPI vector operations library (SUNDIALS library)
  This package provides implementations for all vector operations
  defined by the generic NVECTOR module in the table of operations for
  SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
  Solvers).
  .
- This package contains files necessary for development applications using
- SUNDIALS in C and, in case of FCVODE and FKINSOL, Fortran.
+ This package contains the parallel version of the library.
 
-Package: libsundials-nvecparallel-dev
+Package: libsundials-nvecparallel-openmp2
 Architecture: any
 Multi-Arch: same
-Section: libdevel
-Depends: libsundials-nvecparallel2 (= ${binary:Version}),
-         libsundials-nvecserial-dev,
-         ${misc:Depends}
-Description: MPI vector operations library (SUNDIALS development library)
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         mpi-default-run
+Description: MPI vector operations library (SUNDIALS library)
  This package provides implementations for all vector operations
  defined by the generic NVECTOR module in the table of operations for
  SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
  Solvers).
  .
- This package contains files necessary for development applications using
- SUNDIALS in C and, in case of FCVODE and FKINSOL, Fortran.
+ This package contains the parallel version of the library.
+
+Package: libsundials-nvecparallel-hypre2
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         mpi-default-run
+Description: MPI vector operations library (SUNDIALS library)
+ This package provides implementations for all vector operations
+ defined by the generic NVECTOR module in the table of operations for
+ SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
+ Solvers).
  .
- This package provides MPI version
+ This package contains the parallel version of the library.
+
+Package: libsundials-nvecparallel-petsc2
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         mpi-default-run
+Description: MPI vector operations library (SUNDIALS library)
+ This package provides implementations for all vector operations
+ defined by the generic NVECTOR module in the table of operations for
+ SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation
+ Solvers).
+ .
+ This package contains the parallel version of the library.
 
 Package: libsundials-dev
-Architecture: all
+Architecture: any
 Section: libdevel
-Depends: libsundials-nvecserial-dev, libsundials-nvecparallel-dev,
+Depends: libsundials-arkode1              (= ${binary:Version}),
+         libsundials-cvode2               (= ${binary:Version}),
+         libsundials-cvodes2              (= ${binary:Version}),
+         libsundials-ida2                 (= ${binary:Version}),
+         libsundials-idas1                (= ${binary:Version}),
+         libsundials-kinsol2              (= ${binary:Version}),
+         libsundials-nvecserial2          (= ${binary:Version}),
+         libsundials-nvecparallel-mpi2    (= ${binary:Version}),
+         libsundials-nvecparallel-pthread2(= ${binary:Version}),
+         libsundials-nvecparallel-openmp2 (= ${binary:Version}),
+         libsundials-nvecparallel-hypre2  (= ${binary:Version}),
+         libsundials-nvecparallel-petsc2  (= ${binary:Version}),
          ${misc:Depends}
-Description: Meta-package for development using SUNDIALS
+Description: wrong. not meta. Meta-package for development using SUNDIALS
  This package all development files necessary to build applications using
  SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers).
 
@@ -165,4 +197,5 @@ Description: SUNDIALS examples files
  IDA (for differential-algebraic systems), and KINSOL (for nonlinear
  algebraic systems).
  .
- This package contains SUNDIALS examples.
+ is this the correct description? examples don't come with each individual
+ sublibrary? This package contains SUNDIALS examples.
diff --git a/debian/libsundials-dev.install b/debian/libsundials-dev.install
new file mode 100644
index 0000000..44c3e32
--- /dev/null
+++ b/debian/libsundials-dev.install
@@ -0,0 +1,12 @@
+usr/include/*
+
+usr/lib/*/*.a
+usr/lib/*/*.so
+
+# usr/include/arkode
+# usr/include/cvode
+# usr/include/cvodes
+# usr/include/ida
+# usr/include/idas
+# usr/include/kinsol
+# usr/include/sundials
diff --git a/debian/libsundials-nvecparallel-dev.install b/debian/libsundials-nvecparallel-dev.install
deleted file mode 100644
index 638bc0c..0000000
--- a/debian/libsundials-nvecparallel-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/*/libsundials_nvecparallel.a
-usr/lib/*/libsundials_fnvecparallel.a
-usr/lib/*/libsundials_nvecparallel.so
-usr/lib/*/libsundials_fnvecparallel.so
-
-usr/include/nvector/nvector_parallel.h
diff --git a/debian/libsundials-nvecparallel-hypre2.install b/debian/libsundials-nvecparallel-hypre2.install
new file mode 100644
index 0000000..7027c61
--- /dev/null
+++ b/debian/libsundials-nvecparallel-hypre2.install
@@ -0,0 +1 @@
+usr/lib/*/libsundials_nvecparhyp.so.*
diff --git a/debian/libsundials-nvecparallel2.install b/debian/libsundials-nvecparallel-mpi2.install
similarity index 100%
rename from debian/libsundials-nvecparallel2.install
rename to debian/libsundials-nvecparallel-mpi2.install
diff --git a/debian/libsundials-nvecparallel-openmp2.install b/debian/libsundials-nvecparallel-openmp2.install
new file mode 100644
index 0000000..77a147f
--- /dev/null
+++ b/debian/libsundials-nvecparallel-openmp2.install
@@ -0,0 +1,2 @@
+usr/lib/*/libsundials_nvecopenmp.so.*
+usr/lib/*/libsundials_fnvecopenmp.so.*
diff --git a/debian/libsundials-nvecparallel-petsc2.install b/debian/libsundials-nvecparallel-petsc2.install
new file mode 100644
index 0000000..d929702
--- /dev/null
+++ b/debian/libsundials-nvecparallel-petsc2.install
@@ -0,0 +1 @@
+usr/lib/*/libsundials_nvecpetsc.so.*
diff --git a/debian/libsundials-nvecparallel-pthread2.install b/debian/libsundials-nvecparallel-pthread2.install
new file mode 100644
index 0000000..a486d52
--- /dev/null
+++ b/debian/libsundials-nvecparallel-pthread2.install
@@ -0,0 +1,2 @@
+usr/lib/*/libsundials_nvecpthreads.so.*
+usr/lib/*/libsundials_fnvecpthreads.so.*
diff --git a/debian/libsundials-nvecparallel2.symbols b/debian/libsundials-nvecparallel2.symbols
deleted file mode 100644
index 50b2f5f..0000000
--- a/debian/libsundials-nvecparallel2.symbols
+++ /dev/null
@@ -1,59 +0,0 @@
-libsundials_fnvecparallel.so.2 libsundials-nvecparallel2 #MINVER#
- F2C_ARKODE_vec at Base 2.7.0+dfsg
- F2C_CVODE_vec at Base 2.7.0+dfsg
- F2C_CVODE_vecB at Base 2.7.0+dfsg
- F2C_CVODE_vecQ at Base 2.7.0+dfsg
- F2C_CVODE_vecQB at Base 2.7.0+dfsg
- F2C_CVODE_vecS at Base 2.7.0+dfsg
- F2C_IDA_vec at Base 2.7.0+dfsg
- F2C_IDA_vecB at Base 2.7.0+dfsg
- F2C_IDA_vecQ at Base 2.7.0+dfsg
- F2C_IDA_vecQB at Base 2.7.0+dfsg
- F2C_IDA_vecS at Base 2.7.0+dfsg
- F2C_KINSOL_vec at Base 2.7.0+dfsg
- fnvinitp_ at Base 2.7.0+dfsg
- fnvinitp_b_ at Base 2.7.0+dfsg
- fnvinitp_q_ at Base 2.7.0+dfsg
- fnvinitp_qb_ at Base 2.7.0+dfsg
- fnvinitp_s_ at Base 2.7.0+dfsg
-libsundials_nvecparallel.so.2 libsundials-nvecparallel2 #MINVER#
- N_VAbs_Parallel at Base 2.7.0+dfsg
- N_VAddConst_Parallel at Base 2.7.0+dfsg
- N_VCloneEmpty_Parallel at Base 2.7.0+dfsg
- N_VCloneVectorArrayEmpty_Parallel at Base 2.7.0+dfsg
- N_VCloneVectorArray_Parallel at Base 2.7.0+dfsg
- N_VClone_Parallel at Base 2.7.0+dfsg
- N_VCompare_Parallel at Base 2.7.0+dfsg
- N_VConst_Parallel at Base 2.7.0+dfsg
- N_VConstrMask_Parallel at Base 2.7.0+dfsg
- N_VDestroyVectorArray_Parallel at Base 2.7.0+dfsg
- N_VDestroy_Parallel at Base 2.7.0+dfsg
- N_VDiv_Parallel at Base 2.7.0+dfsg
- N_VDotProd_Parallel at Base 2.7.0+dfsg
- N_VGetArrayPointer_Parallel at Base 2.7.0+dfsg
- N_VGetLength_Parallel at Base 2.7.0+dfsg
- N_VGetLocalLength_Parallel at Base 2.7.0+dfsg
- N_VGetVectorID_Parallel at Base 2.7.0+dfsg
- N_VInvTest_Parallel at Base 2.7.0+dfsg
- N_VInv_Parallel at Base 2.7.0+dfsg
- N_VL1Norm_Parallel at Base 2.7.0+dfsg
- N_VLinearSum_Parallel at Base 2.7.0+dfsg
- N_VMake_Parallel at Base 2.7.0+dfsg
- N_VMaxNorm_Parallel at Base 2.7.0+dfsg
- N_VMinQuotient_Parallel at Base 2.7.0+dfsg
- N_VMin_Parallel at Base 2.7.0+dfsg
- N_VNewEmpty_Parallel at Base 2.7.0+dfsg
- N_VNew_Parallel at Base 2.7.0+dfsg
- N_VPrint_Parallel at Base 2.7.0+dfsg
- N_VProd_Parallel at Base 2.7.0+dfsg
- N_VScale_Parallel at Base 2.7.0+dfsg
- N_VSetArrayPointer_Parallel at Base 2.7.0+dfsg
- N_VSpace_Parallel at Base 2.7.0+dfsg
- N_VWL2Norm_Parallel at Base 2.7.0+dfsg
- N_VWrmsNormMask_Parallel at Base 2.7.0+dfsg
- N_VWrmsNorm_Parallel at Base 2.7.0+dfsg
- SUNRabs at Base 2.7.0+dfsg
- SUNRexp at Base 2.7.0+dfsg
- SUNRpowerI at Base 2.7.0+dfsg
- SUNRpowerR at Base 2.7.0+dfsg
- SUNRsqrt at Base 2.7.0+dfsg
diff --git a/debian/libsundials-nvecserial-dev.install b/debian/libsundials-nvecserial-dev.install
deleted file mode 100644
index a3d2cc6..0000000
--- a/debian/libsundials-nvecserial-dev.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/lib/*/libsundials_nvecserial.a
-usr/lib/*/libsundials_fnvecserial.a
-usr/lib/*/libsundials_nvecserial.so
-usr/lib/*/libsundials_fnvecserial.so
-
-usr/include/nvector/nvector_serial.h
-
-usr/include/arkode
-usr/include/cvode
-usr/include/cvodes
-usr/include/ida
-usr/include/idas
-usr/include/kinsol
-usr/include/sundials

-- 
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