v0.9.9 fix incorrect vector/matrix empty size

Author: asistradition

CHANGELOG.md

@@ -1,3 +1,7 @@
+### Version 0.9.9
+
+* Fix #34: Empty vector/matrix multiplication returns correct shape for result
+
 ### Version 0.9.8
 
 * Fix #31: Remove ndim check from sparse vector ctypes wrapper to accommodate np.matrix arrays that can't be flattened

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 DISTNAME = 'sparse_dot_mkl'
-VERSION = '0.9.8'
+VERSION = '0.9.9'
 DESCRIPTION = "Intel MKL wrapper for sparse matrix multiplication"
 MAINTAINER = 'Chris Jackson'
 MAINTAINER_EMAIL = 'cj59@nyu.edu'

sparse_dot_mkl/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.9.8'
+__version__ = '0.9.9'
 
 
 from sparse_dot_mkl.sparse_dot import (

sparse_dot_mkl/_sparse_vector.py

@@ -137,10 +137,21 @@ def _sparse_dot_vector(
     _sanity_check(mv_a, mv_b, allow_vector=True)
 
     if _empty_output_check(mv_a, mv_b):
-        output_arr = _out_matrix(
-            (mv_a.shape[0],) if mv_b.ndim == 1 else (mv_a.shape[0], 1),
-            _type_check(mv_a, mv_b, cast=cast, convert=False), out_arr=out
-        )
+
+        if _is_dense_vector(mv_b):
+            output_arr = _out_matrix(
+                (mv_a.shape[0],) if mv_b.ndim == 1 else (mv_a.shape[0], 1),
+                _type_check(mv_a, mv_b, cast=cast, convert=False),
+                out_arr=out
+            )
+
+        elif _is_dense_vector(mv_a):
+            output_arr = _out_matrix(
+                (mv_b.shape[1],) if mv_a.ndim == 1 else (1, mv_b.shape[1]),
+                _type_check(mv_a, mv_b, cast=cast, convert=False),
+                out_arr=out
+            )
+
         if out is None or (out_scalar is not None and not out_scalar):
             output_arr.fill(0)
         elif out_scalar is not None:

sparse_dot_mkl/tests/test_mkl.py

@@ -47,6 +47,8 @@ def make_vector(n, complex=False):
 
 MATRIX_1, MATRIX_2 = make_matrixes(200, 100, 300, 0.05)
 MATRIX_1_EMPTY = _spsparse.csr_matrix((200, 300), dtype=np.float64)
+MATRIX_2_EMPTY = _spsparse.csr_matrix((300, 100), dtype=np.float64)
+
 VECTOR = make_vector(300)
 
 

sparse_dot_mkl/tests/test_sparse_vector.py

@@ -5,6 +5,8 @@
 from sparse_dot_mkl import dot_product_mkl
 from sparse_dot_mkl.tests.test_mkl import (
     MATRIX_1,
+    MATRIX_1_EMPTY,
+    MATRIX_2_EMPTY,
     MATRIX_2,
     VECTOR,
     make_matrixes,
@@ -67,6 +69,7 @@ def test_mult_1d_float32(self):
         mat3_np = np.dot(self.mat1_d, self.mat2_d)
 
         np_almost_equal(mat3_np, mat3)
+   
 
     def test_mult_1d_float32_out(self):
         mat3_np = np.dot(self.mat1_d, self.mat2_d)
@@ -193,6 +196,17 @@ class TestSparseVectorMultiplicationBSR(TestSparseVectorMultiplication):
     sparse_args = {"blocksize": (10, 10)}
 
 
+class TestSparseVectorMultiplicationCSREmpty(TestSparseVectorMultiplication):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.MATRIX_1, cls.MATRIX_2, cls.VECTOR = (
+            MATRIX_1_EMPTY,
+            MATRIX_2_EMPTY,
+            np.zeros_like(VECTOR),
+        )
+
+
 class TestSparseVectorMultiplicationCOO(unittest.TestCase):
     def setUp(self):
         self.mat1 = _spsparse.coo_matrix(MATRIX_1).copy()
@@ -270,6 +284,25 @@ class TestVectorSparseMultiplicationBSR(TestVectorSparseMultiplication):
     sparse_func = _spsparse.bsr_matrix
 
 
+class TestVectorSparseMultiplicationCSREmpty(TestVectorSparseMultiplication):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.MATRIX_1, cls.MATRIX_2, cls.VECTOR = (
+            MATRIX_1_EMPTY,
+            MATRIX_2_EMPTY,
+            np.zeros_like(VECTOR),
+        )
+
+
+class TestVectorSparseMultiplicationCSCEmpty(TestVectorSparseMultiplicationCSREmpty):
+    sparse_func = _spsparse.csc_matrix
+
+
+class TestVectorSparseMultiplicationBSREmpty(TestVectorSparseMultiplicationCSREmpty):
+    sparse_func = _spsparse.bsr_matrix
+
+
 class TestVectorVectorMultplication(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -379,6 +412,19 @@ class TestVectorSparseMultiplicationArrayCSC(TestVectorSparseMultiplication):
     class TestVectorSparseMultiplicationArrayBSR(TestVectorSparseMultiplication):
         sparse_func = bsr_array
 
+    class TestVectorSparseMultiplicationCSREmptyArray(TestVectorSparseMultiplicationCSREmpty):
+        sparse_func = csr_array
+        sparse_args = {}
+
+    class TestVectorSparseMultiplicationCSCEmptyArray(TestVectorSparseMultiplicationCSREmpty):
+        sparse_func = csc_array
+        sparse_args = {}
+
+    class TestVectorSparseMultiplicationBSREmptyArray(TestVectorSparseMultiplicationCSREmpty):
+        sparse_func = bsr_array
+        sparse_args = {"blocksize": (10, 10)}
+
+
     class TestSparseVectorMultiplicationArrayComplex(
         _ComplexMixin,
         TestSparseVectorMultiplicationArray