fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed requirements for MOVE_ALLOC

Browse Source
psblas3-type-indexed
Salvatore Filippone 15 years ago
parent c1552ff9f2
commit 99e1c54bb2
4 changed files with 155 additions and 3539 deletions
Show Stats Download Patch File Download Diff File

162
base/modules/psb_realloc_mod.F90
Unescape Escape View File

@ -2632,25 +2632,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(0,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_smove_alloc1d
Subroutine psb_smove_alloc2d(vin,vout,info)
@ -2660,24 +2643,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1),&
& lbound(vin,2):ubound(vin,2)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_smove_alloc2d
Subroutine psb_dmove_alloc1d(vin,vout,info)
@ -2687,25 +2654,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(0,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_dmove_alloc1d
Subroutine psb_dmove_alloc2d(vin,vout,info)
@ -2715,24 +2665,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1),&
& lbound(vin,2):ubound(vin,2)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_dmove_alloc2d
Subroutine psb_cmove_alloc1d(vin,vout,info)
@ -2742,22 +2676,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_cmove_alloc1d
Subroutine psb_cmove_alloc2d(vin,vout,info)
@ -2767,24 +2687,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1),&
& lbound(vin,2):ubound(vin,2)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_cmove_alloc2d
Subroutine psb_zmove_alloc1d(vin,vout,info)
@ -2794,22 +2698,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_zmove_alloc1d
Subroutine psb_zmove_alloc2d(vin,vout,info)
@ -2819,24 +2709,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1),&
& lbound(vin,2):ubound(vin,2)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_zmove_alloc2d
Subroutine psb_imove_alloc1d(vin,vout,info)
@ -2846,23 +2720,7 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(0,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_imove_alloc1d
Subroutine psb_imove_alloc2d(vin,vout,info)
@ -2872,24 +2730,8 @@ Contains
!
!
info = 0
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
end if
if (.not.allocated(vin) ) return
allocate(vout(lbound(vin,1):ubound(vin,1),&
& lbound(vin,2):ubound(vin,2)),stat=info)
if (info /= 0) return
vout = vin
deallocate(vin,stat=info)
#endif
end Subroutine psb_imove_alloc2d
end module psb_realloc_mod

3238
base/modules/psb_spmat_type.f03
View File

File diff suppressed because it is too large Load Diff

227
configure vendored
Unescape Escape View File

@ -712,8 +712,8 @@ PACKAGE
CYGPATH_W
am__isrc
RANLIB
MPIFC
MPIF77
MPIFC
MPILIBS
MPICC
ac_ct_CC
@ -801,8 +801,8 @@ CC
CFLAGS
CPPFLAGS
MPICC
MPIF77
MPIFC
MPIF77
CPP'
@ -1477,8 +1477,8 @@ Some influential environment variables:
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
MPICC MPI C compiler command
MPIF77 MPI Fortran 77 compiler command
MPIFC MPI Fortran compiler command
MPIF77 MPI Fortran 77 compiler command
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
@ -2127,7 +2127,7 @@ 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'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
if test -n "$ac_tool_prefix"; then
for ac_prog in xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran
for ac_prog in xlf2003_r xlf2003 xlf95_r xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@ -2171,7 +2171,7 @@ fi
fi
if test -z "$FC"; then
ac_ct_FC=$FC
for ac_prog in xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran
for ac_prog in xlf2003_r xlf2003 xlf95_r xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@ -3831,24 +3831,26 @@ _ACEOF
fi
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'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test "X$MPIF77" = "X" ; then
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'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
if test "X$MPIFC" = "X" ; then
# This is our MPIFC compiler preference: it will override ACX_MPI's first try.
for ac_prog in mpxlf mpf77 mpif77
for ac_prog in mpxlf2003_r mpxlf2003 mpxlf95_r mpxlf90 mpf95 mpf90 mpif95 mpif90
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_MPIF77+set}" = set; then
if test "${ac_cv_prog_MPIFC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$MPIF77"; then
ac_cv_prog_MPIF77="$MPIF77" # Let the user override the test.
if test -n "$MPIFC"; then
ac_cv_prog_MPIFC="$MPIFC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@ -3857,7 +3859,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MPIF77="$ac_prog"
ac_cv_prog_MPIFC="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@ -3867,17 +3869,17 @@ IFS=$as_save_IFS
fi
fi
MPIF77=$ac_cv_prog_MPIF77
if test -n "$MPIF77"; then
{ $as_echo "$as_me:$LINENO: result: $MPIF77" >&5
$as_echo "$MPIF77" >&6; }
MPIFC=$ac_cv_prog_MPIFC
if test -n "$MPIFC"; then
{ $as_echo "$as_me:$LINENO: result: $MPIFC" >&5
$as_echo "$MPIFC" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$MPIF77" && break
test -n "$MPIFC" && break
done
fi
@ -3887,17 +3889,18 @@ fi
for ac_prog in mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c
for ac_prog in mpif90 hf90 mpxlf90 mpxlf95 mpf90 cmpifc cmpif90c
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_MPIF77+set}" = set; then
if test "${ac_cv_prog_MPIFC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$MPIF77"; then
ac_cv_prog_MPIF77="$MPIF77" # Let the user override the test.
if test -n "$MPIFC"; then
ac_cv_prog_MPIFC="$MPIFC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@ -3906,7 +3909,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MPIF77="$ac_prog"
ac_cv_prog_MPIFC="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@ -3916,22 +3919,22 @@ IFS=$as_save_IFS
fi
fi
MPIF77=$ac_cv_prog_MPIF77
if test -n "$MPIF77"; then
{ $as_echo "$as_me:$LINENO: result: $MPIF77" >&5
$as_echo "$MPIF77" >&6; }
MPIFC=$ac_cv_prog_MPIFC
if test -n "$MPIFC"; then
{ $as_echo "$as_me:$LINENO: result: $MPIFC" >&5
$as_echo "$MPIFC" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$MPIF77" && break
test -n "$MPIFC" && break
done
test -n "$MPIF77" || MPIF77="$F77"
test -n "$MPIFC" || MPIFC="$FC"
acx_mpi_save_F77="$F77"
F77="$MPIF77"
acx_mpi_save_FC="$FC"
FC="$MPIFC"
@ -3958,7 +3961,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4008,7 +4011,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4035,13 +4038,13 @@ fi
fi
if test x = x"$MPILIBS"; then
{ $as_echo "$as_me:$LINENO: checking for MPI_Init in -lfmpich" >&5
$as_echo_n "checking for MPI_Init in -lfmpich... " >&6; }
if test "${ac_cv_lib_fmpich_MPI_Init+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpichf90" >&5
$as_echo_n "checking for MPI_Init in -lmpichf90... " >&6; }
if test "${ac_cv_lib_mpichf90_MPI_Init+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lfmpich $LIBS"
LIBS="-lmpichf90 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
program main
call MPI_Init
@ -4062,18 +4065,18 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
ac_cv_lib_fmpich_MPI_Init=yes
ac_cv_lib_mpichf90_MPI_Init=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_fmpich_MPI_Init=no
ac_cv_lib_mpichf90_MPI_Init=no
fi
rm -rf conftest.dSYM
@ -4081,10 +4084,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fmpich_MPI_Init" >&5
$as_echo "$ac_cv_lib_fmpich_MPI_Init" >&6; }
if test "x$ac_cv_lib_fmpich_MPI_Init" = x""yes; then
MPILIBS="-lfmpich"
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpichf90_MPI_Init" >&5
$as_echo "$ac_cv_lib_mpichf90_MPI_Init" >&6; }
if test "x$ac_cv_lib_mpichf90_MPI_Init" = x""yes; then
MPILIBS="-lmpichf90"
fi
fi
@ -4117,7 +4120,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4171,7 +4174,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4221,7 +4224,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_f77_werror_flag" ||
test -z "$ac_fc_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
{ $as_echo "$as_me:$LINENO: result: yes" >&5
@ -4238,14 +4241,14 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
F77="$acx_mpi_save_F77"
FC="$acx_mpi_save_FC"
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
if test x = x"$MPILIBS"; then
{ { $as_echo "$as_me:$LINENO: error: Cannot find any suitable MPI implementation for Fortran 77" >&5
$as_echo "$as_me: error: Cannot find any suitable MPI implementation for Fortran 77" >&2;}
{ { $as_echo "$as_me:$LINENO: error: Cannot find any suitable MPI implementation for Fortran" >&5
$as_echo "$as_me: error: Cannot find any suitable MPI implementation for Fortran" >&2;}
{ (exit 1); exit 1; }; }
:
else
@ -4257,26 +4260,26 @@ _ACEOF
:
fi
fi
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'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
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'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test "X$MPIFC" = "X" ; then
if test "X$MPIF77" = "X" ; then
# This is our MPIFC compiler preference: it will override ACX_MPI's first try.
for ac_prog in mpxlf95 mpxlf90 mpf95 mpf90 mpif95 mpif90
for ac_prog in mpxlf mpf77 mpif77
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_MPIFC+set}" = set; then
if test "${ac_cv_prog_MPIF77+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$MPIFC"; then
ac_cv_prog_MPIFC="$MPIFC" # Let the user override the test.
if test -n "$MPIF77"; then
ac_cv_prog_MPIF77="$MPIF77" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@ -4285,7 +4288,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MPIFC="$ac_prog"
ac_cv_prog_MPIF77="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@ -4295,17 +4298,17 @@ IFS=$as_save_IFS
fi
fi
MPIFC=$ac_cv_prog_MPIFC
if test -n "$MPIFC"; then
{ $as_echo "$as_me:$LINENO: result: $MPIFC" >&5
$as_echo "$MPIFC" >&6; }
MPIF77=$ac_cv_prog_MPIF77
if test -n "$MPIF77"; then
{ $as_echo "$as_me:$LINENO: result: $MPIF77" >&5
$as_echo "$MPIF77" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$MPIFC" && break
test -n "$MPIF77" && break
done
fi
@ -4315,18 +4318,17 @@ fi
for ac_prog in mpif90 hf90 mpxlf90 mpxlf95 mpf90 cmpifc cmpif90c
for ac_prog in mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_MPIFC+set}" = set; then
if test "${ac_cv_prog_MPIF77+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$MPIFC"; then
ac_cv_prog_MPIFC="$MPIFC" # Let the user override the test.
if test -n "$MPIF77"; then
ac_cv_prog_MPIF77="$MPIF77" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@ -4335,7 +4337,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MPIFC="$ac_prog"
ac_cv_prog_MPIF77="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@ -4345,22 +4347,22 @@ IFS=$as_save_IFS
fi
fi
MPIFC=$ac_cv_prog_MPIFC
if test -n "$MPIFC"; then
{ $as_echo "$as_me:$LINENO: result: $MPIFC" >&5
$as_echo "$MPIFC" >&6; }
MPIF77=$ac_cv_prog_MPIF77
if test -n "$MPIF77"; then
{ $as_echo "$as_me:$LINENO: result: $MPIF77" >&5
$as_echo "$MPIF77" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$MPIFC" && break
test -n "$MPIF77" && break
done
test -n "$MPIFC" || MPIFC="$FC"
test -n "$MPIF77" || MPIF77="$F77"
acx_mpi_save_FC="$FC"
FC="$MPIFC"
acx_mpi_save_F77="$F77"
F77="$MPIF77"
@ -4387,7 +4389,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4437,7 +4439,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4464,13 +4466,13 @@ fi
fi
if test x = x"$MPILIBS"; then
{ $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpichf90" >&5
$as_echo_n "checking for MPI_Init in -lmpichf90... " >&6; }
if test "${ac_cv_lib_mpichf90_MPI_Init+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for MPI_Init in -lfmpich" >&5
$as_echo_n "checking for MPI_Init in -lfmpich... " >&6; }
if test "${ac_cv_lib_fmpich_MPI_Init+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmpichf90 $LIBS"
LIBS="-lfmpich $LIBS"
cat >conftest.$ac_ext <<_ACEOF
program main
call MPI_Init
@ -4491,18 +4493,18 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
ac_cv_lib_mpichf90_MPI_Init=yes
ac_cv_lib_fmpich_MPI_Init=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_mpichf90_MPI_Init=no
ac_cv_lib_fmpich_MPI_Init=no
fi
rm -rf conftest.dSYM
@ -4510,10 +4512,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpichf90_MPI_Init" >&5
$as_echo "$ac_cv_lib_mpichf90_MPI_Init" >&6; }
if test "x$ac_cv_lib_mpichf90_MPI_Init" = x""yes; then
MPILIBS="-lmpichf90"
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fmpich_MPI_Init" >&5
$as_echo "$ac_cv_lib_fmpich_MPI_Init" >&6; }
if test "x$ac_cv_lib_fmpich_MPI_Init" = x""yes; then
MPILIBS="-lfmpich"
fi
fi
@ -4546,7 +4548,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4600,7 +4602,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
@ -4650,7 +4652,7 @@ $as_echo "$ac_try_echo") >&5
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_fc_werror_flag" ||
test -z "$ac_f77_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
{ $as_echo "$as_me:$LINENO: result: yes" >&5
@ -4667,14 +4669,14 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
FC="$acx_mpi_save_FC"
F77="$acx_mpi_save_F77"
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
if test x = x"$MPILIBS"; then
{ { $as_echo "$as_me:$LINENO: error: Cannot find any suitable MPI implementation for Fortran" >&5
$as_echo "$as_me: error: Cannot find any suitable MPI implementation for Fortran" >&2;}
{ { $as_echo "$as_me:$LINENO: error: Cannot find any suitable MPI implementation for Fortran 77" >&5
$as_echo "$as_me: error: Cannot find any suitable MPI implementation for Fortran 77" >&2;}
{ (exit 1); exit 1; }; }
:
else
@ -4686,7 +4688,7 @@ _ACEOF
:
fi
fi
# We leave a default language for the next checks.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@ -7082,7 +7084,7 @@ if test "X$psblas_cv_fc" == X"xlf" ; then
# - if called from some script, xlf could behave strangely
# - it is not said that mpxlf95 gets chosen by the configure script.
F90="xlf95 -qsuffix=f=f90:cpp=F90"
F03="xlf2003 -qsuffix=f=f03:cpp=F03"
F03="xlf2003_r -qsuffix=f=f03:cpp=F03"
# F90="xlf95"
# FC="xlf"
@ -7095,11 +7097,11 @@ if test "X$psblas_cv_fc" == X"xlf" ; then
F77="xlf"
CC="xlc"
if test x"$pac_cv_serial_mpi" == x"yes" ; then
MPF90="xlf95 -qsuffix=f=f90:cpp=F90"
MPF90="xlf2003_r -qsuffix=f=f90:cpp=F90"
MPF77="xlf95 -qfixed -qsuffix=f=f:cpp=F"
MPCC="xlc"
else
MPF90="mpxlf95 -qsuffix=f=f90:cpp=F90"
MPF90="mpxlf2003_r -qsuffix=f=f90:cpp=F90"
MPF77="mpxlf95 -qfixed -qsuffix=f=f:cpp=F"
MPCC="mpcc"
fi
@ -7577,10 +7579,6 @@ $as_echo "$as_me: error: Sorry, cannot build PSBLAS without support for CLASS an
fi
cd ..
rm -fr tmpdir_$i
#
# Optional features
#
ac_exeext=''
ac_ext='f'
ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
@ -7609,9 +7607,20 @@ else
$as_echo "no" >&6; }
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
{ { $as_echo "$as_me:$LINENO: error: Sorry, cannot build PSBLAS without support for EXTENDS.
Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.5." >&5
$as_echo "$as_me: error: Sorry, cannot build PSBLAS without support for EXTENDS.
Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.5." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest*
#
# Optional features
#
ac_exeext=''
ac_ext='f90'
ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FCFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'

33
configure.ac
Unescape Escape View File

@ -92,7 +92,7 @@ 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([xlf95 xlf90 xlf pgf95 pgf90 ifort ifc nagfor gfortran])
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 ])
@ -132,22 +132,24 @@ if test "X$MPICC" = "X" ; then
fi
ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for C]])])
AC_LANG(Fortran 77)
if test "X$MPIF77" = "X" ; then
# This is our MPIFC compiler preference: it will override ACX_MPI's first try.
AC_CHECK_PROGS([MPIF77],[mpxlf mpf77 mpif77])
fi
ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran 77]])])
AC_LANG([Fortran])
if test "X$MPIFC" = "X" ; then
# This is our MPIFC compiler preference: it will override ACX_MPI's first try.
AC_CHECK_PROGS([MPIFC],[mpxlf95 mpxlf90 mpf95 mpf90 mpif95 mpif90 ])
AC_CHECK_PROGS([MPIFC],[mpxlf2003_r mpxlf2003 mpxlf95_r mpxlf90 mpf95 mpf90 mpif95 mpif90 ])
fi
ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran]])])
fi
AC_LANG(Fortran 77)
if test "X$MPIF77" = "X" ; then
# This is our MPIFC compiler preference: it will override ACX_MPI's first try.
AC_CHECK_PROGS([MPIF77],[mpxlf mpf77 mpif77])
fi
ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran 77]])])
# We leave a default language for the next checks.
dnl AC_LANG([Fortran 77])
AC_LANG([C])
@ -443,7 +445,7 @@ if test "X$psblas_cv_fc" == X"xlf" ; then
# - if called from some script, xlf could behave strangely
# - it is not said that mpxlf95 gets chosen by the configure script.
F90="xlf95 -qsuffix=f=f90:cpp=F90"
F03="xlf2003 -qsuffix=f=f03:cpp=F03"
F03="xlf2003_r -qsuffix=f=f03:cpp=F03"
# F90="xlf95"
# FC="xlf"
@ -456,11 +458,11 @@ if test "X$psblas_cv_fc" == X"xlf" ; then
F77="xlf"
CC="xlc"
if test x"$pac_cv_serial_mpi" == x"yes" ; then
MPF90="xlf95 -qsuffix=f=f90:cpp=F90"
MPF90="xlf2003_r -qsuffix=f=f90:cpp=F90"
MPF77="xlf95 -qfixed -qsuffix=f=f:cpp=F"
MPCC="xlc"
else
MPF90="mpxlf95 -qsuffix=f=f90:cpp=F90"
MPF90="mpxlf2003_r -qsuffix=f=f90:cpp=F90"
MPF77="mpxlf95 -qfixed -qsuffix=f=f:cpp=F"
MPCC="mpcc"
fi
@ -549,14 +551,15 @@ PAC_FORTRAN_TEST_CLASS_TBP(
[AC_MSG_ERROR([Sorry, cannot build PSBLAS without support for CLASS and type bound procedures.
Please get a Fortran compiler that supports them, e.g. GNU Fortran 4.5.])]
)
PAC_FORTRAN_HAVE_MOVE_ALLOC(
[FDEFINES="$psblas_cv_define_prepend-DHAVE_MOVE_ALLOC $FDEFINES"],
[AC_MSG_ERROR([Sorry, cannot build PSBLAS without support for EXTENDS.
Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.5.])]
)
#
# Optional features
#
PAC_FORTRAN_HAVE_MOVE_ALLOC(
[FDEFINES="$psblas_cv_define_prepend-DHAVE_MOVE_ALLOC $FDEFINES"],
)
PAC_FORTRAN_TEST_VOLATILE(
[FDEFINES="$psblas_cv_define_prepend-DHAVE_VOLATILE $FDEFINES"],

Write Preview
Loading…
Cancel
Save