FIX: vstack, hstack fallback and tests (#782)

* TEST: tests for vstack, hstack

Author: samir-nasibli

dpnp/dpnp_iface_manipulation.py

@@ -290,7 +290,15 @@ def hstack(tup):
 
     """
 
-    return call_origin(numpy.hstack, tup)
+    # TODO:
+    # `call_origin` cannot convert sequence of dparray to sequence of
+    # nparrays
+    tup_new = []
+    for tp in tup:
+        tpx = dpnp.asnumpy(tp) if isinstance(tp, dparray) else tp
+        tup_new.append(tpx)
+
+    return call_origin(numpy.hstack, tup_new)
 
 
 def moveaxis(x1, source, destination):
@@ -619,4 +627,12 @@ def vstack(tup):
 
     """
 
-    return call_origin(numpy.vstack, tup)
+    # TODO:
+    # `call_origin` cannot convert sequence of dparray to sequence of
+    # nparray
+    tup_new = []
+    for tp in tup:
+        tpx = dpnp.asnumpy(tp) if isinstance(tp, dparray) else tp
+        tup_new.append(tpx)
+
+    return call_origin(numpy.vstack, tup_new)

tests/skipped_tests.tbl

@@ -1,3 +1,5 @@
+tests/test_arraymanipulation.py::TestVstack::test_generator
+tests/test_arraymanipulation.py::TestHstack::test_generator
 tests/test_linalg.py::test_cond[-1-[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]
 tests/test_linalg.py::test_cond[1-[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]
 tests/test_linalg.py::test_cond[-2-[[1, 0, -1], [0, 1, 0], [1, 0, 1]]]

tests/skipped_tests_gpu.tbl

@@ -1,3 +1,5 @@
+tests/test_arraymanipulation.py::TestHstack::test_generator
+tests/test_arraymanipulation.py::TestVstack::test_generator
 tests/test_linalg.py::test_cond[-1-[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]
 tests/test_linalg.py::test_cond[1-[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]
 tests/test_linalg.py::test_cond[-2-[[1, 0, -1], [0, 1, 0], [1, 0, 1]]]

tests/test_arraymanipulation.py

@@ -1,7 +1,6 @@
 import pytest
 
 import dpnp
-
 import numpy
 
 
@@ -16,3 +15,78 @@ def test_asfarray(type, input):
     dpnp_res = dpnp.asfarray(input, type)
 
     numpy.testing.assert_array_equal(dpnp_res, np_res)
+
+
+class TestHstack:
+    def test_non_iterable(self):
+        numpy.testing.assert_raises(TypeError, dpnp.hstack, 1)
+
+    def test_empty_input(self):
+        numpy.testing.assert_raises(ValueError, dpnp.hstack, ())
+
+    def test_0D_array(self):
+        b = dpnp.array(2)
+        a = dpnp.array(1)
+        res = dpnp.hstack([a, b])
+        desired = dpnp.array([1, 2])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_1D_array(self):
+        a = dpnp.array([1])
+        b = dpnp.array([2])
+        res = dpnp.hstack([a, b])
+        desired = dpnp.array([1, 2])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_2D_array(self):
+        a = dpnp.array([[1], [2]])
+        b = dpnp.array([[1], [2]])
+        res = dpnp.hstack([a, b])
+        desired = dpnp.array([[1, 1], [2, 2]])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_generator(self):
+        with numpy.testing.assert_warns(FutureWarning):
+            dpnp.hstack((numpy.arange(3) for _ in range(2)))
+        with numpy.testing.assert_warns(FutureWarning):
+            dpnp.hstack(map(lambda x: x, numpy.ones((3, 2))))
+
+
+class TestVstack:
+    def test_non_iterable(self):
+        numpy.testing.assert_raises(TypeError, dpnp.vstack, 1)
+
+    def test_empty_input(self):
+        numpy.testing.assert_raises(ValueError, dpnp.vstack, ())
+
+    def test_0D_array(self):
+        a = dpnp.array(1)
+        b = dpnp.array(2)
+        res = dpnp.vstack([a, b])
+        desired = dpnp.array([[1], [2]])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_1D_array(self):
+        a = dpnp.array([1])
+        b = dpnp.array([2])
+        res = dpnp.vstack([a, b])
+        desired = dpnp.array([[1], [2]])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_2D_array(self):
+        a = dpnp.array([[1], [2]])
+        b = dpnp.array([[1], [2]])
+        res = dpnp.vstack([a, b])
+        desired = dpnp.array([[1], [2], [1], [2]])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_2D_array2(self):
+        a = dpnp.array([1, 2])
+        b = dpnp.array([1, 2])
+        res = dpnp.vstack([a, b])
+        desired = dpnp.array([[1, 2], [1, 2]])
+        numpy.testing.assert_array_equal(res, desired)
+
+    def test_generator(self):
+        with numpy.testing.assert_warns(FutureWarning):
+            dpnp.vstack((numpy.arange(3) for _ in range(2)))