From 97404be51501d66402928a4f02e73e64d146f443 Mon Sep 17 00:00:00 2001 From: Rob Falgout Date: Thu, 26 Sep 2019 16:16:53 -0700 Subject: [PATCH] Updating CHANGELOG and release number/date for 2.18.0 --- CHANGELOG | 15 ++++++++- src/CMakeLists.txt | 4 +-- src/config/configure.in | 4 +-- src/configure | 58 ++++++++++++++++---------------- src/docs/ref-manual/conf.doxygen | 2 +- src/docs/usr-manual/conf.py | 6 ++-- 6 files changed, 51 insertions(+), 38 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ef42ddbe0..6d366fccf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,7 +7,20 @@ # This file chronicles user-level changes, beginning with the most recent. # ============================================================================= -Version 2.17.0 released 2019/06/10 +Version 2.18.0 released 2019/09/27 + +- Ported BoomerAMG setup to run on GPUs. Only a subset of setup phase features + are currently available. + +- Updated CMake to support more of the features available in configure/make. + +- Added RecomputeResidual options to several hybrid solvers. + +- Various bug fixes. + +#==================================== + +Version 2.17.0 released 2019/07/10 - Changed open source license to dual MIT/Apache-2.0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b548a0c73..d53e7a8e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,8 +11,8 @@ endif (POLICY CMP0074) project (hypre) # The version number. -set (HYPRE_VERSION 2.17.0) -set (HYPRE_DATE 2019/06/10) +set (HYPRE_VERSION 2.18.0) +set (HYPRE_DATE 2019/09/27) set (HYPRE_TIME 00:00:00) set (HYPRE_BUGS hypre-support@llnl.gov) set (HYPRE_SRCDIR "${PROJECT_SOURCE_DIR}") diff --git a/src/config/configure.in b/src/config/configure.in index 79b8b0c61..828a80d1f 100644 --- a/src/config/configure.in +++ b/src/config/configure.in @@ -48,8 +48,8 @@ dnl * Set package information so it only has to be modified in one place dnl ********************************************************************* m4_define([M4_HYPRE_NAME], [hypre]) -m4_define([M4_HYPRE_VERSION], [2.17.0]) -m4_define([M4_HYPRE_DATE], [2019/06/10]) +m4_define([M4_HYPRE_VERSION], [2.18.0]) +m4_define([M4_HYPRE_DATE], [2019/09/27]) m4_define([M4_HYPRE_TIME], [00:00:00]) m4_define([M4_HYPRE_BUGS], [hypre-support@llnl.gov]) m4_define([M4_HYPRE_SRCDIR], [`pwd`]) diff --git a/src/configure b/src/configure index 2f2c5ad96..329558d80 100755 --- a/src/configure +++ b/src/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for hypre 2.17.0. +# Generated by GNU Autoconf 2.69 for hypre 2.18.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -581,8 +581,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='hypre' PACKAGE_TARNAME='hypre' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='hypre 2.17.0' +PACKAGE_VERSION='2.18.0' +PACKAGE_STRING='hypre 2.18.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1385,7 +1385,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hypre 2.17.0 to adapt to many kinds of systems. +\`configure' configures hypre 2.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1450,7 +1450,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hypre 2.17.0:";; + short | recursive ) echo "Configuration of hypre 2.18.0:";; esac cat <<\_ACEOF @@ -1724,7 +1724,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hypre configure 2.17.0 +hypre configure 2.18.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2176,7 +2176,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hypre $as_me 2.17.0, which was +It was created by hypre $as_me 2.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2562,8 +2562,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. HYPRE_NAME="hypre" -HYPRE_VERSION="2.17.0" -HYPRE_DATE="2019/06/10" +HYPRE_VERSION="2.18.0" +HYPRE_DATE="2019/09/27" HYPRE_TIME="00:00:00" HYPRE_BUGS="hypre-support@llnl.gov" HYPRE_SRCDIR="`pwd`" @@ -8275,16 +8275,16 @@ $as_echo "#define HYPRE_USING_RAJA 1" >>confdefs.h if test "$hypre_using_cuda" != "yes" then - if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r" - then + if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r" + then CXXFLAGS="${CXXFLAGS} -+ -std=c++11" + fi fi - fi - CC=${CXX} + CC=${CXX} LINK_CC=${LINK_CXX} CFLAGS=${CXXFLAGS} - fi +fi if test "x$hypre_user_chose_kokkos" = "xyes" then @@ -8294,17 +8294,17 @@ $as_echo "#define HYPRE_USING_KOKKOS 1" >>confdefs.h if test "$hypre_using_cuda" != "yes" -then - if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r" then + if test "$CXX" = "mpixlC" || test "$CXX" = "xlC_r" + then CXXFLAGS="${CXXFLAGS} -+ -std=c++11" - fi fi + fi - CC=${CXX} + CC=${CXX} LINK_CC=${LINK_CXX} CFLAGS=${CXXFLAGS} - fi +fi if test "$hypre_user_chose_cuda" = "yes" then @@ -8393,23 +8393,23 @@ done fi fi - if test "$hypre_using_um" != "yes" - then +if test "$hypre_using_um" != "yes" +then if test "$hypre_user_chose_cuda" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************" >&5 $as_echo "$as_me: ***********************************************************" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring with --with-cuda=yes without unified memory." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring with --with-cuda=yes without unified memory." >&5 $as_echo "$as_me: Configuring with --with-cuda=yes without unified memory." >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: It only works for struct interface." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: It only works for struct interface." >&5 $as_echo "$as_me: It only works for struct interface." >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Use --enable-unified-memory to compile with unified memory." >&5 $as_echo "$as_me: Use --enable-unified-memory to compile with unified memory." >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************" >&5 $as_echo "$as_me: ***********************************************************" >&6;} fi if test "$hypre_using_device_openmp" = "yes" -then + then { $as_echo "$as_me:${as_lineno-$LINENO}: ***********************************************************" >&5 $as_echo "$as_me: ***********************************************************" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring with --with-device-openmp=yes without unified memory." >&5 @@ -8498,11 +8498,11 @@ done if test "$CC" = "clang-gpu" || test "$CC" = "mpiclang-gpu" then - CFLAGS+=" -fopenmp-nonaliased-maps" + CFLAGS+=" -fopenmp-nonaliased-maps" fi if test "$CXX" = "clang++-gpu" || test "$CXX" = "mpiclang++-gpu" then - CXXFLAGS+=" -fopenmp-nonaliased-maps" + CXXFLAGS+=" -fopenmp-nonaliased-maps" fi if test "$hypre_using_debug" = "yes" then @@ -9310,7 +9310,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hypre $as_me 2.17.0, which was +This file was extended by hypre $as_me 2.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9372,7 +9372,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -hypre config.status 2.17.0 +hypre config.status 2.18.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/src/docs/ref-manual/conf.doxygen b/src/docs/ref-manual/conf.doxygen index 38b016528..1fbe1a706 100644 --- a/src/docs/ref-manual/conf.doxygen +++ b/src/docs/ref-manual/conf.doxygen @@ -31,7 +31,7 @@ PROJECT_NAME = hypre # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.17.0 +PROJECT_NUMBER = 2.18.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/docs/usr-manual/conf.py b/src/docs/usr-manual/conf.py index 64d344931..6eddcd039 100644 --- a/src/docs/usr-manual/conf.py +++ b/src/docs/usr-manual/conf.py @@ -55,9 +55,9 @@ copyright = u'1998-2019 Lawrence Livermore National Security, LLC and other HYPR # built documents. # # The short X.Y version. -version = '2.17.0' +version = '2.18.0' # The full version, including alpha/beta/rc tags. -release = '2.17.0' +release = '2.18.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -65,7 +65,7 @@ release = '2.17.0' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -today = 'June 10, 2019' +today = 'September 27, 2019' # Else, today_fmt is used as the format for a strftime call. #today_fmt = '%B %d, %Y'