[petsc] 02/07: remove lam and m4 support files
Drew Parsons
dparsons at moszumanska.debian.org
Thu Oct 1 18:32:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch master
in repository petsc.
commit 610b2463faa08973b7a7ee4d619d2043b227895f
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Oct 1 18:12:43 2015 +0800
remove lam and m4 support files
they were out of date. The m4 (autoconf) functionality is better supported
via pkg-config.
---
debian/math-blaslapack.m4 | 74 -----------------------------------------------
debian/mpirun_lam | 28 ------------------
debian/mpirun_lam.1 | 17 -----------
debian/petsc.m4 | 68 -------------------------------------------
debian/petscarch.1 | 15 ----------
5 files changed, 202 deletions(-)
diff --git a/debian/math-blaslapack.m4 b/debian/math-blaslapack.m4
deleted file mode 100644
index 848738a..0000000
--- a/debian/math-blaslapack.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-dnl Math and linear algebra checks by Adam Powell last modified 2002-10-16.
-dnl Copyright 2002 Adam Powell, redistributable under the terms of the GNU
-dnl General Public License version 2 or later.
-
-AC_DEFUN([MATH_BLASLAPACK_CHECKS],[
- dnl ffm is free fast math by Joachim Wesner and Kazushige Goto for
- dnl Linux/Alpha.
- AC_CHECK_HEADERS(libffm.h)
- AC_CHECK_LIB(ffm, dsqrtiv,
- MATH_LIBS="$MATH_LIBS -lffm" MATH_INCLUDES="-DFFM")
-
- dnl Alphas need this sometimes
- AC_CHECKING([whether -mieee is needed to avoid SIGFPE on divide by zero])
- case $build/$CC in
- alpha*/gcc* )
- MIEEE_CFLAGS="-mieee"
- AC_MSG_RESULT([yes])
- ;;
- * )
- MIEEE_CFLAGS=""
- AC_MSG_RESULT([not needed])
- ;;
- esac
- AC_SUBST(MIEEE_CFLAGS)
-
- dnl Used to check for IRIX multi-processor BLAS, but result was
- dnl EXTREMELY slow (here just for historical purposes)
- dnl AC_CHECK_LIB(blas_mp, dgemm_, BLAS_LIBS="-mp -lblas_mp", [
- dnl AC_CHECK_LIB(f77blas, dgemm_, BLAS_LIBS="-lf77blas -latlas", [
- dnl LIBS="$aLIBS $MATH_LIBS $FLIBS"])])
- dnl For now, I don't see a need for mixed blas/lapackgf-3 or
- dnl blas-3gf/lapack, only blas-3gf/lapackgf-3 and blas/lapack are checked.
- AC_F77_LIBRARY_LDFLAGS
- aLIBS="$LIBS"
- LIBS="$aLIBS $FLIBS"
- AC_CHECK_LIB(blas-3gf, dgemm_, [
- HAVE_BLAS="yes" LIBS="-lblas-3gf $aLIBS $MATH_LIBS $FLIBS"
- AC_CHECK_LIB(lapackgf-3, dgetrf_,
- HAVE_LAPACK="yes"
- BLASLAPACK_LIBS="-lblas-3gf -llapackgf-3 $FLIBS",
- dnl This second check is for Debian woody on Alpha
- LIBS="$aLIBS -lblas-3gf /lib/libgcc_s.so.1 $MATH_LIBS $FLIBS"
- AC_CHECK_LIB(lapackgf-3, dgetri_,
- HAVE_LAPACK="yes"
- BLASLAPACK_LIBS="-lblas-3gf -llapackgf-3 /lib/libgcc_s.so.1 $MATH_LIBS",
- HAVE_LAPACK="no"
- BLASLAPACK_LIBS="-lblas-3gf $MATH_LIBS"))], [
- AC_CHECK_LIB(blas, dgemv_, [
- HAVE_BLAS="yes" LIBS="$aLIBS -lblas $MATH_LIBS $FLIBS"
- AC_CHECK_LIB(lapack, dgetrf_,
- HAVE_LAPACK="yes"
- BLASLAPACK_LIBS="-lblas -llapack $MATH_LIBS $FLIBS",
- BLASLAPACK_LIBS="-lblas $MATH_LIBS $FLIBS")])])
- LIBS="$aLIBS"
-
- dnl cpml is the Compaq Portable Math Library for Linux/Alpha, and often
- dnl comes with cxml which has superfast blas/lapack included, so this
- dnl overrides the above BLAS and LAPACK checks.
- aLIBS="$LIBS"
- LIBS="$aLIBS -lots"
- AC_CHECK_LIB(cpml, sqrt,
- MATH_LIBS="-lots -lcpml $MATH_LIBS"
- MATH_INCLUDES="$MATH_INCLUDES" LIBS="-lots -lcpml $aLIBS" [
- AC_CHECK_LIB(cxml, dgemm_,
- BLASLAPACK_LIBS="-lcxml $MATH_LIBS"
- HAVE_BLAS="yes" HAVE_LAPACK="yes")])
- LIBS="$aLIBS"
-
- AC_SUBST(MATH_LIBS)
- AC_SUBST(MATH_INCLUDES)
- AC_SUBST(BLASLAPACK_LIBS)
- AC_SUBST(HAVE_BLAS)
- AC_SUBST(HAVE_LAPACK)
-])
diff --git a/debian/mpirun_lam b/debian/mpirun_lam
deleted file mode 100644
index 72f187e..0000000
--- a/debian/mpirun_lam
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#set -x
-
-#
-# This program is a wrapper over lam's mpirun. It converts
-# the mpich's mpirun formated command to lam's format.
-# and invokes lam's mpirun with it.
-#
-
-if [ $1 != "-np" ]; then
-echo "Error in mpirun command"
-exit 1
-fi
-shift
-np=$1
-shift
-progname=$1
-shift
-options=$*
-#
-# Please modify the following path to point to the correct location of LAM's mpirun
-#
-lam_path=/usr/bin
-#
-# Now execute the mpirun comman
-#
-$lam_path/mpirun.lam -w -c $np -s n0 $progname -- $options
-$lam_path/lamclean
diff --git a/debian/mpirun_lam.1 b/debian/mpirun_lam.1
deleted file mode 100644
index 8e28576..0000000
--- a/debian/mpirun_lam.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.TH mpirun_lam 1 "PETSc's lam mpirun wrapper" "DEBIAN" \" -*- nroff -*-
-.SH NAME
-mpirun_lam \- PETSc's lam mpirun wrapper
-.SH SYNOPSIS
-\fBmpirun_lam\fP
-.SH DESCRIPTION
-This is a real short wrapper around lam's mpirun.lam such that mpich's mpirun
-syntax can be used. It also adds a few options, though I don't know lam well
-enough to know what they do. This is used by the makefiles in the examples'
-source code, it is substituted for $(MPIRUN) if PETSc was built with lam
-(mpich used to be the default).
-.PP
-This was adapted only slightly from PETSc upstream's script named mpirun.lam.
-.SH BUGS
-None that I know of.
-.SH AUTHOR
-Adam Powell <hazelsct at mit.edu>
diff --git a/debian/petsc.m4 b/debian/petsc.m4
deleted file mode 100644
index c854809..0000000
--- a/debian/petsc.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl PETSc checks by Adam Powell last modified 2002-10-15
-dnl Copyright 2002 Adam Powell, redistributable under the terms of the GNU
-dnl General Public License version 2 or later.
-
-dnl Note: to use these, one must put:
-dnl include $(PETSC_DIR)/conf/base
-dnl very high in the Makefile.am of the directory where the links are made to
-dnl PETSc libraries. This will then allow the use of variables like
-dnl $(PETSC_DM_LIB) in _LIBADD fields.
-dnl See the illuminator package for a good example of this.
-
-AC_DEFUN([PETSC_CHECKS],[
- dnl PETSc checks, with defaults for PETSC_DIR, PETSC_ARCH and BOPT.
- dnl Note: this trusts PETSc to provide valid flags and libs for
- dnl BLAS/LAPACK and MPI. I don't see an easy way to verify this.
-
- AC_CHECK_FILE($PETSC_DIR/bin/petscarch, , [
- AC_CHECK_FILE(/usr/lib/petsc/bin/petscarch,
- PETSC_DIR=/usr/lib/petsc,
- AC_MSG_ERROR(Cannot find petscarch, please set PETSC_DIR for your PETSc install.))])
- AC_SUBST(PETSC_DIR)
-
- AC_CHECK_PROG(PETSC_ARCH, petscarch, `petscarch`, ,
- $PETSC_DIR/bin, /usr/bin)
- AC_SUBST(PETSC_ARCH)
-
- AC_CHECK_FILE($PETSC_DIR/$PETSC_ARCH/lib/libpetsc.a, ,
- AC_MSG_ERROR(Library libpetsc.a does not seem to be installed.))
-
- dnl And now, the lib defs
- MATH_BLASLAPACK_CHECKS
-
- PETSC_X11_LIBS="-L/usr/X11R6/lib -lX11"
- dnl This is wrong, or rather, only right for one MPI configuration.
- dnl Will have to change it so the PETSc package sets it properly.
- PETSC_MPI_LIBS="-lmpi"
-
- dnl This kind of mirrors conf/variables, though only for .m4
- dnl files; makefiles should include "$(PETSC_DIR)/conf/base"
- dnl and use e.g. ${PETSC_DM_LIB} etc.
- PETSC_LIBDIR="$PETSC_DIR/$PETSC_ARCH/lib"
- PETSC_EXTERNAL_LIBS="$PETSC_MPI_LIBS $PETSC_X11_LIBS $BLASLAPACK_LIBS -lhdf5 -lstdc++"
-
- dnl Basic check
- aLIBS="$LIBS"
- LIBS="$aLIBS -L$PETSC_LIBDIR $PETSC_EXTERNAL_LIBS"
- AC_CHECK_LIB(petsc, PetscPrintf, ,
- AC_MSG_ERROR("PETSc libraries not found"))
- LIBS="$aLIBS"
-
- dnl And lots of definitions
- PETSC_SYS_LIB_BASIC="-lpetsc $PETSC_EXTERNAL_LIBS"
- PETSC_VEC_LIB_BASIC="-lpetscvec $PETSC_SYS_LIB_BASIC"
- PETSC_MAT_LIB_BASIC="-lpetscmat $PETSC_VEC_LIB_BASIC"
- PETSC_DM_LIB_BASIC="-lpetscdm $PETSC_MAT_LIB_BASIC"
- PETSC_KSP_LIB_BASIC="-lpetscksp $PETSC_DM_LIB_BASIC"
- PETSC_SNES_LIB_BASIC="-lpetscsnes $PETSC_KSP_LIB_BASIC"
- PETSC_TS_LIB_BASIC="-lpetscts $PETSC_SNES_LIB_BASIC"
-
- dnl These are the ones to use in other m4 tests
- PETSC_SYS_LIB="-L$PETSC_LIBDIR $PETSC_SYS_LIB_BASIC"
- PETSC_VEC_LIB="-L$PETSC_LIBDIR $PETSC_VEC_LIB_BASIC"
- PETSC_MAT_LIB="-L$PETSC_LIBDIR $PETSC_MAT_LIB_BASIC"
- PETSC_DM_LIB="-L$PETSC_LIBDIR $PETSC_DM_LIB_BASIC"
- PETSC_KSP_LIB="-L$PETSC_LIBDIR $PETSC_KSP_LIB_BASIC"
- PETSC_SNES_LIB="-L$PETSC_LIBDIR $PETSC_SNES_LIB_BASIC"
- PETSC_TS_LIB="-L$PETSC_LIBDIR $PETSC_TS_LIB_BASIC"
-])
diff --git a/debian/petscarch.1 b/debian/petscarch.1
deleted file mode 100644
index 32c2a17..0000000
--- a/debian/petscarch.1
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH petscarch 1 "PETSc architecture indicator" "DEBIAN" \" -*- nroff -*-
-.SH NAME
-petscarch \- PETSc architecture indicator
-.SH SYNOPSIS
-\fBpetscarch\fP
-.SH DESCRIPTION
-This one-line script tells the value of the PETSC_ARCH variable under which the
-PETSc Debian package was built. It is a symbolic link through
-/etc/alternatives to the currently selected version of PETSc, slaved to the
-petsc link. (If you don't understand this, please visit the manpage for
-update-alternatives.)
-.SH BUGS
-None.
-.SH AUTHOR
-Adam Powell <hazelsct at mit.edu>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git
More information about the debian-science-commits
mailing list