Get rid of global_debug and global_verbose -- move those some day to logger

Author: lums658

apis/python/src/tiledb/vector_search/module.cc

@@ -11,8 +11,6 @@
 namespace py = pybind11;
 using Ctx = tiledb::Context;
 
-bool global_debug = false;
-
 bool enable_stats = false;
 std::vector<json> core_stats;
 
@@ -535,9 +533,11 @@ PYBIND11_MODULE(_tiledbvspy, m) {
     return json{core_stats}.dump();
   });
 
+#if 0
   m.def("set_debug", [](bool debug) {
     global_debug = debug;
   });
+#endif
 
   declare_vq_query_heap<uint8_t>(m, "u8");
   declare_vq_query_heap<float>(m, "f32");

src/include/detail/linalg/linalg_defs.h

@@ -40,8 +40,4 @@ using namespace Kokkos;
 using namespace Kokkos::Experimental;
 }  // namespace stdx
 
-extern bool global_verbose;
-extern bool global_debug;
-extern std::string global_region;
-
 #endif  // TDB_LINALG_DEFS_H

src/include/detail/linalg/matrix.h

@@ -293,9 +293,11 @@ std::string matrix_info(const std::span<T>& A, const std::string& msg = "") {
   return str;
 }
 
+static bool matrix_printf = false;
+
 template <class Matrix>
 void debug_matrix(const Matrix& A, const std::string& msg = "") {
-  if (global_debug) {
+  if (matrix_printf) {
     std::cout << matrix_info(A, msg) << std::endl;
   }
 }
@@ -306,7 +308,7 @@ void debug_slice(
     const std::string& msg = "",
     size_t rows = 5,
     size_t cols = 15) {
-  if (global_debug) {
+  if (matrix_printf) {
     rows = std::min(rows, A.num_rows());
     cols = std::min(cols, A.num_cols());
 
@@ -328,7 +330,7 @@ void debug_slices_diff(
     const std::string& msg = "",
     size_t rows = 5,
     size_t cols = 15) {
-  if (global_debug) {
+  if (matrix_printf) {
     rows = std::min(rows, A.num_rows());
     cols = std::min(cols, A.num_cols());
 

src/include/detail/linalg/tdb_io.h

@@ -45,9 +45,6 @@ void create_matrix(
     const tiledb::Context& ctx,
     const Matrix<T, LayoutPolicy, I>& A,
     const std::string& uri) {
-  if (global_debug) {
-    std::cerr << "# Creating Matrix: " << uri << std::endl;
-  }
 
   // @todo: make this a parameter
   size_t num_parts = 10;
@@ -86,9 +83,6 @@ void write_matrix(
     size_t start_pos = 0,
     bool create = true) {
   scoped_timer _{tdb_func__ + " " + std::string{uri}};
-  if (global_debug) {
-    std::cerr << "# Writing Matrix: " << uri << std::endl;
-  }
 
   if (create) {
     create_matrix<T, LayoutPolicy, I>(ctx, A, uri);
@@ -124,9 +118,6 @@ void write_matrix(
 template <class T>
 void create_vector(
     const tiledb::Context& ctx, std::vector<T>& v, const std::string& uri) {
-  if (global_debug) {
-    std::cerr << "# Creating std::vector: " << uri << std::endl;
-  }
 
   size_t num_parts = 10;
   size_t tile_extent = (size(v) + num_parts - 1) / num_parts;
@@ -156,10 +147,6 @@ void write_vector(
     bool create = true) {
   scoped_timer _{tdb_func__ + " " + std::string{uri}};
 
-  if (global_debug) {
-    std::cerr << "# Writing std::vector: " << uri << std::endl;
-  }
-
   if (create) {
     create_vector<T>(ctx, v, uri);
   }
@@ -197,10 +184,6 @@ std::vector<T> read_vector(
     size_t end_pos = 0) {
   scoped_timer _{tdb_func__ + " " + std::string{uri}};
 
-  if (global_debug) {
-    std::cerr << "# Reading std::vector: " << uri << std::endl;
-  }
-
   tiledb::Array array_ =
       tiledb_helpers::open_array(tdb_func__, ctx, uri, TILEDB_READ);
   auto schema_ = array_.schema();

src/include/detail/linalg/tdb_partitioned_matrix.h

@@ -62,10 +62,6 @@ using namespace Kokkos;
 using namespace Kokkos::Experimental;
 }  // namespace stdx
 
-extern bool global_verbose;
-extern bool global_debug;
-extern std::string global_region;
-
 /**
  *
  * @note The template parameters indices_type and parts_type are deduced using

src/include/test/unit_ivf_index.cc

@@ -38,8 +38,6 @@
 #include "../ivf_index.h"
 #include "../linalg.h"
 
-bool global_debug = false;
-
 TEST_CASE("ivf_index: test test", "[ivf_index]") {
   REQUIRE(true);
 }

src/include/test/unit_ivf_qv.cc

@@ -36,9 +36,6 @@
 #include "detail/linalg/tdb_io.h"
 #include "query_common.h"
 
-bool global_verbose = false;
-bool global_debug = true;
-
 TEST_CASE("qv: test test", "[qv]") {
   REQUIRE(true);
 }

src/include/test/unit_ivf_vq.cc

@@ -37,9 +37,6 @@
 #include "query_common.h"
 #include "utils/utils.h"
 
-bool global_verbose = false;
-bool global_debug = false;
-
 TEST_CASE("vq: test test", "[ivf vq]") {
   REQUIRE(true);
 }

src/include/test/unit_linalg.cc

@@ -37,8 +37,6 @@
 #include "linalg.h"
 #include "utils/utils.h"
 
-bool global_debug = false;
-
 using TestTypes =
     std::tuple<float, uint8_t, double, int, char, size_t, uint32_t>;
 

src/include/test/unit_matrix.cc

@@ -34,8 +34,6 @@
 #include <vector>
 #include "detail/linalg/matrix.h"
 
-bool global_debug = false;
-
 using TestTypes = std::tuple<float, double, int, char, size_t, uint32_t>;
 
 TEST_CASE("matrix: test test", "[matrix]") {