TESTS: Reorganizing the tests folder for easier testing

- Fixing the af.display function when called with an alias

Author: pavanky

arrayfire/array.py

@@ -1041,6 +1041,12 @@ def display(a):
         Multi dimensional arrayfire array
     """
     expr = inspect.stack()[1][-2]
-    if (expr is not None):
-        print('%s' % expr[0].split('display(')[1][:-2])
-    safe_call(backend.get().af_print_array(a.arr))
+
+    try:
+        if (expr is not None):
+            st = expr[0].find('(') + 1
+            en = expr[0].rfind(')')
+            print('%s' % expr[0][st:en])
+            safe_call(backend.get().af_print_array(a.arr))
+    except:
+        safe_call(backend.get().af_print_array(a.arr))

tests/__main__.py

@@ -0,0 +1,44 @@
+#######################################################
+# Copyright (c) 2015, ArrayFire
+# All rights reserved.
+#
+# This file is distributed under 3-clause BSD license.
+# The complete license agreement can be obtained at:
+# http://arrayfire.com/licenses/BSD-3-Clause
+########################################################
+
+import sys
+from simple_tests import *
+
+tests = {}
+tests['simple'] = simple.tests
+
+def assert_valid(name, name_list, name_str):
+    is_valid = any([name == val for val in name_list])
+    if not is_valid:
+        err_str  = "The first argument needs to be a %s name\n" % name_str
+        err_str += "List of supported %ss: %s" % (name_str, str(list(name_list)))
+        raise RuntimeError(err_str)
+
+if __name__ == "__main__":
+
+    module_name = None
+    num_args = len(sys.argv)
+
+    if (num_args > 1):
+        module_name = sys.argv[1].lower()
+        assert_valid(sys.argv[1].lower(), tests.keys(), "module")
+
+    if (module_name is None):
+        for name in tests:
+            tests[name].run()
+    else:
+        test = tests[module_name]
+        test_list = None
+
+        if (num_args > 2):
+            test_list = sys.argv[2:]
+            for test_name in test_list:
+                assert_valid(test_name.lower(), test.keys(), "test")
+
+        test.run(test_list)

tests/simple/__init__.py

@@ -0,0 +1,21 @@
+#######################################################
+# Copyright (c) 2015, ArrayFire
+# All rights reserved.
+#
+# This file is distributed under 3-clause BSD license.
+# The complete license agreement can be obtained at:
+# http://arrayfire.com/licenses/BSD-3-Clause
+########################################################
+
+from .algorithm import *
+from .arith import *
+from .array_test import *
+from .blas import *
+from .data import *
+from .device import *
+from .image import *
+from .index import *
+from .lapack import *
+from .signal import *
+from .statistics import *
+from ._util import tests

tests/simple/_util.py

@@ -0,0 +1,50 @@
+#######################################################
+# Copyright (c) 2015, ArrayFire
+# All rights reserved.
+#
+# This file is distributed under 3-clause BSD license.
+# The complete license agreement can be obtained at:
+# http://arrayfire.com/licenses/BSD-3-Clause
+########################################################
+
+import arrayfire as af
+
+def display_func(verbose):
+    if (verbose):
+        return af.display
+    else:
+        def eval_func(foo):
+            res = foo
+        return eval_func
+
+def print_func(verbose):
+    def print_func_impl(*args):
+        if (verbose):
+            print(args)
+        else:
+            res = [args]
+    return print_func_impl
+
+class _simple_test_dict(dict):
+
+    def __init__(self):
+        self.print_str = "Simple %16s: %s"
+        super(_simple_test_dict, self).__init__()
+
+    def run(self, name_list=None, verbose=False):
+        test_list = name_list if name_list is not None else self.keys()
+        for key in test_list:
+
+            try:
+                test = self[key]
+            except:
+                print(self.print_str % (key, "NOTFOUND"))
+                continue
+
+            try:
+                test(verbose)
+                print(self.print_str % (key, "PASSED"))
+            except:
+                print(self.print_str % (key, "FAILED"))
+
+tests = _simple_test_dict()

tests/simple/algorithm.py

@@ -0,0 +1,78 @@
+#!/usr/bin/python
+#######################################################
+# Copyright (c) 2015, ArrayFire
+# All rights reserved.
+#
+# This file is distributed under 3-clause BSD license.
+# The complete license agreement can be obtained at:
+# http://arrayfire.com/licenses/BSD-3-Clause
+########################################################
+
+import arrayfire as af
+from . import _util
+
+def simple_algorithm(verbose = False):
+    display_func = _util.display_func(verbose)
+    print_func   = _util.print_func(verbose)
+
+    a = af.randu(3, 3)
+
+    print_func(af.sum(a), af.product(a), af.min(a), af.max(a),
+               af.count(a), af.any_true(a), af.all_true(a))
+
+    display_func(af.sum(a, 0))
+    display_func(af.sum(a, 1))
+
+    display_func(af.product(a, 0))
+    display_func(af.product(a, 1))
+
+    display_func(af.min(a, 0))
+    display_func(af.min(a, 1))
+
+    display_func(af.max(a, 0))
+    display_func(af.max(a, 1))
+
+    display_func(af.count(a, 0))
+    display_func(af.count(a, 1))
+
+    display_func(af.any_true(a, 0))
+    display_func(af.any_true(a, 1))
+
+    display_func(af.all_true(a, 0))
+    display_func(af.all_true(a, 1))
+
+    display_func(af.accum(a, 0))
+    display_func(af.accum(a, 1))
+
+    display_func(af.sort(a, is_ascending=True))
+    display_func(af.sort(a, is_ascending=False))
+
+    val,idx = af.sort_index(a, is_ascending=True)
+    display_func(val)
+    display_func(idx)
+    val,idx = af.sort_index(a, is_ascending=False)
+    display_func(val)
+    display_func(idx)
+
+    b = af.randu(3,3)
+    keys,vals = af.sort_by_key(a, b, is_ascending=True)
+    display_func(keys)
+    display_func(vals)
+    keys,vals = af.sort_by_key(a, b, is_ascending=False)
+    display_func(keys)
+    display_func(vals)
+
+    c = af.randu(5,1)
+    d = af.randu(5,1)
+    cc = af.set_unique(c, is_sorted=False)
+    dd = af.set_unique(af.sort(d), is_sorted=True)
+    display_func(cc)
+    display_func(dd)
+
+    display_func(af.set_union(cc, dd, is_unique=True))
+    display_func(af.set_union(cc, dd, is_unique=False))
+
+    display_func(af.set_intersect(cc, cc, is_unique=True))
+    display_func(af.set_intersect(cc, cc, is_unique=False))
+
+_util.tests['algorithm'] = simple_algorithm