From 67e0dd27d7d1c0886443af5558746901bb011423 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Tue, 21 Feb 2023 07:27:40 -0500 Subject: [PATCH] Remove Deprecated bindings for release --- bindings/C/adios2/c/adios2_c_adios.cpp | 11 ------ bindings/C/adios2/c/adios2_c_adios.h | 25 +++---------- bindings/C/adios2/c/adios2_c_adios_mpi.cpp | 11 ------ bindings/C/adios2/c/adios2_c_types.h | 7 ---- bindings/CXX11/adios2.h | 7 ---- bindings/CXX11/adios2/cxx11/ADIOS.h | 37 ------------------- .../Fortran/modules/adios2_adios_init_mod.F90 | 33 ----------------- .../modules/adios2_adios_init_mpi_smod.F90 | 25 ------------- .../modules/adios2_adios_init_serial_smod.F90 | 23 ------------ .../Fortran/modules/adios2_parameters_mod.f90 | 4 -- docs/user_guide/source/api_full/fortran.rst | 8 ---- 11 files changed, 5 insertions(+), 186 deletions(-) diff --git a/bindings/C/adios2/c/adios2_c_adios.cpp b/bindings/C/adios2/c/adios2_c_adios.cpp index dd658e9b4b..cf376e8770 100644 --- a/bindings/C/adios2/c/adios2_c_adios.cpp +++ b/bindings/C/adios2/c/adios2_c_adios.cpp @@ -65,22 +65,11 @@ adios2_adios *adios2_init_serial() return adios2_init_config_glue_serial("", "C"); } -adios2_adios *adios2_init_serial_debug(adios2_debug_mode) -{ - return adios2_init_serial(); -} - adios2_adios *adios2_init_config_serial(const char *config_file) { return adios2_init_config_glue_serial(config_file, "C"); } -adios2_adios *adios2_init_config_serial_debug(const char *config_file, - adios2_debug_mode) -{ - return adios2_init_config_serial(config_file); -} - adios2_io *adios2_declare_io(adios2_adios *adios, const char *name) { adios2_io *io = nullptr; diff --git a/bindings/C/adios2/c/adios2_c_adios.h b/bindings/C/adios2/c/adios2_c_adios.h index 676e024196..02fc4671f5 100644 --- a/bindings/C/adios2/c/adios2_c_adios.h +++ b/bindings/C/adios2/c/adios2_c_adios.h @@ -22,9 +22,9 @@ extern "C" { #endif #if ADIOS2_USE_MPI -#define adios2_init(comm, debug) adios2_init_mpi_debug(comm, debug) -#define adios2_init_config(config_file, comm, debug) \ - adios2_init_config_mpi_debug(config_file, comm, debug) +#define adios2_init(comm) adios2_init_mpi(comm) +#define adios2_init_config(config_file, comm) \ + adios2_init_config_mpi(config_file, comm) /** * Starting point for MPI apps. Creates an ADIOS handler. @@ -34,9 +34,6 @@ extern "C" { */ adios2_adios *adios2_init_mpi(MPI_Comm comm); -ADIOS2_DEPRECATED -adios2_adios *adios2_init_mpi_debug(MPI_Comm comm, adios2_debug_mode); - /** * Starting point for MPI apps. Creates an ADIOS handler allowing a runtime * config file. @@ -48,14 +45,9 @@ adios2_adios *adios2_init_mpi_debug(MPI_Comm comm, adios2_debug_mode); */ adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm); -ADIOS2_DEPRECATED -adios2_adios *adios2_init_config_mpi_debug(const char *config_file, - MPI_Comm comm, adios2_debug_mode); - #else -#define adios2_init(debug) adios2_init_serial_debug(debug) -#define adios2_init_config(config_file, debug) \ - adios2_init_config_serial_debug(config_file, debug) +#define adios2_init() adios2_init_serial() +#define adios2_init_config(config_file) adios2_init_config_seria(config_file) #endif /** @@ -65,9 +57,6 @@ adios2_adios *adios2_init_config_mpi_debug(const char *config_file, */ adios2_adios *adios2_init_serial(void); -ADIOS2_DEPRECATED -adios2_adios *adios2_init_serial_debug(adios2_debug_mode); - /** * Initialize an ADIOS struct pointer handler in a serial, non-MPI application. * Doesn't require a runtime config file. @@ -75,10 +64,6 @@ adios2_adios *adios2_init_serial_debug(adios2_debug_mode); */ adios2_adios *adios2_init_config_serial(const char *config_file); -ADIOS2_DEPRECATED -adios2_adios *adios2_init_config_serial_debug(const char *config_file, - adios2_debug_mode); - /** * Declares a new io handler * @param adios owner the io handler diff --git a/bindings/C/adios2/c/adios2_c_adios_mpi.cpp b/bindings/C/adios2/c/adios2_c_adios_mpi.cpp index 8df28532e5..7ae76381ce 100644 --- a/bindings/C/adios2/c/adios2_c_adios_mpi.cpp +++ b/bindings/C/adios2/c/adios2_c_adios_mpi.cpp @@ -41,20 +41,9 @@ adios2_adios *adios2_init_mpi(MPI_Comm comm) return adios2_init_config_glue_mpi("", comm, "C"); } -adios2_adios *adios2_init_mpi_debug(MPI_Comm comm, adios2_debug_mode) -{ - return adios2_init_mpi(comm); -} - adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm) { return adios2_init_config_glue_mpi(config_file, comm, "C"); } -adios2_adios *adios2_init_config_mpi_debug(const char *config_file, - MPI_Comm comm, adios2_debug_mode) -{ - return adios2_init_config_mpi(config_file, comm); -} - } // end extern C diff --git a/bindings/C/adios2/c/adios2_c_types.h b/bindings/C/adios2/c/adios2_c_types.h index 063ee3cece..c61504d32d 100644 --- a/bindings/C/adios2/c/adios2_c_types.h +++ b/bindings/C/adios2/c/adios2_c_types.h @@ -61,13 +61,6 @@ typedef enum adios2_true = 1, } adios2_bool; -/* DEPRECATED: Debug mode will be removed in a future release */ -typedef enum -{ - adios2_debug_mode_off = 0, - adios2_debug_mode_on = 1, -} adios2_debug_mode; - typedef enum { adios2_constant_dims_false = 0, diff --git a/bindings/CXX11/adios2.h b/bindings/CXX11/adios2.h index 807363cdaa..a092053765 100644 --- a/bindings/CXX11/adios2.h +++ b/bindings/CXX11/adios2.h @@ -15,13 +15,6 @@ #include "adios2/common/ADIOSMacros.h" #include "adios2/common/ADIOSTypes.h" -// DEPRECATED: Debug mode will be removed in a future release -namespace adios2 -{ -constexpr bool DebugON = true; -constexpr bool DebugOFF = false; -} // end namespace adios2 - #include "adios2/cxx11/ADIOS.h" #include "adios2/cxx11/Attribute.h" #include "adios2/cxx11/Engine.h" diff --git a/bindings/CXX11/adios2/cxx11/ADIOS.h b/bindings/CXX11/adios2/cxx11/ADIOS.h index f2cfe7796f..fddc335ad1 100644 --- a/bindings/CXX11/adios2/cxx11/ADIOS.h +++ b/bindings/CXX11/adios2/cxx11/ADIOS.h @@ -55,11 +55,6 @@ class ADIOS */ ADIOS(MPI_Comm comm); - template Enable = true> - ADIOS2_DEPRECATED ADIOS(MPI_Comm comm, TDebugMode) : ADIOS(comm) - { - } - /** * Starting point for MPI apps. Creates an ADIOS object allowing a * runtime config file. @@ -71,13 +66,6 @@ class ADIOS */ ADIOS(const std::string &configFile, MPI_Comm comm); - template Enable = true> - ADIOS2_DEPRECATED ADIOS(const std::string &configFile, MPI_Comm comm, - TDebugMode) - : ADIOS(configFile, comm) - { - } - /** extra constructor for R and other languages that use the * public C++ API but has data in column-major. Pass "" for configfile * if there is no config file. Last bool argument exist only to @@ -90,13 +78,6 @@ class ADIOS ADIOS(const std::string &configFile, MPI_Comm comm, const std::string &hostLanguage); - template Enable = true> - ADIOS2_DEPRECATED ADIOS(const std::string &configFile, MPI_Comm comm, - const std::string &hostLanguage, TDebugMode) - : ADIOS(configFile, comm, hostLanguage) - { - } - #endif /** @@ -107,23 +88,12 @@ class ADIOS */ ADIOS(const std::string &configFile); - template Enable = true> - ADIOS2_DEPRECATED ADIOS(const std::string &configFile, TDebugMode) - : ADIOS(configFile) - { - } - /** * Starting point for non-MPI apps. Creates an ADIOS object * @exception std::invalid_argument if user input is incorrect */ ADIOS(); - template Enable = true> - ADIOS2_DEPRECATED ADIOS(TDebugMode) : ADIOS() - { - } - /** extra constructor for R and other languages that use the * public C++ API but has data in column-major. Pass "" for configfile * if there is no config file. Last bool argument exist only to @@ -135,13 +105,6 @@ class ADIOS */ ADIOS(const std::string &configFile, const std::string &hostLanguage); - template Enable = true> - ADIOS2_DEPRECATED ADIOS(const std::string &configFile, - const std::string &hostLanguage, TDebugMode) - : ADIOS(configFile, hostLanguage) - { - } - /** object inspection true: valid object, false: invalid object */ explicit operator bool() const noexcept; diff --git a/bindings/Fortran/modules/adios2_adios_init_mod.F90 b/bindings/Fortran/modules/adios2_adios_init_mod.F90 index 012568d597..f69dea08d7 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_mod.F90 @@ -16,22 +16,11 @@ module subroutine adios2_init_serial(adios, ierr) type(adios2_adios), intent(out) :: adios integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_debug_serial(adios, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - end subroutine module subroutine adios2_init_config_serial(adios, config_file, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_config_debug_serial(adios, config_file, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - character*(*), intent(in) :: config_file - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - end subroutine #ifdef ADIOS2_HAVE_MPI_F module subroutine adios2_init_mpi(adios, comm, ierr) @@ -39,25 +28,12 @@ module subroutine adios2_init_mpi(adios, comm, ierr) integer, intent(in) :: comm integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_debug_mpi(adios, comm, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - end subroutine module subroutine adios2_init_config_mpi(adios, config_file, comm, ierr) type(adios2_adios), intent(out) :: adios character*(*), intent(in) :: config_file integer, intent(in) :: comm integer, intent(out) :: ierr end subroutine - module subroutine adios2_init_config_debug_mpi(adios, config_file, comm, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - character*(*), intent(in) :: config_file - integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - end subroutine #endif end interface #else @@ -69,13 +45,4 @@ module subroutine adios2_init_config_debug_mpi(adios, config_file, comm, adios2_ #endif /*ADIOS2_HAVE_MPI_F*/ #endif /*ADIOS2_HAVE_FORTRAN_SUBMODULES*/ -#if defined(__GFORTRAN__) && defined(__GNUC__) && (__GNUC__ >= 11) -!GCC$ ATTRIBUTES DEPRECATED :: adios2_init_debug_serial, adios2_init_config_debug_serial -#endif /*DEPRECATED*/ -#ifdef ADIOS2_HAVE_MPI_F -#if defined(__GFORTRAN__) && defined(__GNUC__) && (__GNUC__ >= 11) -!GCC$ ATTRIBUTES DEPRECATED :: adios2_init_debug_mpi, adios2_init_config_debug_mpi -#endif /*DEPRECATED*/ -#endif /*ADIOS2_HAVE_MPI_F*/ - end module diff --git a/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 b/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 index 07e49cf5cd..18760229f0 100644 --- a/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90 @@ -27,9 +27,7 @@ module adios2_adios_init_mpi_mod #ifndef ADIOS2_HAVE_FORTRAN_SUBMODULES interface adios2_init module procedure adios2_init_mpi - module procedure adios2_init_debug_mpi module procedure adios2_init_config_mpi - module procedure adios2_init_config_debug_mpi end interface #endif external adios2_init_config_mpi_f2c @@ -45,17 +43,6 @@ ADIOS2_MODULE_PROCEDURE subroutine adios2_init_mpi( & call adios2_init_config_mpi(adios, char(0), comm, ierr) end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_debug_mpi( & - adios, comm, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - - UNUSED_ARG(adios2_debug_mode) - call adios2_init_mpi(adios, comm, ierr) - end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_mpi( & adios, config_file, comm, ierr) type(adios2_adios), intent(out) :: adios @@ -70,18 +57,6 @@ ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_mpi( & if( ierr == 0 ) adios%valid = .true. end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_debug_mpi( & - adios, config_file, comm, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - character*(*), intent(in) :: config_file - integer, intent(in) :: comm - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - - UNUSED_ARG(adios2_debug_mode) - call adios2_init_config_mpi(adios, config_file, comm, ierr) - end subroutine - #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES end submodule #else diff --git a/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 b/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 index baf00403fd..c65d1dc31e 100644 --- a/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 +++ b/bindings/Fortran/modules/adios2_adios_init_serial_smod.F90 @@ -27,9 +27,7 @@ module adios2_adios_init_serial_mod #ifndef ADIOS2_HAVE_FORTRAN_SUBMODULES interface adios2_init module procedure adios2_init_serial - module procedure adios2_init_debug_serial module procedure adios2_init_config_serial - module procedure adios2_init_config_debug_serial end interface #endif external adios2_init_config_serial_f2c @@ -44,16 +42,6 @@ ADIOS2_MODULE_PROCEDURE subroutine adios2_init_serial( & call adios2_init_config_serial(adios, char(0), ierr) end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_debug_serial( & - adios, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - - UNUSED_ARG(adios2_debug_mode) - call adios2_init_serial(adios, ierr) - end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_serial( & adios, config_file, ierr) type(adios2_adios), intent(out) :: adios @@ -65,17 +53,6 @@ ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_serial( & if( ierr == 0 ) adios%valid = .true. end subroutine - ADIOS2_MODULE_PROCEDURE subroutine adios2_init_config_debug_serial( & - adios, config_file, adios2_debug_mode, ierr) - type(adios2_adios), intent(out) :: adios - character*(*), intent(in) :: config_file - logical, intent(in) :: adios2_debug_mode - integer, intent(out) :: ierr - - UNUSED_ARG(adios2_debug_mode) - call adios2_init_config_serial(adios, config_file, ierr) - end subroutine - #ifdef ADIOS2_HAVE_FORTRAN_SUBMODULES end submodule #else diff --git a/bindings/Fortran/modules/adios2_parameters_mod.f90 b/bindings/Fortran/modules/adios2_parameters_mod.f90 index dbdccfe669..ac89b4f1ed 100644 --- a/bindings/Fortran/modules/adios2_parameters_mod.f90 +++ b/bindings/Fortran/modules/adios2_parameters_mod.f90 @@ -11,10 +11,6 @@ module adios2_parameters_mod implicit none - ! DEPRECATED Debug mode - logical, parameter :: adios2_debug_mode_on = .true. - logical, parameter :: adios2_debug_mode_off = .false. - ! Types integer, parameter :: adios2_type_unknown = -1 diff --git a/docs/user_guide/source/api_full/fortran.rst b/docs/user_guide/source/api_full/fortran.rst index a885173ef3..3bb8358d4d 100644 --- a/docs/user_guide/source/api_full/fortran.rst +++ b/docs/user_guide/source/api_full/fortran.rst @@ -89,20 +89,12 @@ ADIOS2 Fortran bindings handlers are mapped 1-to-1 to the ADIOS2 components desc .. code-block:: fortran ! MPI versions - ! Debug mode = ON (.true.) by default subroutine adios2_init(adios, comm, ierr) subroutine adios2_init(adios, config_file, comm, ierr) - subroutine adios2_init(adios, comm, adios2_debug_mode, ierr) - subroutine adios2_init(adios, config_file, comm, adios2_debug_mode, ierr) - ! Non-MPI serial versions - ! Debug mode = ON (.true.) by default subroutine adios2_init(adios, ierr) subroutine adios2_init(adios, config_file, ierr) - - subroutine adios2_init(adios, adios2_debug_mode, ierr) - subroutine adios2_init(adios, config_file, adios2_debug_mode, ierr) ! WHERE: