move py::object, ditch some needles try-catch blocks

Author: franzpoeschel

include/openPMD/binding/python/Numpy.hpp

@@ -98,11 +98,11 @@ inline Datatype dtype_from_numpy(pybind11::dtype const dt)
     }
 }
 
-inline Datatype dtype_from_numpy(pybind11::object const &dt)
+inline Datatype dtype_from_numpy(pybind11::object dt)
 {
     if (py::isinstance<pybind11::dtype>(dt))
     {
-        return dtype_from_numpy(py::cast<pybind11::dtype>(dt));
+        return dtype_from_numpy(py::cast<pybind11::dtype>(std::move(dt)));
     }
     else
     {
@@ -119,22 +119,11 @@ inline Datatype dtype_from_numpy(pybind11::object const &dt)
                     "datatype without numpy, failed importing: ") +
                 e.what());
         }
-        pybind11::object create_dtype;
-        try
-        {
-            create_dtype = numpy.attr("dtype");
-        }
-        catch (std::exception const &e)
-        {
-            throw std::runtime_error(
-                std::string(
-                    "dtype_from_numpy: Failed to access numpy.dtype: ") +
-                e.what());
-        }
+        pybind11::object create_dtype = numpy.attr("dtype");
         pybind11::object dtype_obj;
         try
         {
-            dtype_obj = create_dtype(dt);
+            dtype_obj = create_dtype(std::move(dt));
         }
         catch (std::exception const &e)
         {
@@ -143,16 +132,7 @@ inline Datatype dtype_from_numpy(pybind11::object const &dt)
                 pybind11::str(dt).cast<std::string>() +
                 std::string(", error: ") + e.what());
         }
-        try
-        {
-            return dtype_from_numpy(py::cast<pybind11::dtype>(dtype_obj));
-        }
-        catch (std::exception const &e)
-        {
-            throw std::runtime_error(
-                std::string("dtype_from_numpy: Failed to cast to dtype: ") +
-                e.what());
-        }
+        return dtype_from_numpy(py::cast<pybind11::dtype>(dtype_obj));
     }
 }
 

src/binding/python/Dataset.cpp

@@ -25,6 +25,7 @@
 #include "openPMD/binding/python/auxiliary.hpp"
 
 #include <string>
+#include <utility>
 
 void init_Dataset(py::module &m)
 {
@@ -37,11 +38,10 @@ void init_Dataset(py::module &m)
                 py::arg("extent"),
                 py::arg("options") = "{}")
             .def(
-                py::init(
-                    [](py::object const &dt, Extent e, std::string options) {
-                        auto const d = dtype_from_numpy(dt);
-                        return new Dataset{d, std::move(e), std::move(options)};
-                    }),
+                py::init([](py::object dt, Extent e, std::string options) {
+                    auto const d = dtype_from_numpy(std::move(dt));
+                    return new Dataset{d, std::move(e), std::move(options)};
+                }),
                 py::arg("dtype"),
                 py::arg("extent"),
                 py::arg("options") = "{}")

src/binding/python/RecordComponent.cpp

@@ -50,6 +50,7 @@
 #include <string>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 /** Convert a py::tuple of py::slices to Offset & Extent
@@ -995,9 +996,10 @@ void init_RecordComponent(py::module &m)
         .def(
             "make_empty",
             [](RecordComponent &rc,
-               pybind11::object const &dt,
+               pybind11::object dt,
                uint8_t dimensionality) {
-                return rc.makeEmpty(dtype_from_numpy(dt), dimensionality);
+                return rc.makeEmpty(
+                    dtype_from_numpy(std::move(dt)), dimensionality);
             })
 
         // deprecated: pass-through C++ API