Fix vectorization of various binary op with integral operands

Author: serge-sans-paille

pythran/pythonic/types/vectorizable_type.hpp

@@ -29,24 +29,33 @@ namespace numpy
 {
   namespace functor
   {
+    struct arctan2;
     struct angle_in_rad;
     struct asarray_chkfinite;
     struct clip;
+    struct copysign;
+    struct divide;
     struct fix;
     struct floor_divide;
+    struct fmod;
+    struct hypot;
     struct isfinite;
     struct isinf;
     struct isnan;
     struct isposinf;
     struct ldexp;
+    struct logaddexp;
     struct logaddexp2;
     struct maximum;
     struct minimum;
     struct nan_to_num;
     struct nextafter;
+    struct power;
+    struct remainder;
     struct rint;
     struct signbit;
     struct spacing;
+    struct true_divide;
     struct where;
   }
 }
@@ -119,6 +128,21 @@ namespace types
         !std::is_same<O, numpy::functor::uint64>::value &&
         !std::is_same<O, numpy::functor::float32>::value &&
         !std::is_same<O, numpy::functor::float64>::value &&
+        // not supported for integral numbers
+        !(utils::any_of<std::is_integral<
+              typename dtype_of<Args>::type>::value...>::value &&
+          (std::is_same<O, numpy::functor::floor_divide>::value ||
+#if PY_MAJOR_VERSION >= 3
+           std::is_same<O, numpy::functor::true_divide>::value ||
+           std::is_same<O, numpy::functor::divide>::value ||
+#endif
+           std::is_same<O, numpy::functor::arctan2>::value ||
+           std::is_same<O, numpy::functor::copysign>::value ||
+           std::is_same<O, numpy::functor::logaddexp>::value ||
+           std::is_same<O, numpy::functor::power>::value ||
+           std::is_same<O, numpy::functor::remainder>::value ||
+           std::is_same<O, numpy::functor::hypot>::value ||
+           std::is_same<O, numpy::functor::fmod>::value)) &&
         // special functions not in the scope of xsimd
         !std::is_same<O, scipy::special::functor::hankel1>::value &&
         !std::is_same<O, scipy::special::functor::hankel2>::value &&

pythran/tests/test_numpy_ufunc_binary.py

@@ -32,12 +32,18 @@ class TestNumpyUFuncBinary(TestEnv):
         setattr(TestNumpyUFuncBinary, 'test_' + f, eval("lambda self: self.run_test('def np_{0}(a): from {1} import {0} ; return {0}(a,a)', numpy.ones(10), np_{0}=[NDArray[float, :]])".format(f, ns)))
         setattr(TestNumpyUFuncBinary, 'test_' + f + '_scalar', eval("lambda self: self.run_test('def np_{0}_scalar(a): from {1} import {0} ; return {0}(a+0.5, a+0.5)', 0.5, np_{0}_scalar=[float])".format(f, ns)))
         setattr(TestNumpyUFuncBinary, 'test_' + f + '_matrix', eval("lambda self: self.run_test('def np_{0}_matrix(a): from {1} import {0} ; return {0}(a,a)', numpy.ones((2,5)) - 0.2 , np_{0}_matrix=[NDArray[float,:,:]])".format(f, ns)))
-        ## Tests for  complex numbers
+        ## Tests for complex numbers
         try:
             eval('{1}.{0}(1.j, 1.j)'.format(f, ns))
             setattr(TestNumpyUFuncBinary, 'test_' + f + '_complex', eval("lambda self: self.run_test('def np_{0}_complex(a): from {1} import {0} ; return {0}(a,a)', numpy.ones(10)*1.j, np_{0}_complex=[NDArray[complex, :]])".format(f, ns)))
         except TypeError:
             pass
+        ## Tests for integral numbers
+        try:
+            eval('{1}.{0}(1, 1)'.format(f, ns))
+            setattr(TestNumpyUFuncBinary, 'test_' + f + '_integer', eval("lambda self: self.run_test('def np_{0}_integer(a): from {1} import {0} ; return {0}(a, a)', numpy.ones(10,dtype=int), np_{0}_integer=[NDArray[int, :]])".format(f, ns)))
+        except TypeError:
+            pass
 
         ## Tests for accumulation
         if 'scipy' not in ns: