lint

Author: sdpython

td3a_cpp/tutorial/td_mul_cython.pyx

@@ -12,6 +12,7 @@ cnumpy.import_array()
 
 
 def multiply_matrix(m1, m2):
+    "Matrix multiplication"
     m3 = pynumpy.zeros((m1.shape[0], m2.shape[1]), dtype=m1.dtype)
     for i in range(0, m1.shape[0]):
         for j in range(0, m2.shape[1]):
@@ -23,6 +24,7 @@ def multiply_matrix(m1, m2):
 cdef void _c_multiply_matrix(double[:, :] m1, double[:, :] m2,
                              double[:, :] m3,
                              cython.int ni, cython.int nj, cython.int nk) nogil:
+    "Matrix multiplication wuth cython"
     cdef cython.int i, j, k    
     for i in prange(0, ni):
         for j in range(0, nj):
@@ -31,6 +33,7 @@ cdef void _c_multiply_matrix(double[:, :] m1, double[:, :] m2,
 
 
 def c_multiply_matrix(double[:, :] m1, double[:, :] m2):
+    "Matrix multiplication calling the cython version"
     m3 = pynumpy.zeros((m1.shape[0], m2.shape[1]), dtype=pynumpy.float64)
     cdef cython.int ni = m1.shape[0]
     cdef cython.int nj = m2.shape[1]

tests/test_tutorial_td.py

@@ -6,7 +6,6 @@
 from numpy.testing import assert_almost_equal
 from td3a_cpp.tutorial.td_mul_cython import (
     multiply_matrix, c_multiply_matrix)
-from td3a_cpp.tutorial.mul_cython_omp import dmul_cython_omp
 
 
 class TestTutorialTD(unittest.TestCase):
@@ -28,15 +27,18 @@ def test_matrix_cmultiply_matrix(self):
     def test_timeit(self):
         va = numpy.random.randn(300, 400).astype(numpy.float64)
         vb = numpy.random.randn(400, 500).astype(numpy.float64)
-        res1 = va @ vb
-        res2 = c_multiply_matrix(va, vb)
-        ctx = {'va': va, 'vb': vb, 'c_multiply_matrix': c_multiply_matrix}
+        ctx = {'va': va, 'vb': vb, 'c_multiply_matrix': c_multiply_matrix,
+               'multiply_matrix': multiply_matrix}
         res1 = timeit.timeit('va @ vb', number=10, globals=ctx)
-        res2 = timeit.timeit('c_multiply_matrix(va, vb)', number=10, globals=ctx)
+        res2 = timeit.timeit(
+            'c_multiply_matrix(va, vb)', number=10, globals=ctx)
+        res3 = timeit.timeit(
+            'multiply_matrix(va, vb)', number=10, globals=ctx)
         self.assertLess(res1, res2)  # numpy is much faster.
-        ratio = res2 / res1
-        self.assertGreater(ratio, 1)  # ratio = number of times numpy is faster
-        # print(ratio)
+        ratio1 = res2 / res1
+        self.assertGreater(ratio1, 1)  # ratio1 = number of times numpy is faster
+        ratio2 = res3 / res1
+        self.assertGreater(ratio2, 1)
 
 
 if __name__ == '__main__':