Merge pull request #8 from wkcn/github_ci

integrate GitHub Action

.github/workflows/linux.yml

@@ -0,0 +1,22 @@
+name: linux-x64-gcc
+on: [push, pull_request]
+jobs:
+  linux-x64-gcc:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: install dependencies
+        run: |
+          pip install --upgrade pip
+          pip install -v -e .
+          pip install coveralls nose
+      - name: cpu-test
+        run: nosetests -s --with-coverage

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "thirdparty/numpy-groupies"]
-	path = thirdparty/numpy-groupies
-	url = https://github.com/ml31415/numpy-groupies

examples/mnist_kaggle.py

@@ -68,7 +68,7 @@ def print_info():
 
 n = len(data)
 X = data[:, 1:]
-labels = data[:, 0].astype(np.int)
+labels = data[:, 0].astype(np.int32)
 # one-hot
 #Y = np.eye(10)[labels.ravel()] 
 print ("Read OK", n)

examples/mnist_train.py

@@ -25,7 +25,7 @@
 
 n = len(data)
 X = data[:, 1:]
-labels = data[:, 0].astype(np.int)
+labels = data[:, 0].astype(np.int32)
 # one-hot
 #Y = np.eye(10)[labels.ravel()] 
 print ("Read OK", n)

mobula/layers/Eltwise.py

@@ -25,7 +25,7 @@ def forward(self):
         elif self.op == Eltwise.PROD:
             for i in range(len(self.X)):
                 x = self.X[i]
-                x[x == 0] = 1e-100
+                x[x == 0] = 1e-10
             self.Y = np.prod(self.X, 0) * np.prod(self.coeffs)
         else:
             # self.op == Eltwise.MAX

tests/test_layers/test_batchnorm.py

@@ -42,7 +42,7 @@ def test_grads():
     momentum = 0.9
     eps = 1e-5
     use_global_stats = False
-    X = np.arange(24).reshape((4, 6)).astype(np.float)
+    X = np.arange(24).reshape((4, 6)).astype(np.float32)
     bn = L.BatchNorm(None, momentum = momentum, eps = eps, use_global_stats = use_global_stats)
     bn.X = X
     bn.reshape()

tests/test_layers/test_contrastive.py

@@ -2,8 +2,8 @@
 import numpy as np
 
 def test_contrastive():
-    A = np.array([[1,2,0], [2,1,0]]).astype(np.float)
-    B = np.array([[0,1,3], [2,3,1]]).astype(np.float)
+    A = np.array([[1,2,0], [2,1,0]]).astype(np.float32)
+    B = np.array([[0,1,3], [2,3,1]]).astype(np.float32)
 
     diff = A - B # 2 x 3
     dist_sq = np.sum(np.square(diff), 1).reshape((2,1)) # 2 x 1

tests/test_layers/test_eltwise.py

@@ -3,18 +3,19 @@
 import numpy as np
 
 def go_eltwise(op):
-    a = np.array([1,0,6]).astype(np.float)
-    b = np.array([4,5,3]).astype(np.float)
+    a = np.array([1,0,6]).astype(np.float32)
+    b = np.array([4,5,3]).astype(np.float32)
     print ("a: ", a)
     print ("b: ", b)
     data1 = L.Data(a)
     data2 = L.Data(b)
     coeffs = np.array([-1.0,1.2])
     l = L.Eltwise([data1,data2], op = op, coeffs = coeffs)
+    print ('coeffs: ', coeffs)
     l.reshape()
     l.forward()
     print ("Y: ", l.Y)
-    dY = np.array([7, 8, 9]).astype(np.float)
+    dY = np.array([7, 8, 9]).astype(np.float32)
     l.dY = dY 
     print ("dY: ", l.dY)
     l.backward()
@@ -38,7 +39,7 @@ def go_eltwise(op):
 
     print ("Y", l.Y, Y)
     assert np.allclose(l.Y, Y)
-    assert np.allclose(l.dX[0], dX0)
+    assert np.allclose(l.dX[0], dX0), (l.dX[0], dX0)
     assert np.allclose(l.dX[1], dX1)
 
 def test_eltwise():

tests/test_layers/test_name.py

@@ -8,22 +8,22 @@ def test_name():
     test1 = [str(L.Data(a)), str(L.Data([a,b])), str(L.Data(None))]
     test1_truth = ["<Data '/Data' input: (10,) num_output: (1)>", "<Data '/Data' input: [(10,), (3, 5)] num_output: (2)>", "<Data '/Data' input: None num_output: (0)>"]
     print (test1)
-    assert test1 == test1_truth
+    assert test1 == test1_truth, (test1, test1_truth)
 
     test2 = [str(L.ReLU(L.Data(a))), str(L.ReLU(L.FC(L.Data(b), dim_out = 10)))]
     test2_truth = ["<ReLU '/ReLU' input: /Data:0 num_output: (1)>", "<ReLU '/ReLU' input: /FC:0 num_output: (1)>"]
     print (test2)
-    assert test2 == test2_truth
+    assert test2 == test2_truth, (test2, test2_truth)
 
     la, lc = L.Data([a,c])
     concat = L.Concat([la, lc], axis = 0)
     test3 = [str(concat)]
     test3_truth = ["<Concat '/Concat' input: [/Data:0,/Data:1] num_output: (1)>"]
     print (test3)
-    assert test3 == test3_truth
+    assert test3 == test3_truth, (test3, test3_truth)
 
     l = L.ReLU(a)
     test4 = [str(l)]
     test4_truth = ["<ReLU '/ReLU' input: (10,) num_output: (1)>"]
     print (test4)
-    assert test4 == test4_truth
+    assert test4 == test4_truth, (test4, test4_truth)