fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-18 03:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

psblas3:

Browse Source 
Make.inc.in
 configure.ac
 configure

Do not use .f03 extensions and related variables.
This commit is contained in:
Salvatore Filippone
2011-01-04 15:45:10 +00:00
parent bcc4b1b034
commit 724b09620c
3 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Make.inc.in
+1 -4
View File
@@ -6,17 +6,14 @@
.mod=@MODEXT@
.fh=.fh
.SUFFIXES:
.SUFFIXES: .f90 .F90 .f .F .f03 .F03 .c .o
.SUFFIXES: .f90 .F90 .f .F .c .o
# The following ones are the variables used by the PSBLAS make scripts.
F03=@F03@
F90=@F90@
FC=@FC@
CC=@CC@
#F77=@F77@
F03COPT=@F03COPT@
F90COPT=@F90COPT@
FCOPT=@FCOPT@
CCOPT=@CCOPT@
configure
Vendored
+1 -22
View File
@@ -625,8 +625,6 @@ FCOPT
MPCC
MPF77
MPF90
F03COPT
F03
F90COPT
F90
BASELIBNAME
@@ -2652,7 +2650,6 @@ esac
$as_echo "$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR" >&6; }
# Note that the following line won't save from troubles.
# AC_PROG_FC([mpxlf95 mpxlf90 mpxlf pgf95 pgf90 mpif95 mpif90 gfortran f95 f90 ifc])
ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
@@ -3092,7 +3089,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
#AC_PROG_FC
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -6219,14 +6215,6 @@ if test "X$psblas_cv_fc" == X"nag" ; then
# Add needed options
F90COPT="$F90COPT -dcfuns -f2003 -wmismatch=mpi_scatterv,mpi_alltoallv,mpi_gatherv,mpi_allgatherv"
EXTRA_OPT="-mismatch_all"
F03COPT="${F90COPT}"
F03="${MPIFC}"
elif test "X$psblas_cv_fc" == X"xlf" ; then
F03="xlf2003_r"
F03COPT="-O3 -qarch=auto -qsuffix=f=f03:cpp=F03 $F03COPT"
else
F03=${FC}
F03COPT="${F90COPT}"
fi
#FCFLAGS="${F90COPT}"
@@ -6237,7 +6225,6 @@ fi
# Compilers variables selection
##############################################################################
F90=${FC}
F03=${F03}
MPF90=${MPIFC}
FC=${FC}
MPF77=${MPIFC}
@@ -8976,8 +8963,6 @@ UTILLIBNAME=libpsb_util.a
@@ -9002,14 +8987,10 @@ FDEFINES=$(PSBFDEFINES)
$(FC) $(FCOPT) $(FINCLUDES) -c $<
.f90.o:
$(F90) $(F90COPT) $(FINCLUDES) -c $<
.f03.o:
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.F.o:
$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
.F90.o:
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F03.o:
$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
@@ -10318,7 +10299,6 @@ fi
CDEFINES : ${CDEFINES}
MODEXT : ${MODEXT}
FMFLAG : ${FMFLAG}
F03COPT : ${F03COPT}
F90COPT : ${F90COPT}
FCOPT : ${FCOPT}
CCOPT : ${CCOPT}
@@ -10351,7 +10331,6 @@ $as_echo "$as_me:
CDEFINES : ${CDEFINES}
MODEXT : ${MODEXT}
FMFLAG : ${FMFLAG}
F03COPT : ${F03COPT}
F90COPT : ${F90COPT}
FCOPT : ${FCOPT}
CCOPT : ${CCOPT}
configure.ac
+1 -19
View File
@@ -91,9 +91,7 @@ esac
AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR $INSTALL_DOCSDIR])
# Note that the following line won't save from troubles.
# AC_PROG_FC([mpxlf95 mpxlf90 mpxlf pgf95 pgf90 mpif95 mpif90 gfortran f95 f90 ifc])
AC_PROG_FC([xlf2003_r xlf2003 xlf95_r xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran])
#AC_PROG_FC
AC_PROG_F77([xlf pgf77 ifort ifc nagfor gfortran])
AC_PROG_CC([xlc pgcc icc gcc ])
dnl AC_PROG_CXX
@@ -429,14 +427,6 @@ if test "X$psblas_cv_fc" == X"nag" ; then
# Add needed options
F90COPT="$F90COPT -dcfuns -f2003 -wmismatch=mpi_scatterv,mpi_alltoallv,mpi_gatherv,mpi_allgatherv"
EXTRA_OPT="-mismatch_all"
F03COPT="${F90COPT}"
F03="${MPIFC}"
elif test "X$psblas_cv_fc" == X"xlf" ; then
F03="xlf2003_r"
F03COPT="-O3 -qarch=auto -qsuffix=f=f03:cpp=F03 $F03COPT"
else
F03=${FC}
F03COPT="${F90COPT}"
fi
#FCFLAGS="${F90COPT}"
@@ -447,7 +437,6 @@ fi
# Compilers variables selection
##############################################################################
F90=${FC}
F03=${F03}
MPF90=${MPIFC}
FC=${FC}
MPF77=${MPIFC}
@@ -717,8 +706,6 @@ AC_SUBST(CDEFINES)
AC_SUBST(BASELIBNAME)
AC_SUBST(F90)
AC_SUBST(F90COPT)
AC_SUBST(F03)
AC_SUBST(F03COPT)
AC_SUBST(MPF90)
AC_SUBST(MPF77)
AC_SUBST(MPCC)
@@ -767,14 +754,10 @@ FDEFINES=$(PSBFDEFINES)
$(FC) $(FCOPT) $(FINCLUDES) -c $<
.f90.o:
$(F90) $(F90COPT) $(FINCLUDES) -c $<
.f03.o:
$(F03) $(F03COPT) $(FINCLUDES) -c $<
.F.o:
$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
.F90.o:
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
.F03.o:
$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
AC_SUBST(PSBLASRULES)
@@ -809,7 +792,6 @@ dnl FFLAGS : ${FFLAGS}
dnl FCFLAGS : ${FCFLAGS}
MODEXT : ${MODEXT}
FMFLAG : ${FMFLAG}
F03COPT : ${F03COPT}
F90COPT : ${F90COPT}
FCOPT : ${FCOPT}
CCOPT : ${CCOPT}