Throw ValueError on bad Python function argument (#426)

SleipnirGroup · Mar 2, 2024 · bc1c59b · bc1c59b
1 parent 249c4b4
commit bc1c59b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/jormungandr/cpp/autodiff/BindVariableMatrices.cpp b/jormungandr/cpp/autodiff/BindVariableMatrices.cpp
@@ -169,9 +169,8 @@ void BindVariableMatrix(py::module_& autodiff,
       self.Block(rowOffset, colOffset, blockRows, blockCols) =
           value.cast<int>();
     } else {
-      fmt::println(
-          stderr,
-          "error: VariableMatrix.__setitem__ not implemented for value");
+      throw py::value_error(
+          "VariableMatrix.__setitem__ not implemented for value");
     }
   });
   variable_matrix.def(
@@ -340,10 +339,10 @@ void BindVariableMatrix(py::module_& autodiff,
 
         std::string input1_name = inputs[0].attr("__repr__")().cast<py::str>();
         std::string input2_name = inputs[1].attr("__repr__")().cast<py::str>();
-        fmt::println(stderr,
-                     "error: VariableMatrix: numpy method {}, ufunc {} not "
-                     "implemented for ({}, {})",
-                     method_name, ufunc_name, input1_name, input2_name);
+        throw py::value_error(
+            fmt::format("VariableMatrix: numpy method {}, ufunc {} not "
+                        "implemented for ({}, {})",
+                        method_name, ufunc_name, input1_name, input2_name));
         return py::cast(VariableMatrix{self});
       });
 
@@ -714,8 +713,8 @@ void BindVariableBlock(
       self.Block(rowOffset, colOffset, blockRows, blockCols) =
           value.cast<int>();
     } else {
-      fmt::println(
-          stderr, "error: VariableBlock.__setitem__ not implemented for value");
+      throw py::value_error(
+          "VariableBlock.__setitem__ not implemented for value");
     }
   });
   variable_block.def(
@@ -883,10 +882,10 @@ void BindVariableBlock(
 
         std::string input1_name = inputs[0].attr("__repr__")().cast<py::str>();
         std::string input2_name = inputs[1].attr("__repr__")().cast<py::str>();
-        fmt::println(stderr,
-                     "error: VariableBlock: numpy method {}, ufunc {} not "
-                     "implemented for ({}, {})",
-                     method_name, ufunc_name, input1_name, input2_name);
+        throw py::value_error(
+            fmt::format("VariableBlock: numpy method {}, ufunc {} not "
+                        "implemented for ({}, {})",
+                        method_name, ufunc_name, input1_name, input2_name));
         return py::cast(VariableMatrix{self});
       });
 

diff --git a/jormungandr/cpp/optimization/BindOptimizationProblem.cpp b/jormungandr/cpp/optimization/BindOptimizationProblem.cpp
@@ -2,7 +2,7 @@
 
 #include "optimization/BindOptimizationProblem.hpp"
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include <pybind11/functional.h>
 #include <pybind11/pytypes.h>
 #include <sleipnir/optimization/OptimizationProblem.hpp>