Merge pull request #14 from soblin/develop

Develop

Author: soblin

CMakeLists.txt

@@ -10,7 +10,29 @@ project(
 find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 find_package(pybind11 2.4.3 REQUIRED)
 
-set(matplotlibcpp17_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+# check matplotlib minor version
+execute_process(
+  COMMAND
+  "python3" "-c"
+  "import matplotlib;
+print(str(matplotlib.__version__))"
+  RESULT_VARIABLE MATPLOTLIB_VERSION_CHECKING
+  OUTPUT_VARIABLE MATPLOTLIB_VERSION
+  )
+
+if(NOT MATPLOTLIB_VERSION_CHECKING MATCHES 0)
+  message(FATAL_ERROR
+    "Could not check matplotlib.__version__")
+endif()
+message(STATUS "Detected matplotlib version is ${MATPLOTLIB_VERSION}")
+if(${MATPLOTLIB_VERSION} VERSION_LESS 3.4)
+  message(WARNING "Detected matplotlib version is < 3.4.0")
+  set(MATPLOTLIB_MINOR_VER_GTE_4 0)
+else()
+  set(MATPLOTLIB_MINOR_VER_GTE_4 1)
+endif()
+
 
 # gallery
 if(NOT DEFINED USE_GUI)
@@ -20,6 +42,8 @@ if(NOT DEFINED ADD_DEMO)
   set(ADD_DEMO 1)
 endif()
 
+set(matplotlibcpp17_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
 function(add_demo name path)
   add_executable(${name} ${path})
   target_include_directories(${name} PUBLIC
@@ -31,9 +55,9 @@ endfunction()
 
 if(${ADD_DEMO})
   find_package(Python3 COMPONENTS NumPy REQUIRED)
-  find_package(xtensor REQUIRED)
+  find_package(xtensor 0.24.0 REQUIRED)
   set(CMAKE_CXX_STANDARD 17)
-  set(CMAKE_CXX_FLAGS "-Wall -g -DUSE_GUI=${USE_GUI}")
+  set(CMAKE_CXX_FLAGS "-Wall -g -DUSE_GUI=${USE_GUI} -DMATPLOTLIB_MINOR_VER_GTE_4=${MATPLOTLIB_MINOR_VER_GTE_4}")
   add_subdirectory(gallery/lines_bars_and_markers)
   add_subdirectory(gallery/subplots_axes_and_figures)
   add_subdirectory(gallery/statistics)
@@ -96,6 +120,9 @@ install(EXPORT ${PROJECT_NAME}_Targets
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}
   DESTINATION include
   )
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+# create .deb
+include("${PROJECT_SOURCE_DIR}/cmake/package.cmake")
 
 # uninstall target
 ## actually it's just `xargs rm < install_manifest.txt`

cmake/package.cmake

@@ -0,0 +1,23 @@
+# https://decovar.dev/blog/2021/09/23/cmake-cpack-package-deb-apt/
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CMAKE_PROJECT_DESCRIPTION})
+set(CPACK_VERBATIM_VARIABLES YES)
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+SET(CPACK_OUTPUT_FILE_PREFIX "${PROJECT_BINARY_DIR}/")
+set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_PACKAGE_CONTACT "example@example.com")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Deb Example")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+# package name for deb
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)
+# without this you won't be able to pack only specified component
+set(CPACK_DEB_COMPONENT_INSTALL YES)
+
+include(CPack)
+
+# run cpack -G DEB to create .deb

gallery/lines_bars_and_markers/CMakeLists.txt

@@ -6,10 +6,11 @@ add_demo(fill_between_demo fill_between_demo.cpp)
 add_demo(fill_betweenx_demo fill_betweenx_demo.cpp)
 add_demo(scatter_with_legend scatter_with_legend.cpp)
 add_demo(scatter_hist scatter_hist.cpp)
+add_demo(errorbar_limits_simple errorbar_limits_simple.cpp)
+add_demo(errorbar_subsample errorbar_subsample.cpp)
 
