CHG: Add debug statements and use consistent container naming

RUrlus · Oct 23, 2023 · 858bd53 · 858bd53
1 parent b5f0bcf
commit 858bd53
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/include/carma_bits/base/numpy_converters.hpp b/include/carma_bits/base/numpy_converters.hpp
@@ -1,7 +1,8 @@
 #pragma once
 #include <armadillo>
 #include <carma_bits/base/config.hpp>
-#include <carma_bits/base/converter_types.hpp>
+#include <carma_bits/base/numpy_converters.hpp>
+#include <carma_bits/converter_types.hpp>
 #include <carma_bits/internal/common.hpp>
 #include <carma_bits/internal/numpy_container.hpp>
 #include <carma_bits/internal/numpy_converters.hpp>
@@ -27,13 +28,21 @@ struct NumpyConverter {
             "|carma| `memory_order_policy` must be one of: ColumnOrder, "
             "TransposedRowOrder."
         );
-        NumpyContainer view(src);
-        FitsArmaType().check<armaT>(view);
-        memory_order_policy().template check<armaT>(view);
-        if (CARMA_UNLIKELY(src.ill_conditioned || src.order_copy)) {
-            return CopyIntoConverter().get<armaT>(src);
+        NumpyContainer container(src);
+        FitsArmaType().check<armaT>(container);
+        memory_order_policy().template check<armaT>(container);
+        if (CARMA_UNLIKELY(container.ill_conditioned || container.order_copy)) {
+            carma_debug_print(
+                "Using CopyIntoConverter, array ",
+                container.arr,
+                " does not meet the required conditions and must be copied into the Arma object using Numpy."
+            );
+            return CopyIntoConverter().get<armaT>(container);
         }
-        return CopyInConverter().get<armaT>(src);
+        carma_debug_print(
+            "Using CopyInConverter, array ", container.arr, " will be copied in by Arma object's constructor."
+        );
+        return CopyInConverter().get<armaT>(container);
     }
 };
 

diff --git a/include/carma_bits/extension/numpy_converters.hpp b/include/carma_bits/extension/numpy_converters.hpp
@@ -139,13 +139,13 @@ struct NumpyConverter {
             "references"
         );
 #endif
-        NumpyContainer view(src);
+        NumpyContainer container(src);
 #ifdef CARMA_EXTRA_DEBUG
-        NumpyConverterInfo<armaT, numpyT, converter, resolution_policy, memory_order_policy>()(view);
+        NumpyConverterInfo<armaT, numpyT, converter, resolution_policy, memory_order_policy>()(container);
 #endif  // CARMA_EXTRA_DEBUG
-        FitsArmaType().check<armaT>(view);
-        memory_order_policy().template check<armaT>(view);
-        return resolution_policy().template resolve<armaT, converter>(view);
+        FitsArmaType().check<armaT>(container);
+        memory_order_policy().template check<armaT>(container);
+        return resolution_policy().template resolve<armaT, converter>(container);
     }
 };
 

diff --git a/include/carma_bits/internal/numpy_container.hpp b/include/carma_bits/internal/numpy_container.hpp
@@ -75,7 +75,7 @@ class NumpyContainer {
     template <typename armaT, iff_Arma<armaT> = 0>
     inline void copy_into(armaT& dest) {
         using eT = typename armaT::elem_type;
-        carma_debug_print("Copying data of array ", obj, " to ", dest.memptr(), " using Numpy.");
+        carma_extra_debug_print("Copying data of array ", obj, " to ", dest.memptr(), " using Numpy.");
         auto api = npy_api::get();
         // make the temporary array writeable and mark the memory as aligned and give the order of the arma object
         int flags
@@ -100,7 +100,7 @@ class NumpyContainer {
     }  // copy_into
 
     inline void make_arma_compatible() {
-        carma_debug_print("Copying array ", obj, " to Arma compatible layout using Numpy.");
+        carma_extra_debug_print("Copying array ", obj, " to Arma compatible layout using Numpy.");
         auto api = npy_api::get();
         PyObject* dest_obj = api.PyArray_NewLikeArray_(arr, NPY_FORTRANORDER, nullptr, 0);
         auto dest_arr = reinterpret_cast<PyArrayObject*>(dest_obj);