complex arrays fixed

Author: JohanMabille

benchmark/main.cpp

@@ -8,7 +8,6 @@
 #include "xtensor-python/pytensor.hpp"
 #include "xtensor-python/pyvectorize.hpp"
 
-#include <complex>
 using complex_t = std::complex<double>;
 
 namespace py = pybind11;

include/xtensor-python/pybuffer_adaptor.hpp

@@ -280,6 +280,12 @@ namespace xt
 
         inline self_type operator+(difference_type n) const { return self_type(p_current + n); }
         inline self_type operator-(difference_type n) const { return self_type(p_current - n); }
+        inline self_type operator-(const self_type& rhs) const
+        {
+            self_type tmp(*this);
+            tmp -= (p_current - rhs.p_current);
+            return tmp;
+        }
 
         pointer get_pointer() const { return p_current; }
 

include/xtensor-python/pyvectorize.hpp

@@ -26,7 +26,7 @@ namespace xt
         {
         }
 
-        pybind11::object operator()(const pyarray<Args>&... args)
+        inline pyarray<R> operator()(const pyarray<Args>&... args)
         {
             pyarray<R> res = m_vectorizer(args...);
             return res;

test/main.cpp

@@ -7,6 +7,7 @@
 #include <numeric>
 
 namespace py = pybind11;
+using complex_t = std::complex<double>;
 
 // Examples
 
@@ -58,5 +59,10 @@ PYBIND11_PLUGIN(xtensor_python_test)
 
     m.def("vectorize_example1", xt::pyvectorize(add), "");
 
+    m.def("rect_to_polar", [](xt::pyarray<complex_t> const& a) {
+            return py::make_tuple(xt::pyvectorize([](complex_t x) { return std::abs(x); })(a),
+                                  xt::pyvectorize([](complex_t x) { return std::arg(x); })(a));
+    });
+
     return m.ptr();
 }

test/setup.py

@@ -107,7 +107,7 @@ def build_extensions(self):
     description='An example project using xtensor-python',
     long_description='',
     ext_modules=ext_modules,
-    install_requires=['pybind11==2.0.1'],
+    install_requires=['pybind11>=2.0.1'],
     cmdclass={'build_ext': BuildExt},
     zip_safe=False,
 )

test/test_pyarray.py

@@ -50,3 +50,9 @@ def test_readme_example2(self):
              [-1.499227,  0.136731,  1.646979,  1.643002,  0.128456],
              [-1.084323, -0.583843,  0.45342 ,  1.073811,  0.706945]], 1e-5)
 
+    def test_rect_to_polar(self):
+        print("test6")
+        x = np.ones(10, dtype=complex)
+        z = xt.rect_to_polar(x[::2]);
+        np.testing.assert_allclose(z, (np.ones(5, dtype=float), np.zeros(5, dtype=float)), 1e-5)
+