Merge branch 'feature/20180510-fix-sample-data' into 'feature/2018040…

…1-file-format-converter' Feature/20180510 fix sample data See merge request nnabla/nnabla!165
sony · May 28, 2018 · 1e14865 · 1e14865
2 parents 1263aa9 + 2d68631
commit 1e14865
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/python/src/nnabla/utils/converter/functions.yaml b/python/src/nnabla/utils/converter/functions.yaml
@@ -363,8 +363,9 @@ Neural Network Layer:
       x0:
         doc: Indices with shape :math:`(I_0, ..., I_N)`
         template: TI
-      x1:
+      w:
         doc: Weights with shape :math:`(W_0, ..., W_M)`
+        parameter: true
     outputs:
       y:
         doc: Output with shape :math:`(I_0, ..., I_N, W_1, ..., W_M)`

diff --git a/python/test/function/test_embed.py b/python/test/function/test_embed.py
@@ -29,8 +29,8 @@ def test_embed_forward_backward(seed, shape_x, shape_w, ctx, func_name):
     from nbla_test_utils import cap_ignore_region, function_tester
     rng = np.random.RandomState(seed)
     n_class = shape_w[0]
-    x = np.random.randint(0, n_class - 1, shape_x)
-    w = np.random.randn(*shape_w)
+    x = np.random.randint(0, n_class - 1, shape_x).astype(np.int32)
+    w = np.random.randn(*shape_w).astype(np.float32)
     inputs = [x, w]
     function_tester(rng, F.embed, lambda x, w: w[x], inputs,
                     ctx=ctx, func_name=func_name, atol_b=1e-2,

diff --git a/python/test/function/test_logical.py b/python/test/function/test_logical.py
@@ -33,7 +33,7 @@ def test_logical_scalar_forward_backward(val, seed, fname, ctx, func_name):
     func = getattr(F, fname)
     ref_func = getattr(np, fname.replace('_scalar', ''))
     rng = np.random.RandomState(seed)
-    inputs = [rng.randint(0, 2, size=(2, 3, 4))]
+    inputs = [rng.randint(0, 2, size=(2, 3, 4)).astype(np.float32)]
     function_tester(rng, func, ref_func, inputs, [val],
                     ctx=ctx, backward=[False], func_name=func_name)
 
@@ -42,6 +42,7 @@ def test_logical_scalar_forward_backward(val, seed, fname, ctx, func_name):
     'greater': '>',
     'greater_equal': '>=',
     'less': '<',
+    'less_equal': '<=',
     'equal': '==',
     'not_equal': '!='}
 
@@ -51,6 +52,7 @@ def test_logical_scalar_forward_backward(val, seed, fname, ctx, func_name):
                          list_ctx_and_func_name(['greater_scalar',
                                                  'greater_equal_scalar',
                                                  'less_scalar',
+                                                 'less_equal_scalar',
                                                  'equal_scalar',
                                                  'not_equal_scalar']))
 @pytest.mark.parametrize("val", [-0.5, 0., 1.])
@@ -59,7 +61,7 @@ def test_logical_scalar_compare_forward_backward(val, seed, fname, ctx, func_nam
     func = getattr(F, fname)
     ref_func = eval('lambda x, y: x {} y'.format(opstr))
     rng = np.random.RandomState(seed)
-    inputs = [rng.randint(0, 2, size=(2, 3, 4)) for _ in range(1)]
+    inputs = [rng.randint(0, 2, size=(2, 3, 4)).astype(np.float32) for _ in range(1)]
     inputs[0][..., :2] = val
     function_tester(rng, func, ref_func, inputs, [val],
                     ctx=ctx, backward=[False, False], func_name=func_name)
@@ -76,7 +78,7 @@ def test_logical_binary_forward_backward(seed, fname, ctx, func_name):
     func = getattr(F, fname)
     ref_func = getattr(np, fname)
     rng = np.random.RandomState(seed)
-    inputs = [rng.randint(0, 2, size=(2, 3, 4)) for _ in range(2)]
+    inputs = [rng.randint(0, 2, size=(2, 3, 4)).astype(np.float32) for _ in range(2)]
     function_tester(rng, func, ref_func, inputs,
                     ctx=ctx, backward=[False, False], func_name=func_name)
 
@@ -86,14 +88,15 @@ def test_logical_binary_forward_backward(seed, fname, ctx, func_name):
                          list_ctx_and_func_name(['greater',
                                                  'greater_equal',
                                                  'less',
+                                                 'less_equal',
                                                  'equal',
                                                  'not_equal']))
 def test_logical_binary_compare_forward_backward(seed, fname, ctx, func_name):
     func = getattr(F, fname)
     opstr = opstrs[fname]
     ref_func = eval('lambda x, y: x {} y'.format(opstr))
     rng = np.random.RandomState(seed)
-    inputs = [rng.randint(0, 2, size=(2, 3, 4)) for _ in range(2)]
+    inputs = [rng.randint(0, 2, size=(2, 3, 4)).astype(np.float32) for _ in range(2)]
     inputs[0][..., :2] = inputs[1][..., :2]
     function_tester(rng, func, ref_func, inputs,
                     ctx=ctx, backward=[False, False], func_name=func_name)
@@ -108,6 +111,6 @@ def test_logical_not_forward_backward(seed, fname, ctx, func_name):
     func = getattr(F, fname)
     ref_func = getattr(np, fname)
     rng = np.random.RandomState(seed)
-    inputs = [rng.randint(0, 2, size=(2, 3, 4))]
+    inputs = [rng.randint(0, 2, size=(2, 3, 4)).astype(np.float32)]
     function_tester(rng, func, ref_func, inputs,
                     ctx=ctx, backward=[False], func_name=func_name)