Remove DebugMode from all external APIs

ornladios · May 7, 2022 · 6abd622 · 6abd622
1 parent 1b4420f
commit 6abd622
Show file tree

Hide file tree

Showing 73 changed files with 146 additions and 275 deletions.
diff --git a/bindings/C/adios2/c/adios2_c_adios.cpp b/bindings/C/adios2/c/adios2_c_adios.cpp
@@ -42,13 +42,8 @@ adios2::ArrayOrdering adios2_ToArrayOrdering(const adios2_arrayordering Corder)
 }
 
 adios2_adios *adios2_init_config_glue_serial(const char *config_file,
-                                             const adios2_debug_mode debug_mode,
                                              const char *host_language)
 {
-    // The debug_mode argument is no longer used, but kept in the public
-    // API for compatibility.
-    static_cast<void>(debug_mode);
-
     adios2_adios *adios = nullptr;
     try
     {
@@ -67,13 +62,12 @@ adios2_adios *adios2_init_config_glue_serial(const char *config_file,
 
 adios2_adios *adios2_init_serial()
 {
-    return adios2_init_config_glue_serial("", adios2_debug_mode_off, "C");
+    return adios2_init_config_glue_serial("", "C");
 }
 
 adios2_adios *adios2_init_config_serial(const char *config_file)
 {
-    return adios2_init_config_glue_serial(config_file, adios2_debug_mode_off,
-                                          "C");
+    return adios2_init_config_glue_serial(config_file, "C");
 }
 
 adios2_io *adios2_declare_io(adios2_adios *adios, const char *name)

diff --git a/bindings/C/adios2/c/adios2_c_adios.h b/bindings/C/adios2/c/adios2_c_adios.h
@@ -22,8 +22,8 @@ extern "C" {
 #endif
 
 #if ADIOS2_USE_MPI
-#define adios2_init(comm, debug_mode) adios2_init_mpi(comm)
-#define adios2_init_config(config_file, comm, debug_mode)                      \
+#define adios2_init(comm) adios2_init_mpi(comm)
+#define adios2_init_config(config_file, comm)                                  \
     adios2_init_config_mpi(config_file, comm)
 
 /**
@@ -45,9 +45,8 @@ adios2_adios *adios2_init_mpi(MPI_Comm comm);
  */
 adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm);
 #else
-#define adios2_init(debug_mode) adios2_init_serial()
-#define adios2_init_config(config_file, debug_mode)                            \
-    adios2_init_config_serial(config_file)
+#define adios2_init() adios2_init_serial()
+#define adios2_init_config(config_file) adios2_init_config_serial(config_file)
 #endif
 
 /**

diff --git a/bindings/C/adios2/c/adios2_c_adios_mpi.cpp b/bindings/C/adios2/c/adios2_c_adios_mpi.cpp
@@ -17,7 +17,6 @@ extern "C" {
 // to be called from other languages, hidden from the public apis
 adios2_adios *adios2_init_config_glue_mpi(const char *config_file,
                                           MPI_Comm comm,
-                                          const adios2_debug_mode debug_mode,
                                           const char *host_language)
 {
     adios2_adios *adios = nullptr;
@@ -39,13 +38,12 @@ adios2_adios *adios2_init_config_glue_mpi(const char *config_file,
 
 adios2_adios *adios2_init_mpi(MPI_Comm comm)
 {
-    return adios2_init_config_glue_mpi("", comm, adios2_debug_mode_off, "C");
+    return adios2_init_config_glue_mpi("", comm, "C");
 }
 
 adios2_adios *adios2_init_config_mpi(const char *config_file, MPI_Comm comm)
 {
-    return adios2_init_config_glue_mpi(config_file, comm, adios2_debug_mode_off,
-                                       "C");
+    return adios2_init_config_glue_mpi(config_file, comm, "C");
 }
 
 } // end extern C
diff --git a/bindings/C/adios2/c/adios2_c_types.h b/bindings/C/adios2/c/adios2_c_types.h
@@ -40,8 +40,7 @@ typedef enum
     adios2_error_none = 0,
 
     /**
-     * user input error, on when adios2_debug_mode_on is passed to adios2_init
-     * or adios2_init_config
+     * user input error
      */
     adios2_error_invalid_argument = 1,
 
@@ -62,12 +61,6 @@ typedef enum
     adios2_true = 1,
 } adios2_bool;
 
-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
@@ -15,15 +15,6 @@
 #include "adios2/common/ADIOSMacros.h"
 #include "adios2/common/ADIOSTypes.h"
 
-namespace adios2
-{
-
-// adios alias values and types.  These not used internally and deprecated.
-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.cpp b/bindings/CXX11/adios2/cxx11/ADIOS.cpp
@@ -15,17 +15,16 @@
 
 namespace adios2
 {
-ADIOS::ADIOS(const std::string &configFile, const bool debugMode)
+ADIOS::ADIOS(const std::string &configFile)
 : m_ADIOS(std::make_shared<core::ADIOS>(configFile, "C++"))
 {
 }
 
 ADIOS::ADIOS(const char *configFile) : ADIOS(std::string(configFile), "C++") {}
 
-ADIOS::ADIOS(const bool debugMode) : ADIOS("", "C++") {}
+ADIOS::ADIOS() : ADIOS("", "C++") {}
 
-ADIOS::ADIOS(const std::string &configFile, const std::string &hostLanguage,
-             const bool debugMode)
+ADIOS::ADIOS(const std::string &configFile, const std::string &hostLanguage)
 : m_ADIOS(std::make_shared<core::ADIOS>(configFile, hostLanguage))
 {
 }

diff --git a/bindings/CXX11/adios2/cxx11/ADIOS.h b/bindings/CXX11/adios2/cxx11/ADIOS.h
@@ -46,10 +46,9 @@ class ADIOS
      * Starting point for MPI apps. Creates an ADIOS object.
      * MPI Collective Operation as it call MPI_Comm_dup
      * @param comm defines domain scope from application
-     * @param debugMode is deprecated and has no effect on library behavior
      * @exception std::invalid_argument if user input is incorrect
      */
-    ADIOS(MPI_Comm comm, const bool debugMode = true);
+    ADIOS(MPI_Comm comm);
 
     /**
      * Starting point for MPI apps. Creates an ADIOS object allowing a
@@ -58,11 +57,9 @@ class ADIOS
      * configFile contents
      * @param configFile runtime config file
      * @param comm defines domain scope from application
-     * @param debugMode is deprecated and has no effect on library behavior
      * @exception std::invalid_argument if user input is incorrect
      */
-    ADIOS(const std::string &configFile, MPI_Comm comm,
-          const bool debugMode = true);
+    ADIOS(const std::string &configFile, MPI_Comm comm);
 
     /** extra constructor for R and other languages that use the
      * public C++ API but has data in column-major. Pass "" for configfile
@@ -74,7 +71,7 @@ class ADIOS
      *     e.g. adios2::ADIOS("", comm, "Fortran", false);
      */
     ADIOS(const std::string &configFile, MPI_Comm comm,
-          const std::string &hostLanguage, const bool debugMode);
+          const std::string &hostLanguage);
 #else
     // Client code that does not enable ADIOS2_USE_MPI may accidentally
     // try to pass a MPI_Comm instance to our constructor.  If the type
@@ -95,10 +92,9 @@ class ADIOS
      * Starting point for non-MPI serial apps. Creates an ADIOS object allowing
      * a runtime config file.
      * @param configFile runtime config file
-     * @param debugMode is deprecated and has no effect on library behavior
      * @exception std::invalid_argument if user input is incorrect
      */
-    ADIOS(const std::string &configFile, const bool debugMode = true);
+    ADIOS(const std::string &configFile);
 
     /**
      * Starting point for non-MPI serial apps. Creates an ADIOS object allowing
@@ -110,10 +106,9 @@ class ADIOS
 
     /**
      * Starting point for non-MPI apps. Creates an ADIOS object
-     * @param debugMode is deprecated and has no effect on library behavior
      * @exception std::invalid_argument if user input is incorrect
      */
-    ADIOS(const bool debugMode = true);
+    ADIOS();
 
     /** extra constructor for R and other languages that use the
      * public C++ API but has data in column-major. Pass "" for configfile
@@ -124,8 +119,7 @@ class ADIOS
      * treat all arrays column-major
      *    e.g. adios2::ADIOS("", "Fortran", false);
      */
-    ADIOS(const std::string &configFile, const std::string &hostLanguage,
-          const bool debugMode);
+    ADIOS(const std::string &configFile, const std::string &hostLanguage);
 
     /** object inspection true: valid object, false: invalid object */
     explicit operator bool() const noexcept;

diff --git a/bindings/CXX11/adios2/cxx11/ADIOSMPI.cpp b/bindings/CXX11/adios2/cxx11/ADIOSMPI.cpp
@@ -12,16 +12,16 @@
 
 namespace adios2
 {
-ADIOS::ADIOS(const std::string &configFile, MPI_Comm comm, const bool debugMode)
+ADIOS::ADIOS(const std::string &configFile, MPI_Comm comm)
 : m_ADIOS(std::make_shared<core::ADIOS>(configFile, helper::CommDupMPI(comm),
                                         "C++"))
 {
 }
 
-ADIOS::ADIOS(MPI_Comm comm, const bool debugMode) : ADIOS("", comm) {}
+ADIOS::ADIOS(MPI_Comm comm) : ADIOS("", comm) {}
 
 ADIOS::ADIOS(const std::string &configFile, MPI_Comm comm,
-             const std::string &hostLanguage, const bool debugMode = true)
+             const std::string &hostLanguage)
 : m_ADIOS(std::make_shared<core::ADIOS>(configFile, helper::CommDupMPI(comm),
                                         hostLanguage))
 {

diff --git a/bindings/Fortran/f2c/adios2_f2c_adios.cpp b/bindings/Fortran/f2c/adios2_f2c_adios.cpp
@@ -15,28 +15,24 @@ extern "C" {
 #endif
 
 // this function is not exposed in the public APIs
-extern adios2_adios *
-adios2_init_config_glue_serial(const char *config_file,
-                               const adios2_debug_mode debug_mode,
-                               const char *host_language);
+extern adios2_adios *adios2_init_config_glue_serial(const char *config_file,
+                                                    const char *host_language);
 
 void FC_GLOBAL(adios2_init_config_serial_f2c,
                ADIOS2_INIT_CONFIG_SERIAL_F2C)(adios2_adios **adios,
                                               const char *config_file,
-                                              const int *debug_mode, int *ierr)
+                                              int *ierr)
 {
-    *adios = adios2_init_config_glue_serial(
-        config_file, static_cast<adios2_debug_mode>(*debug_mode), "Fortran");
+    *adios = adios2_init_config_glue_serial(config_file, "Fortran");
     *ierr = (*adios == NULL) ? static_cast<int>(adios2_error_exception)
                              : static_cast<int>(adios2_error_none);
 }
 
 void FC_GLOBAL(adios2_init_serial_f2c,
-               ADIOS2_INIT_SERIAL_F2C)(adios2_adios **adios,
-                                       const int *debug_mode, int *ierr)
+               ADIOS2_INIT_SERIAL_F2C)(adios2_adios **adios, int *ierr)
 {
     FC_GLOBAL(adios2_init_config_serial_f2c, ADIOS2_INIT_CONFIG_SERIAL_F2C)
-    (adios, "", debug_mode, ierr);
+    (adios, "", ierr);
 }
 
 void FC_GLOBAL(adios2_declare_io_f2c,

diff --git a/bindings/Fortran/f2c/adios2_f2c_adios_mpi.cpp b/bindings/Fortran/f2c/adios2_f2c_adios_mpi.cpp
@@ -12,29 +12,26 @@
 extern "C" {
 
 // this function is not exposed in the public APIs
-extern adios2_adios *
-adios2_init_config_glue_mpi(const char *config_file, MPI_Comm comm,
-                            const adios2_debug_mode debug_mode,
-                            const char *host_language);
+extern adios2_adios *adios2_init_config_glue_mpi(const char *config_file,
+                                                 MPI_Comm comm,
+                                                 const char *host_language);
 
 void FC_GLOBAL(adios2_init_config_mpi_f2c,
                ADIOS2_INIT_CONFIG_MPI_F2C)(adios2_adios **adios,
                                            const char *config_file,
-                                           MPI_Fint *comm,
-                                           const int *debug_mode, int *ierr)
+                                           MPI_Fint *comm, int *ierr)
 {
-    *adios = adios2_init_config_glue_mpi(
-        config_file, MPI_Comm_f2c(*comm),
-        static_cast<adios2_debug_mode>(*debug_mode), "Fortran");
+    *adios = adios2_init_config_glue_mpi(config_file, MPI_Comm_f2c(*comm),
+                                         "Fortran");
     *ierr = (*adios == NULL) ? static_cast<int>(adios2_error_exception)
                              : static_cast<int>(adios2_error_none);
 }
 
-void FC_GLOBAL(adios2_init_mpi_f2c,
-               ADIOS2_INIT_MPI_F2C)(adios2_adios **adios, MPI_Fint *comm,
-                                    const int *debug_mode, int *ierr)
+void FC_GLOBAL(adios2_init_mpi_f2c, ADIOS2_INIT_MPI_F2C)(adios2_adios **adios,
+                                                         MPI_Fint *comm,
+                                                         int *ierr)
 {
     FC_GLOBAL(adios2_init_config_mpi_f2c, ADIOS2_INIT_CONFIG_MPI_F2C)
-    (adios, "", comm, debug_mode, ierr);
+    (adios, "", comm, ierr);
 }
 }
diff --git a/bindings/Fortran/modules/adios2_adios_init_mod.F90 b/bindings/Fortran/modules/adios2_adios_init_mod.F90
@@ -14,48 +14,24 @@ module adios2_adios_init_mod
 
     interface adios2_init
 
-        module subroutine adios2_init_serial(adios, adios2_debug_mode, ierr)
+        module subroutine adios2_init_serial(adios, ierr)
             type(adios2_adios), intent(out) :: adios
-            logical, intent(in) :: adios2_debug_mode
             integer, intent(out) :: ierr
         end subroutine
-        module subroutine adios2_init_debug_serial(adios, ierr)
-            type(adios2_adios), intent(out) :: adios
-            integer, intent(out) :: ierr
-        end subroutine
-        module subroutine adios2_init_config_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
-        module subroutine adios2_init_config_debug_serial(adios, config_file, ierr)
+        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
 
 # ifdef ADIOS2_HAVE_MPI_F
 
-        module subroutine adios2_init_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_debug_mpi(adios, comm, ierr)
-            type(adios2_adios), intent(out) :: adios
-            integer, intent(in) :: comm
-            integer, intent(out) :: ierr
-        end subroutine
-        module subroutine adios2_init_config_mpi(adios, config_file, comm, adios2_debug_mode, ierr)
+        module subroutine adios2_init_mpi(adios, comm, 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
-        module subroutine adios2_init_config_debug_mpi(adios, config_file, comm, ierr)
+        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