Merge pull request cupy#6197 from toslunar/4198-4675

Fix cupy#4675 on resolving TODO in cupy#4198
chainer-ci · Dec 3, 2021 · 92300f2 · 92300f2
1 parent e253fcb
commit 92300f2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cupy/_core/core.pyx b/cupy/_core/core.pyx
@@ -1191,10 +1191,12 @@ cdef class ndarray:
             return numpy.multiply(x, y)
 
     def __matmul__(x, y):
-        if not isinstance(y, ndarray) and _should_use_rop(x, y):
+        if isinstance(y, ndarray):
+            return _linalg.matmul(x, y)
+        elif _should_use_rop(x, y):
             return NotImplemented
         else:
-            return cupy.linalg._product.matmul(x, y)
+            return numpy.matmul(x, y)
 
     def __div__(x, y):
         if isinstance(y, ndarray):