Align expection text for inplace matrix multiplication

Author: antonwolfy

dpnp/dpnp_array.py

@@ -25,6 +25,7 @@
 # *****************************************************************************
 
 import dpctl.tensor as dpt
+from dpctl.tensor._numpy_helper import AxisError
 
 import dpnp
 
@@ -379,7 +380,14 @@ def __imatmul__(self, other):
         else:
             axes = [(-2, -1), (-2, -1), (-2, -1)]
 
-        dpnp.matmul(self, other, out=self, axes=axes)
+        try:
+            dpnp.matmul(self, other, out=self, axes=axes)
+        except AxisError:
+            # AxisError should indicate that the axes argument didn't work out
+            # which should mean the second operand not being 2 dimensional.
+            raise ValueError(
+                "inplace matrix multiplication requires the first operand to have at least one and the second at least two dimensions."
+            )
         return self
 
     def __imod__(self, other):

dpnp/dpnp_utils/dpnp_utils_linearalgebra.py

@@ -28,7 +28,7 @@
 import dpctl.tensor._tensor_impl as ti
 import dpctl.utils as dpu
 import numpy
-from dpctl.tensor._numpy_helper import normalize_axis_tuple
+from dpctl.tensor._numpy_helper import AxisError, normalize_axis_tuple
 from dpctl.utils import ExecutionPlacementError
 
 import dpnp
@@ -525,15 +525,15 @@ def _validate_internal(axes, i, ndim):
                 )
 
             if len(axes) != 1:
-                raise ValueError(
+                raise AxisError(
                     f"Axes item {i} should be a tuple with a single element, or an integer."
                 )
         else:
             iter = 2
             if not isinstance(axes, tuple):
                 raise TypeError(f"Axes item {i} should be a tuple.")
             if len(axes) != 2:
-                raise ValueError(
+                raise AxisError(
                     f"Axes item {i} should be a tuple with 2 elements."
                 )
 
@@ -563,7 +563,7 @@ def _validate_internal(axes, i, ndim):
 
     if x1_ndim == 1 and x2_ndim == 1:
         if axes[2] != ():
-            raise ValueError("Axes item 2 should be an empty tuple.")
+            raise AxisError("Axes item 2 should be an empty tuple.")
     elif x1_ndim == 1 or x2_ndim == 1:
         axes[2] = _validate_internal(axes[2], 2, 1)
     else:

tests/test_mathematical.py

@@ -4216,10 +4216,16 @@ def test_shapes(self, a_sh, b_sh):
 
         expected = a @ b
         if expected.shape != a_sh:
-            with pytest.raises(ValueError):
+            if len(b_sh) == 1:
+                # check the exception matches NumPy
+                match = "inplace matrix multiplication requires"
+            else:
+                match = None
+
+            with pytest.raises(ValueError, match=match):
                 a @= b
 
-            with pytest.raises(ValueError):
+            with pytest.raises(ValueError, match=match):
                 ia @= ib
         else:
             ia @= ib
@@ -4356,7 +4362,7 @@ def test_matmul_axes(self, xp):
 
         # axes item should be a tuple with 2 elements
         axes = [(3, 1), (2, 0), (0, 1, 2)]
-        with pytest.raises(ValueError):
+        with pytest.raises(AxisError):
             xp.matmul(a1, a2, axes=axes)
 
         # axes must be an integer
@@ -4367,7 +4373,7 @@ def test_matmul_axes(self, xp):
         # axes item 2 should be an empty tuple
         a = xp.arange(3)
         axes = [0, 0, 0]
-        with pytest.raises(ValueError):
+        with pytest.raises(AxisError):
             xp.matmul(a, a, axes=axes)
 
         a = xp.arange(3 * 4 * 5).reshape(3, 4, 5)
@@ -4379,7 +4385,7 @@ def test_matmul_axes(self, xp):
 
         # axes item should be a tuple with a single element, or an integer
         axes = [(1, 0), (0), (0, 1)]
-        with pytest.raises(ValueError):
+        with pytest.raises(AxisError):
             xp.matmul(a, b, axes=axes)