CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the configuration for external blas and lapack.

Browse Source
This commit is contained in:
falgout 2012-11-01 00:08:01 +00:00
parent 405745e4ce
commit 1a435343fa
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Makefile.config.in
View File

@ -102,6 +102,7 @@ HYPRE_EXAMPLE_DIRS = @EXAMPLEDIR@
## LAPACK Library Flags
##################################################################
HYPRE_LAPACK_SRC_DIR = @HYPRE_LAPACK_SRC_DIR@
HYPRE_LAPACK_FILES = @HYPRE_LAPACK_FILES@
LAPACKLIBS = @LAPACKLIBS@
LAPACKLIBDIRS = @LAPACKLIBDIRS@
@ -109,6 +110,7 @@ LAPACKLIBDIRS = @LAPACKLIBDIRS@
## BLAS Library Flags
##################################################################
HYPRE_BLAS_SRC_DIR = @HYPRE_BLAS_SRC_DIR@
HYPRE_BLAS_FILES = @HYPRE_BLAS_FILES@
BLASLIBS = @BLASLIBS@
BLASLIBDIRS = @BLASLIBDIRS@

4
config/configure.in
View File

@ -852,6 +852,7 @@ then
if test "$hypre_using_hypre_blas" = "yes"
then
HYPRE_BLAS_SRC_DIR="$HYPRE_SRCDIR/blas"
HYPRE_BLAS_FILES="$HYPRE_SRCDIR/blas/*.o"
dnl BLAS_DIR="$HYPRE_SRCDIR/hypre/lib"
BLASLIBDIRS=""
BLASLIBS=""
@ -897,6 +898,7 @@ then
if test "$hypre_using_hypre_lapack" = "yes"
then
HYPRE_LAPACK_SRC_DIR="$HYPRE_SRCDIR/lapack"
HYPRE_LAPACK_FILES="$HYPRE_SRCDIR/lapack/*.o"
dnl LAPACK_DIR="$HYPRE_SRCDIR/hypre/lib"
LAPACKLIBDIRS=""
LAPACKLIBS=""
@ -1117,9 +1119,11 @@ dnl *********************************************************************
dnl * BLAS & LAPACK related information
dnl *********************************************************************
AC_SUBST(HYPRE_BLAS_SRC_DIR)
AC_SUBST(HYPRE_BLAS_FILES)
AC_SUBST(BLASLIBDIRS)
AC_SUBST(BLASLIBS)
AC_SUBST(HYPRE_LAPACK_SRC_DIR)
AC_SUBST(HYPRE_LAPACK_FILES)
AC_SUBST(LAPACKLIBDIRS)
AC_SUBST(LAPACKLIBS)

6
configure vendored
View File

@ -615,9 +615,11 @@ LIBOBJS
AR
LAPACKLIBS
LAPACKLIBDIRS
HYPRE_LAPACK_FILES
HYPRE_LAPACK_SRC_DIR
BLASLIBS
BLASLIBDIRS
HYPRE_BLAS_FILES
HYPRE_BLAS_SRC_DIR
HYPRE_FEI_SUPERLU_FILES
HYPRE_FEI_FEMLI_FILES
@ -6714,6 +6716,7 @@ $as_echo "$as_me: WARNING: ***************************************" >&2;}
if test "$hypre_using_hypre_blas" = "yes"
then
HYPRE_BLAS_SRC_DIR="$HYPRE_SRCDIR/blas"
HYPRE_BLAS_FILES="$HYPRE_SRCDIR/blas/*.o"
BLASLIBDIRS=""
BLASLIBS=""
@ -6944,6 +6947,7 @@ $as_echo "$as_me: WARNING: ***************************************" >&2;}
if test "$hypre_using_hypre_lapack" = "yes"
then
HYPRE_LAPACK_SRC_DIR="$HYPRE_SRCDIR/lapack"
HYPRE_LAPACK_FILES="$HYPRE_SRCDIR/lapack/*.o"
LAPACKLIBDIRS=""
LAPACKLIBS=""
@ -7612,6 +7616,8 @@ _ACEOF

8
lib/Makefile
View File

@ -32,8 +32,8 @@ SSTRUCTMVFILES = ${HYPRE_SRC_TOP_DIR}/sstruct_mv/*.o
STRUCTLSFILES = ${HYPRE_SRC_TOP_DIR}/struct_ls/*.o
STRUCTMVFILES = ${HYPRE_SRC_TOP_DIR}/struct_mv/*.o
UTILITIESFILES = ${HYPRE_SRC_TOP_DIR}/utilities/*.o
BLASFILES = ${HYPRE_SRC_TOP_DIR}/blas/*.o
LAPACKFILES = ${HYPRE_SRC_TOP_DIR}/lapack/*.o
BLASFILES = ${HYPRE_BLAS_FILES}
LAPACKFILES = ${HYPRE_LAPACK_FILES}
FILES_HYPRE = \
$(SUPERLUFILES)\
@ -102,9 +102,7 @@ libHYPRE.a: ${FILES_HYPRE}
${AR} $@ $(SSTRUCTMVFILES)
${AR} $@ $(STRUCTLSFILES)
${AR} $@ $(STRUCTMVFILES)
${AR} $@ $(UTILITIESFILES)
${AR} $@ $(BLASFILES)
${AR} $@ $(LAPACKFILES)
${AR} $@ $(UTILITIESFILES) $(BLASFILES) $(LAPACKFILES)
${RANLIB} $@
libHYPRE.so: ${FILES_HYPRE}