Merge pull request #19 from soblin/develop

Develop

gallery/shapes_and_collections/patch_collection.cpp

 // example from
 // https://matplotlib.org/stable/gallery/shapes_and_collections/patch_collection.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-#include <pybind11/numpy.h>
-
 #include <matplotlibcpp17/pyplot.h>
 #include <matplotlibcpp17/patches.h>
 
@@ -12,8 +8,6 @@
 
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17::patches;
 using namespace matplotlibcpp17;

gallery/shapes_and_collections/patches_circle_rectangle.cpp

 // example from https://note.nkmk.me/python-matplotlib-patches-circle-rectangle
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 #include <matplotlibcpp17/patches.h>
 
 #include <algorithm>
-#include <iostream>
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17;
 using namespace matplotlibcpp17::patches;

gallery/statistics/errorbar.cpp

 // example from https://matplotlib.org/stable/gallery/statistics/errorbar.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <xtensor/xrandom.hpp>
 
 #include <random>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17;
 

gallery/statistics/hist.cpp

 // example from https://matplotlib.org/stable/gallery/statistics/hist.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <xtensor/xrandom.hpp>
 
-#include <random>
-
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17;
 

gallery/subplots_axes_and_figures/align_labels_demo.cpp

 // example from
 // https://matplotlib.org/stable/gallery/subplots_axes_and_figures/align_labels_demo.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <xtensor/xbuilder.hpp>
 
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using matplotlibcpp17::gridspec::GridSpec;
 using namespace matplotlibcpp17;

gallery/subplots_axes_and_figures/colorbar_placement.cpp

 // example from
 // https://matplotlib.org/stable/gallery/subplots_axes_and_figures/colorbar_placement.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <xtensor/xrandom.hpp>
 
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17;
 

gallery/subplots_axes_and_figures/gridspec_multicolumn.cpp

 // example from
 // https://matplotlib.org/stable/gallery/subplots_axes_and_figures/gridspec_multicolumn.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
-
 using namespace std;
-
 using matplotlibcpp17::gridspec::GridSpec;
 using namespace matplotlibcpp17;
 

gallery/subplots_axes_and_figures/multiple_figs_demo.cpp

 // example from
 // https://matplotlib.org/stable/gallery/subplots_axes_and_figures/multiple_figs_demo.html
 
-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <xtensor/xbuilder.hpp>
@@ -11,8 +8,6 @@
 
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17;
 

gallery/subplots_axes_and_figures/subplots.cpp

-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
-namespace py = pybind11;
-using namespace py::literals;
 using namespace std;
 using namespace matplotlibcpp17;
 

hello_world/hello_world.cpp

-#include <pybind11/embed.h>
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <vector>
 
-using namespace pybind11::literals;
-
 int main() {
   pybind11::scoped_interpreter guard{};
   auto plt = matplotlibcpp17::pyplot::import();

include/matplotlibcpp17/axes.h

@@ -243,9 +243,10 @@ private:
     LOAD_FUNC_ATTR(plot, self);
     // NOTE: only when called with projection='3d', `plot_surface`, `plot_wireframe`, `set_zlabel` prop exists.
     try {
-      plot_surface_attr = self.attr("plot_surface");
-      plot_wireframe_attr = self.attr("plot_wireframe");
-      set_zlabel_attr = self.attr("set_zlabel");
+      LOAD_FUNC_ATTR(plot_surface, self);
+      LOAD_FUNC_ATTR(plot_wireframe, self);
+      LOAD_FUNC_ATTR(set_zlabel, self);
+      LOAD_FUNC_ATTR(set_zlim, self);
       INFO_MSG("Loaded Axes3D");
       projection_3d = true;
     } catch (...) {
@@ -264,7 +265,6 @@ private:
     LOAD_FUNC_ATTR(set_ylabel, self);
     LOAD_FUNC_ATTR(set_ylim, self);
     LOAD_FUNC_ATTR(set_yticks, self);
-    LOAD_FUNC_ATTR(set_zlim, self);
     LOAD_FUNC_ATTR(text, self);
     LOAD_FUNC_ATTR(tick_params, self);
   }

include/matplotlibcpp17/pyplot.h

@@ -13,6 +13,9 @@
 #include <matplotlibcpp17/figure.h>
 
 #include <pybind11/pybind11.h>
+#include <pybind11/embed.h>
+#include <pybind11/stl.h>
+#include <pybind11/numpy.h>
 
 namespace matplotlibcpp17::pyplot {
 
@@ -364,10 +367,15 @@ PyPlot import() {
 
 } // namespace matplotlibcpp17::pyplot
 
+// Args & Kwargs
 template <typename... ArgsT> pybind11::tuple Args(ArgsT &&... args) {
   return pybind11::make_tuple(std::forward<ArgsT>(args)...);
 }
 
 using Kwargs = pybind11::dict;
 
+// Export this
+namespace py = pybind11;
+using namespace py::literals;
+
 #endif /* MATPLOTLIBCPP17_PYPLOT_H */

tests/test_shared_lib/test_lib.cpp

 // example from
 // https://matplotlib.org/stable/gallery/lines_bars_and_markers/simple_plot.html
 
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <algorithm>
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
-
 template <typename T> std::vector<T> arange(T start, T end, T h) {
   int N = static_cast<int>((end - start) / h);
   std::vector<T> xs(N);

tests/test_static_lib/test_lib.cpp

 // example from
 // https://matplotlib.org/stable/gallery/lines_bars_and_markers/simple_plot.html
 
-#include <pybind11/stl.h>
-
 #include <matplotlibcpp17/pyplot.h>
 
 #include <algorithm>
 #include <vector>
 
-namespace py = pybind11;
-using namespace py::literals;
-
 template <typename T> std::vector<T> arange(T start, T end, T h) {
   int N = static_cast<int>((end - start) / h);
   std::vector<T> xs(N);