Bump version of PSBLAS and AMG

amgprec/amg_base_prec_type.F90

@@ -81,10 +81,10 @@ module amg_base_prec_type
   !
   ! Version numbers
   !
-  character(len=*), parameter   :: amg_version_string_ = "1.0.1"
+  character(len=*), parameter   :: amg_version_string_ = "1.1.0"
   integer(psb_ipk_), parameter  :: amg_version_major_  = 1
-  integer(psb_ipk_), parameter  :: amg_version_minor_  = 0
-  integer(psb_ipk_), parameter  :: amg_patchlevel_     = 1
+  integer(psb_ipk_), parameter  :: amg_version_minor_  = 1
+  integer(psb_ipk_), parameter  :: amg_patchlevel_     = 0
 
   type amg_ml_parms
     integer(psb_ipk_) :: sweeps_pre, sweeps_post

configure.ac

@@ -34,11 +34,11 @@ dnl NOTE : odd configurations like ifc + gcc still await in the mist of the unkn
 ###############################################################################
 
 # NOTE: the literal for version (the second argument to AC_INIT should be a literal!)
-AC_INIT([AMG4PSBLAS],1.0.0, [https://github.com/sfilippone/amg4psblas/issues])
+AC_INIT([AMG4PSBLAS],1.1.0, [https://github.com/sfilippone/amg4psblas/issues])
 
 # VERSION is the file containing the PSBLAS version code
 # FIXME
-amg4psblas_cv_version="1.0.0"
+amg4psblas_cv_version="1.1.0"
 
 # A sample source file
 AC_CONFIG_SRCDIR([amgprec/amg_prec_type.f90])
@@ -587,8 +587,8 @@ if test "x$pac_cv_psblas_patchlevel" == "xunknown"; then
    AC_MSG_ERROR([PSBLAS patchlevel "$pac_cv_psblas_patchlevel".])
 fi
 if (( $pac_cv_psblas_major < 3 )) ||
-   (  (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 7 ))) ; then
-  AC_MSG_ERROR([I need at least PSBLAS version 3.7.]) 
+   (  (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 8 ))) ; then
+  AC_MSG_ERROR([I need at least PSBLAS version 3.8.0]) 
 else
   AC_MSG_NOTICE([Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel.])
 fi

configure_n.ac

@@ -34,11 +34,11 @@ dnl NOTE : odd configurations like ifc + gcc still await in the mist of the unkn
 ###############################################################################
 
 # NOTE: the literal for version (the second argument to AC_INIT should be a literal!)
-AC_INIT([AMG4PSBLAS],1.0.0, [https://github.com/sfilippone/amg4psblas/issues])
+AC_INIT([AMG4PSBLAS],1.1.0, [https://github.com/sfilippone/amg4psblas/issues])
 
 # VERSION is the file containing the PSBLAS version code
 # FIXME
-amg4psblas_cv_version="1.0.0"
+amg4psblas_cv_version="1.1.0"
 
 # A sample source file
 AC_CONFIG_SRCDIR([amgprec/amg_prec_type.f90])
@@ -559,31 +559,14 @@ if test "x$pac_cv_psblas_patchlevel" == "xunknown"; then
    AC_MSG_ERROR([PSBLAS patchlevel "$pac_cv_psblas_patchlevel".])
 fi
 if (( $pac_cv_psblas_major < 3 )) ||
-   (  (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 7 ))) ; then
-  AC_MSG_ERROR([I need at least PSBLAS version 3.7.]) 
+   (  (( $pac_cv_psblas_major == 3 )) && (( $pac_cv_psblas_minor < 8 ))) ; then
+  AC_MSG_ERROR([I need at least PSBLAS version 3.8.0]) 
 else
   AC_MSG_NOTICE([Am configuring with PSBLAS version $pac_cv_psblas_major.$pac_cv_psblas_minor.$pac_cv_psblas_patchlevel.])
 fi
-
-PAC_ARG_WITH_IPK
-PAC_ARG_WITH_LPK
-# Defaults for IPK/LPK
-if test x"$pac_cv_ipk_size" == x"" ; then
-  pac_cv_ipk_size=4
-fi
-if test x"$pac_cv_lpk_size" == x"" ; then
-  pac_cv_lpk_size=8
-fi
-# Enforce sensible combination
-if (( $pac_cv_lpk_size < $pac_cv_ipk_size )); then
-   AC_MSG_NOTICE([[Invalid combination of size specs IPK ${pac_cv_ipk_size} LPK ${pac_cv_lpk_size}. ]]);
-   AC_MSG_NOTICE([[Forcing equal values]])	
-   pac_cv_lpk_size=$pac_cv_ipk_size;	
-fi				
-FDEFINES="$psblas_cv_define_prepend-DIPK${pac_cv_ipk_size} $FDEFINES";
-FDEFINES="$psblas_cv_define_prepend-DLPK${pac_cv_lpk_size} $FDEFINES";	
-CDEFINES="-DIPK${pac_cv_ipk_size} -DLPK${pac_cv_lpk_size} $CDEFINES"; 
-if test x"$pac_cv_lpk_size" == x8"" ; then
+PAC_FORTRAN_PSBLAS_INTEGER_SIZES()
+AC_MSG_NOTICE([PSBLAS size of LPK "$pac_cv_psblas_lpk".])
+if test x"$pac_cv_psblas_lpk" == x8"" ; then
   CXXDEFINES="-DBIT64 $CXXDEFINES";
 fi