Merge remote-tracking branch 'lindemeier/master'

William Leong · William Leong · commit a6c0f7cc2420 · 2022-05-13T16:52:28.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,5 @@
 
 # vim temp files
 *.sw*
+
+build/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,8 @@ set(PACKAGE_NAME matplotlib_cpp)
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE_NAME}/cmake)
 
 
+option(BUILD_EXAMPLES "Build examples" OFF)
+
 # Library target
 add_library(matplotlib_cpp INTERFACE)
 target_include_directories(matplotlib_cpp
@@ -36,72 +38,73 @@ install(
 )
 
 
-# Examples
-add_executable(minimal examples/minimal.cpp)
-target_link_libraries(minimal PRIVATE matplotlib_cpp)
-set_target_properties(minimal PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(basic examples/basic.cpp)
-target_link_libraries(basic PRIVATE matplotlib_cpp)
-set_target_properties(basic PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(modern examples/modern.cpp)
-target_link_libraries(modern PRIVATE matplotlib_cpp)
-set_target_properties(modern PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(animation examples/animation.cpp)
-target_link_libraries(animation PRIVATE matplotlib_cpp)
-set_target_properties(animation PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(nonblock examples/nonblock.cpp)
-target_link_libraries(nonblock PRIVATE matplotlib_cpp)
-set_target_properties(nonblock PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(xkcd examples/xkcd.cpp)
-target_link_libraries(xkcd PRIVATE matplotlib_cpp)
-set_target_properties(xkcd PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(bar examples/bar.cpp)
-target_link_libraries(bar PRIVATE matplotlib_cpp)
-set_target_properties(bar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(fill_inbetween examples/fill_inbetween.cpp)
-target_link_libraries(fill_inbetween PRIVATE matplotlib_cpp)
-set_target_properties(fill_inbetween PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(fill examples/fill.cpp)
-target_link_libraries(fill PRIVATE matplotlib_cpp)
-set_target_properties(fill PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(update examples/update.cpp)
-target_link_libraries(update PRIVATE matplotlib_cpp)
-set_target_properties(update PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(subplot2grid examples/subplot2grid.cpp)
-target_link_libraries(subplot2grid PRIVATE matplotlib_cpp)
-set_target_properties(subplot2grid PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-add_executable(lines3d examples/lines3d.cpp)
-target_link_libraries(lines3d PRIVATE matplotlib_cpp)
-set_target_properties(lines3d PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-if(Python3_NumPy_FOUND)
-  add_executable(surface examples/surface.cpp)
-  target_link_libraries(surface PRIVATE matplotlib_cpp)
-  set_target_properties(surface PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-  add_executable(colorbar examples/colorbar.cpp)
-  target_link_libraries(colorbar PRIVATE matplotlib_cpp)
-  set_target_properties(colorbar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-  add_executable(contour examples/contour.cpp)
-  target_link_libraries(contour PRIVATE matplotlib_cpp)
-  set_target_properties(contour PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-
-  add_executable(spy examples/spy.cpp)
-  target_link_libraries(spy PRIVATE matplotlib_cpp)
-  set_target_properties(spy PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-endif()
-
+if(BUILD_EXAMPLES)
+  # Examples
+  add_executable(minimal examples/minimal.cpp)
+  target_link_libraries(minimal PRIVATE matplotlib_cpp)
+  set_target_properties(minimal PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(basic examples/basic.cpp)
+  target_link_libraries(basic PRIVATE matplotlib_cpp)
+  set_target_properties(basic PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(modern examples/modern.cpp)
+  target_link_libraries(modern PRIVATE matplotlib_cpp)
+  set_target_properties(modern PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(animation examples/animation.cpp)
+  target_link_libraries(animation PRIVATE matplotlib_cpp)
+  set_target_properties(animation PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(nonblock examples/nonblock.cpp)
+  target_link_libraries(nonblock PRIVATE matplotlib_cpp)
+  set_target_properties(nonblock PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(xkcd examples/xkcd.cpp)
+  target_link_libraries(xkcd PRIVATE matplotlib_cpp)
+  set_target_properties(xkcd PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(bar examples/bar.cpp)
+  target_link_libraries(bar PRIVATE matplotlib_cpp)
+  set_target_properties(bar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(fill_inbetween examples/fill_inbetween.cpp)
+  target_link_libraries(fill_inbetween PRIVATE matplotlib_cpp)
+  set_target_properties(fill_inbetween PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(fill examples/fill.cpp)
+  target_link_libraries(fill PRIVATE matplotlib_cpp)
+  set_target_properties(fill PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(update examples/update.cpp)
+  target_link_libraries(update PRIVATE matplotlib_cpp)
+  set_target_properties(update PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(subplot2grid examples/subplot2grid.cpp)
+  target_link_libraries(subplot2grid PRIVATE matplotlib_cpp)
+  set_target_properties(subplot2grid PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  add_executable(lines3d examples/lines3d.cpp)
+  target_link_libraries(lines3d PRIVATE matplotlib_cpp)
+  set_target_properties(lines3d PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+  if(Python3_NumPy_FOUND)
+    add_executable(surface examples/surface.cpp)
+    target_link_libraries(surface PRIVATE matplotlib_cpp)
+    set_target_properties(surface PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(colorbar examples/colorbar.cpp)
+    target_link_libraries(colorbar PRIVATE matplotlib_cpp)
+    set_target_properties(colorbar PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    add_executable(contour examples/contour.cpp)
+    target_link_libraries(contour PRIVATE matplotlib_cpp)
+    set_target_properties(contour PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    add_executable(spy examples/spy.cpp)
+    target_link_libraries(spy PRIVATE matplotlib_cpp)
+    set_target_properties(spy PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+  endif()
+endif(BUILD_EXAMPLES)
 
 # Install headers
 install(FILES
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -348,13 +348,19 @@ template <> struct select_npy_type<uint16_t> { const static NPY_TYPES type = NPY
 template <> struct select_npy_type<uint32_t> { const static NPY_TYPES type = NPY_ULONG; };
 template <> struct select_npy_type<uint64_t> { const static NPY_TYPES type = NPY_UINT64; };
 
-// Sanity checks; comment them out or change the numpy type below if you're compiling on
-// a platform where they don't apply
-static_assert(sizeof(long long) == 8);
-template <> struct select_npy_type<long long> { const static NPY_TYPES type = NPY_INT64; };
-static_assert(sizeof(unsigned long long) == 8);
-template <> struct select_npy_type<unsigned long long> { const static NPY_TYPES type = NPY_UINT64; };
-
+#ifndef DISABLE_TYPE_SIZE_SANITY_CHECK
+// Sanity checks; comment them out or change the numpy type below if you're
+// compiling on a platform where they don't apply
+static_assert(sizeof(long long) == 8, "size check failed");
+template <> struct select_npy_type<long long> {
+  const static NPY_TYPES type = NPY_INT64;
+};
+static_assert(sizeof(unsigned long long) == 8, "size check failed");
+template <> struct select_npy_type<unsigned long long> {
+  const static NPY_TYPES type = NPY_UINT64;
+};
+#endif
+	
 template<typename Numeric>
 PyObject* get_array(const std::vector<Numeric>& v)
 {
@@ -1057,8 +1063,7 @@ template<typename NumericX, typename NumericY, typename NumericColors>
         if(res) Py_DECREF(res);
 
         return res;
-    }
-    
+}
 
 template<typename NumericX, typename NumericY, typename NumericZ>
 bool scatter(const std::vector<NumericX>& x,
@@ -1069,9 +1074,9 @@ bool scatter(const std::vector<NumericX>& x,
              const long fig_number=0) {
   detail::_interpreter::get();
 
-  // Same as with plot_surface: We lazily load the modules here the first time 
-  // this function is called because I'm not sure that we can assume "matplotlib 
-  // installed" implies "mpl_toolkits installed" on all platforms, and we don't 
+  // Same as with plot_surface: We lazily load the modules here the first time
+  // this function is called because I'm not sure that we can assume "matplotlib
+  // installed" implies "mpl_toolkits installed" on all platforms, and we don't
   // want to require it for people who don't need 3d plots.
   static PyObject *mpl_toolkitsmod = nullptr, *axis3dmod = nullptr;
   if (!mpl_toolkitsmod) {
@@ -1468,7 +1473,7 @@ bool quiver(const std::vector<NumericX>& x, const std::vector<NumericY>& y, cons
     Py_DECREF(axis3d);
     if (!axis3dmod) { throw std::runtime_error("Error loading module mpl_toolkits.mplot3d!"); }
   }
-  
+
   //assert sizes match up
   assert(x.size() == y.size() && x.size() == u.size() && u.size() == w.size() && x.size() == z.size() && x.size() == v.size() && u.size() == v.size());
 
@@ -1496,7 +1501,7 @@ bool quiver(const std::vector<NumericX>& x, const std::vector<NumericY>& y, cons
   {
       PyDict_SetItemString(kwargs, it->first.c_str(), PyUnicode_FromString(it->second.c_str()));
   }
-    
+
   //get figure gca to enable 3d projection
   PyObject *fig =
       PyObject_CallObject(detail::_interpreter::get().s_python_function_figure,
@@ -1516,7 +1521,7 @@ bool quiver(const std::vector<NumericX>& x, const std::vector<NumericY>& y, cons
   Py_INCREF(axis);
   Py_DECREF(gca);
   Py_DECREF(gca_kwargs);
-  
+
   //plot our boys bravely, plot them strongly, plot them with a wink and clap
   PyObject *plot3 = PyObject_GetAttrString(axis, "quiver");
   if (!plot3) throw std::runtime_error("No 3D line plot");
@@ -2655,7 +2660,7 @@ inline void rcparams(const std::map<std::string, std::string>& keywords = {}) {
           PyDict_SetItemString(kwargs, it->first.c_str(), PyLong_FromLong(std::stoi(it->second.c_str())));
         else PyDict_SetItemString(kwargs, it->first.c_str(), PyString_FromString(it->second.c_str()));
     }
-    
+
     PyObject * update = PyObject_GetAttrString(detail::_interpreter::get().s_python_function_rcparams, "update");
     PyObject * res = PyObject_Call(update, args, kwargs);
     if(!res) throw std::runtime_error("Call to rcParams.update() failed.");

-Original file line number
+Diff line change
 # vim temp files
 *.sw*
++
 +build/*