-# TODO: macro for this!
 add_custom_target(lines_bars_and_markers
-  DEPENDS bar_label_demo fill simple_plot scatter_symbol fill_between_demo fill_betweenx_demo scatter_with_legend scatter_hist
+  DEPENDS bar_label_demo fill simple_plot scatter_symbol fill_between_demo fill_betweenx_demo scatter_with_legend scatter_hist errorbar_limits_simple errorbar_subsample
   COMMAND bar_label_demo
   COMMAND fill
   COMMAND simple_plot
@@ -18,6 +19,8 @@ add_custom_target(lines_bars_and_markers
   COMMAND fill_betweenx_demo
   COMMAND scatter_with_legend
   COMMAND scatter_hist
+  COMMAND errorbar_limits_simple
+  COMMAND errorbar_subsample
   COMMENT "running lines_bars_and_markers"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../images"
 )

gallery/lines_bars_and_markers/errorbar_limits_simple.cpp

@@ -0,0 +1,54 @@
+// example
+// https://matplotlib.org/stable/gallery/lines_bars_and_markers/errorbar_limits_simple.html
+
+#include <pybind11/embed.h>
+#include <pybind11/stl.h>
+
+#include <matplotlibcpp17/pyplot.h>
+
+#include <xtensor/xbuilder.hpp>
+#include <xtensor/xmath.hpp>
+
+#include <vector>
+
+namespace py = pybind11;
+using namespace py::literals;
+using namespace std;
+using namespace matplotlibcpp17;
+
+int main() {
+  py::scoped_interpreter guard{};
+  auto plt = pyplot::import();
+  auto fig = plt.figure();
+  auto x_ = xt::arange(0.0, 10.0, 1.0);
+  auto y_ = 2.5 * xt::sin(x_ / 20 * M_PI);
+  auto y1_ = y_ + 1.0, y2_ = y_ + 2.0, y3_ = y_ + 3.0;
+  auto yerr_ = xt::linspace(0.05, 0.2, 10);
+  vector<double> x(x_.begin(), x_.end()), y(y_.begin(), y_.end()),
+      yerr(yerr_.begin(), yerr_.end()), y3(y3_.begin(), y3_.end()),
+      y2(y2_.begin(), y2_.end()), y1(y1_.begin(), y1_.end());
+  plt.errorbar(Args(x, y3),
+               Kwargs("yerr"_a = yerr, "label"_a = "both limits (default)"));
+  plt.errorbar(Args(x, y2), Kwargs("yerr"_a = yerr, "uplims"_a = true,
+                                   "label"_a = "uplims=True"));
+  plt.errorbar(Args(x, y1),
+               Kwargs("yerr"_a = yerr, "uplims"_a = true, "lolims"_a = true,
+                      "label"_a = "uplims=True, lolims=True"));
+
+  vector<bool> upperlimits, lowerlimits;
+  for (auto i : {0, 1, 2, 3, 4}) {
+    upperlimits.push_back(true);
+    upperlimits.push_back(false);
+    lowerlimits.push_back(false);
+    lowerlimits.push_back(true);
+  }
+  plt.errorbar(Args(x, y), Kwargs("yerr"_a = yerr, "uplims"_a = upperlimits,
+                                  "lolims"_a = lowerlimits,
+                                  "label"_a = "subsets of uplims and lolims"));
+  plt.legend(Args(), Kwargs("loc"_a = "lower right"));
+#if USE_GUI
+  plt.show();
+#else
+  plt.savefig(Args("errorbar_limits_simple.png"));
+#endif
+}

gallery/lines_bars_and_markers/errorbar_subsample.cpp

@@ -0,0 +1,54 @@
+// example from
+// https://matplotlib.org/stable/gallery/lines_bars_and_markers/errorbar_subsample.html
+
+#include <pybind11/embed.h>
+#include <pybind11/stl.h>
+
+#include <matplotlibcpp17/pyplot.h>
+
+#include <xtensor/xbuilder.hpp>
+#include <xtensor/xmath.hpp>
+
+#include <vector>
+
+namespace py = pybind11;
+using namespace py::literals;
+using namespace std;
+using namespace matplotlibcpp17;
+
+int main() {
+  auto x_ = xt::arange(0.1, 4.0, 0.1);
+  auto y1_ = xt::exp(-1.0 * x_);
+  auto y2_ = xt::exp(-0.5 * x_);
+  auto y1err_ = 0.1 + 0.1 * xt::sqrt(x_);
+  auto y2err_ = 0.1 + 0.1 * xt::sqrt(x_ / 2.0);
+  vector<double> x(x_.begin(), x_.end()), y1(y1_.begin(), y1_.end()),
+      y2(y2_.begin(), y2_.end()), y1err(y1err_.begin(), y1err_.end()),
+      y2err(y2err_.begin(), y2err_.end());
+
+  py::scoped_interpreter guard{};
+  auto plt = pyplot::import();
+  auto [fig, axs] = plt.subplots(
+      1, 3, Kwargs("sharex"_a = true, "figsize"_a = py::make_tuple(12, 6)));
+  auto ax0 = axs[0], ax1 = axs[1], ax2 = axs[2];
+  ax0.set_title(Args("all errorbars"));
+  ax0.errorbar(Args(x, y1), Kwargs("yerr"_a = y1err));
+  ax0.errorbar(Args(x, y1), Kwargs("yerr"_a = y2err));
+
+  ax1.set_title(Args("only every 6th errorbar"));
+  ax1.errorbar(Args(x, y1), Kwargs("yerr"_a = y1err, "errorevery"_a = 6));
+  ax1.errorbar(Args(x, y2), Kwargs("yerr"_a = y2err, "errorevery"_a = 6));
+
+  ax2.set_title(Args("second seris shifted by 3"));
+  ax2.errorbar(Args(x, y1),
+               Kwargs("yerr"_a = y1err, "errorevery"_a = py::make_tuple(0, 6)));
+  ax2.errorbar(Args(x, y2),
+               Kwargs("yerr"_a = y2err, "errorevery"_a = py::make_tuple(3, 6)));
+
+  fig.suptitle(Args("Errorbar subsampling"));
+#if USE_GUI
+  plt.show();
+#else
+  plt.savefig(Args("erorbar_subsample.png"));
+#endif
+}

gallery/mplot3d/CMakeLists.txt

@@ -2,13 +2,15 @@ add_demo(lines3d lines3d.cpp)
 add_demo(lorenz_attractor lorenz_attractor.cpp)
 add_demo(contour3d contour3d.cpp)
 add_demo(subplot3d subplot3d.cpp)
+add_demo(errorbar3d errorbar3d.cpp)
 
 add_custom_target(mplot3d
-  DEPENDS lines3d lorenz_attractor contour3d subplot3d
+  DEPENDS lines3d lorenz_attractor contour3d subplot3d errorbar3d
   COMMAND lines3d
   COMMAND lorenz_attractor
   COMMAND contour3d
   COMMAND subplot3d
+  COMMAND errorbar3d
   COMMENT "running mplot3d"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../images"
 )

gallery/mplot3d/errorbar3d.cpp

@@ -0,0 +1,49 @@
+// example from https://matplotlib.org/stable/gallery/mplot3d/errorbar3d.html
+
+#include <pybind11/embed.h>
+#include <pybind11/stl.h>
+
+#include <matplotlibcpp17/pyplot.h>
+
+#include <xtensor/xbuilder.hpp>
+#include <xtensor/xmath.hpp>
+
+#include <vector>
+#include <algorithm>
+
+namespace py = pybind11;
+using namespace py::literals;
+using namespace std;
+using namespace matplotlibcpp17;
+
+int main() {
+  py::scoped_interpreter guard{};
+  auto plt = pyplot::import();
+  auto ax = plt.figure().add_subplot(Args(), Kwargs("projection"_a = "3d"));
+  auto t_ = xt::arange(0.0, 2 * M_PI + 0.1, 0.01);
+  auto x_ = xt::sin(1.0 * t_);
+  auto y_ = xt::cos(3.0 * t_);
+  auto z_ = xt::sin(5.0 * t_);
+  vector<double> t(t_.begin(), t_.end()), x(x_.begin(), x_.end()),
+      y(y_.begin(), y_.end()), z(z_.begin(), z_.end());
+
+  const int estep = 15;
+  vector<int> i(t_.shape()[0]), zuplims, zlolims;
+  std::iota(i.begin(), i.end(), t_.shape()[0]);
+  std::transform(i.begin(), i.end(), std::back_inserter(zuplims), [](int i) {
+    return (i % 15 == 0) and ((i / estep) % 3 == 0);
+  });
+  std::transform(i.begin(), i.end(), std::back_inserter(zlolims), [](int i) {
+    return (i % 15 == 0) and ((i / estep) % 3 == 2);
+  });
+
+  ax.errorbar(Args(x, y, z, 0.2),
+              Kwargs("zuplims"_a = zuplims, "zlolims"_a = zlolims,
+                     "errorevery"_a = estep));
+
+  ax.set_xlabel(Args("X label"));
+  ax.set_ylabel(Args("Y label"));
+  ax.set_zlabel(Args("Z label"));
+
+  plt.show();
+}

gallery/shapes_and_collections/patch_collection.cpp

@@ -60,6 +60,7 @@ int main() {
   py::list colors = py::cast(colors_);
   auto p = collections::PatchCollection(Args(patches), Kwargs("alpha"_a = 0.4));
   p.set_array(Args(colors));
+  // NOTE: error in python3.6.9 ?
   ax.add_collection(Args(p.unwrap()));
   fig.colorbar(Args(p.unwrap()), Kwargs("ax"_a = ax.unwrap()));
 #if USE_GUI

gallery/statistics/CMakeLists.txt

@@ -1,8 +1,10 @@
 add_demo(hist hist.cpp)
+add_demo(errorbar errorbar.cpp)
 
 add_custom_target(statitics
-  DEPENDS hist
+  DEPENDS hist errorbar
   COMMAND hist
+  COMMAND errorbar
   COMMENT "running hist"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../images"
 )

gallery/statistics/errorbar.cpp

@@ -0,0 +1,31 @@
+// 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;
+
+int main() {
+  py::scoped_interpreter guard{};
+  auto plt = pyplot::import();
+  auto x_ = xt::arange(0.1, 4.0, 0.5);
+  auto y_ = xt::exp(-x_);
+  vector<double> x(x_.begin(), x_.end()), y(y_.begin(), y_.end());
+
+  auto [fig, ax] = plt.subplots();
+  ax.errorbar(Args(x, y), Kwargs("xerr"_a = 0.2, "yerr"_a = 0.4));
+#if USE_GUI
+  plt.show();
+#else
+  plt.savefig(Args("erorrbar.png"));
+#endif
+}