Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated bindings for release #3494

Merged
merged 2 commits into from Feb 22, 2023
Merged

Remove deprecated bindings for release #3494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef57bf6
Remove Deprecated bindings for release
eisenhauer Feb 21, 2023
7aedab8
Kill internal comments that mention debug mode
eisenhauer Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions bindings/C/adios2/c/adios2_c_adios.cpp
View file
Open in desktop
Expand Up @@ -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;
Expand Down
25 changes: 5 additions & 20 deletions bindings/C/adios2/c/adios2_c_adios.h
View file
Open in desktop
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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

/**
Expand All @@ -65,20 +57,13 @@ 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.
* @return success: handler, failure: NULL
*/
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
Expand Down
11 changes: 0 additions & 11 deletions bindings/C/adios2/c/adios2_c_adios_mpi.cpp
View file
Open in desktop
Expand Up @@ -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
7 changes: 0 additions & 7 deletions bindings/C/adios2/c/adios2_c_types.h
View file
Open in desktop
Expand Up @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions bindings/CXX11/adios2.h
View file
Open in desktop
Expand Up @@ -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"
Expand Down
37 changes: 0 additions & 37 deletions bindings/CXX11/adios2/cxx11/ADIOS.h
View file
Open in desktop
Expand Up @@ -55,11 +55,6 @@ class ADIOS
*/
ADIOS(MPI_Comm comm);

template <typename TDebugMode, enable_if_bool<TDebugMode> 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.
Expand All @@ -71,13 +66,6 @@ class ADIOS
*/
ADIOS(const std::string &configFile, MPI_Comm comm);

template <typename TDebugMode, enable_if_bool<TDebugMode> 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
Expand All @@ -90,13 +78,6 @@ class ADIOS
ADIOS(const std::string &configFile, MPI_Comm comm,
const std::string &hostLanguage);

template <typename TDebugMode, enable_if_bool<TDebugMode> Enable = true>
ADIOS2_DEPRECATED ADIOS(const std::string &configFile, MPI_Comm comm,
const std::string &hostLanguage, TDebugMode)
: ADIOS(configFile, comm, hostLanguage)
{
}

#endif

/**
Expand All @@ -107,23 +88,12 @@ class ADIOS
*/
ADIOS(const std::string &configFile);

template <typename TDebugMode, enable_if_bool<TDebugMode> 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 <typename TDebugMode, enable_if_bool<TDebugMode> 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
Expand All @@ -135,13 +105,6 @@ class ADIOS
*/
ADIOS(const std::string &configFile, const std::string &hostLanguage);

template <typename TDebugMode, enable_if_bool<TDebugMode> 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;

Expand Down
33 changes: 0 additions & 33 deletions bindings/Fortran/modules/adios2_adios_init_mod.F90
View file
Open in desktop
Expand Up @@ -16,48 +16,24 @@ 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)
type(adios2_adios), intent(out) :: adios
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
Expand All @@ -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
25 changes: 0 additions & 25 deletions bindings/Fortran/modules/adios2_adios_init_mpi_smod.F90
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
23 changes: 0 additions & 23 deletions bindings/Fortran/modules/adios2_adios_init_serial_smod.F90
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions bindings/Fortran/modules/adios2_parameters_mod.f90
View file
Open in desktop
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions docs/user_guide/source/api_full/fortran.rst
View file
Open in desktop
Expand Up @@ -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:

Expand Down