Update examples to latest code base.

Diptorup Deb · Diptorup Deb · commit 60eaeb76448a · 2023-05-22T22:16:29.000-05:00
- Replace NumPy with dpnp for kernel arguments.
    - Remove the use of dpctl.device_context
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -148,7 +148,7 @@ jobs:
           source $CONDA/etc/profile.d/conda.sh
           conda activate numba_dpex_env
           # echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd
-          for script in $(find . \( -not -name "_*" -not -name "vector_sum2D.py" -not -name "vectorize.py" -not -name "scan.py" -and -name "*.py" \))
+          for script in $(find . \( -not -name "_*" -not -name "side-by-side*" -not -name "vectorize.py" -not -name "scan.py" -and -name "*.py" \))
           do
             echo "Executing ${script}"
             python ${script} || exit 1
diff --git a/numba_dpex/examples/auto_offload_examples/sum-1d.py b/numba_dpex/examples/auto_offload_examples/sum-1d.py
diff --git a/numba_dpex/examples/auto_offload_examples/sum-2d.py b/numba_dpex/examples/auto_offload_examples/sum-2d.py
diff --git a/numba_dpex/examples/debug/dpex_func.py b/numba_dpex/examples/debug/dpex_func.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import dpctl
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -37,14 +37,7 @@ def main():
     b = np.arange(N, dtype=np.float32)
     c = np.empty_like(a)
 
-    # Use the environment variable SYCL_DEVICE_FILTER to change the default device.
-    # See https://github.com/intel/llvm/blob/sycl/sycl/doc/EnvironmentVariables.md#sycl_device_filter.
-    device = dpctl.select_default_device()
-    print("Using device ...")
-    device.print_device_info()
-
-    with dpctl.device_context(device):
-        driver(a, b, c, global_size)
+    driver(a, b, c, global_size)
 
     print("Done...")
 
diff --git a/numba_dpex/examples/debug/njit_basic.py b/numba_dpex/examples/debug/njit_basic.py
@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from numba import njit
+from numba_dpex import dpjit
 
 
-@njit(debug=True)
+@dpjit(debug=True)
 def foo(arg):
     l1 = arg + 6
     l2 = arg * 5.43
@@ -14,8 +14,7 @@ def foo(arg):
 
 
 def main():
-    result = foo(987)
-    print(result)
+    foo(987)
 
 
 if __name__ == "__main__":
diff --git a/numba_dpex/examples/debug/simple_dpex_func.py b/numba_dpex/examples/debug/simple_dpex_func.py
@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import dpctl
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -25,8 +24,6 @@ def kernel_sum(a_in_kernel, b_in_kernel, c_in_kernel):
 b = np.arange(global_size, dtype=np.float32)
 c = np.empty_like(a)
 
-device = dpctl.select_default_device()
-with dpctl.device_context(device):
-    kernel_sum[ndpx.Range(global_size)](a, b, c)
+kernel_sum[ndpx.Range(global_size)](a, b, c)
 
 print("Done...")
diff --git a/numba_dpex/examples/debug/simple_sum.py b/numba_dpex/examples/debug/simple_sum.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import dpctl
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -21,8 +21,6 @@ def data_parallel_sum(a, b, c):
 b = np.array(np.random.random(N), dtype=np.float32)
 c = np.ones_like(a)
 
-device = dpctl.select_default_device()
-with dpctl.device_context(device):
-    data_parallel_sum[ndpx.Range(global_size)](a, b, c)
+data_parallel_sum[ndpx.Range(global_size)](a, b, c)
 
 print("Done...")
diff --git a/numba_dpex/examples/debug/sum.py b/numba_dpex/examples/debug/sum.py
@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import dpctl
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -32,14 +31,7 @@ def main():
     b = np.arange(N, dtype=np.float32)
     c = np.empty_like(a)
 
-    # Use the environment variable SYCL_DEVICE_FILTER to change the default device.
-    # See https://github.com/intel/llvm/blob/sycl/sycl/doc/EnvironmentVariables.md#sycl_device_filter.
-    device = dpctl.select_default_device()
-    print("Using device ...")
-    device.print_device_info()
-
-    with dpctl.device_context(device):
-        driver(a, b, c, global_size)
+    driver(a, b, c, global_size)
 
     print("Done...")
 
diff --git a/numba_dpex/examples/debug/sum_local_vars.py b/numba_dpex/examples/debug/sum_local_vars.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import dpctl
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -23,8 +23,6 @@ def data_parallel_sum(a, b, c):
 b = np.array(np.random.random(N), dtype=np.float32)
 c = np.ones_like(a)
 
-device = dpctl.select_default_device()
-with dpctl.device_context(device):
-    data_parallel_sum[ndpx.Range(global_size)](a, b, c)
+data_parallel_sum[ndpx.Range(global_size)](a, b, c)
 
 print("Done...")
diff --git a/numba_dpex/examples/debug/sum_local_vars_revive.py b/numba_dpex/examples/debug/sum_local_vars_revive.py
@@ -2,8 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import dpctl
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -29,8 +28,6 @@ def data_parallel_sum(a, b, c):
 b = np.array(np.random.random(N), dtype=np.float32)
 c = np.ones_like(a)
 
-device = dpctl.select_default_device()
-with dpctl.device_context(device):
-    data_parallel_sum[ndpx.Range(global_size)](a, b, c)
+data_parallel_sum[ndpx.Range(global_size)](a, b, c)
 
 print("Done...")
diff --git a/numba_dpex/examples/dpjit/vector_sum.py b/numba_dpex/examples/dpjit/vector_sum.py
@@ -0,0 +1,40 @@
+# Copyright 2020 - 2023 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import dpnp as np
+
+from numba_dpex import dpjit
+
+
+@dpjit
+def f1(a, b):
+    c = a + b
+    return c
+
+
+def main():
+    global_size = 64
+    local_size = 32
+    N = global_size * local_size
+    print("N", N)
+
+    a = np.ones(N, dtype=np.float32)
+    b = np.ones(N, dtype=np.float32)
+
+    print(a)
+    print(b)
+
+    c = f1(a, b)
+
+    print("RESULT c:", c)
+    for i in range(N):
+        if c[i] != 2.0:
+            print("First index not equal to 2.0 was", i)
+            break
+
+    print("Done...")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/numba_dpex/examples/dpjit/vector_sum2D.py b/numba_dpex/examples/dpjit/vector_sum2D.py
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2020 - 2023 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import dpnp as np
+
+from numba_dpex import dpjit
+
+
+@dpjit
+def f1(a, b):
+    c = a + b
+    return c
+
+
+N = 1000
+print("N", N)
+
+a = np.ones((N, N), dtype=np.float32)
+b = np.ones((N, N), dtype=np.float32)
+
+print("a:", a)
+print("b:", b)
+
+
+def main():
+    c = f1(a, b)
+    print("c:", c)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/numba_dpex/examples/kernel/pairwise_distance.py b/numba_dpex/examples/kernel/pairwise_distance.py
@@ -9,7 +9,7 @@
 
 import dpctl
 import dpctl.memory as dpctl_mem
-import numpy as np
+import dpnp as np
 
 import numba_dpex as ndpx
 
@@ -54,42 +54,23 @@ def pairwise_distance(X, D, xshape0, xshape1):
 def driver():
     # measure running time
     times = list()
-
-    xbuf = dpctl_mem.MemoryUSMShared(X.size * X.dtype.itemsize)
-    x_ndarray = np.ndarray(X.shape, buffer=xbuf, dtype=X.dtype)
-    np.copyto(x_ndarray, X)
-
-    dbuf = dpctl_mem.MemoryUSMShared(D.size * D.dtype.itemsize)
-    d_ndarray = np.ndarray(D.shape, buffer=dbuf, dtype=D.dtype)
-    np.copyto(d_ndarray, D)
-
     for repeat in range(args.r):
         start = time()
         pairwise_distance[ndpx.NdRange(global_size, local_size)](
-            x_ndarray, d_ndarray, X.shape[0], X.shape[1]
+            X, D, X.shape[0], X.shape[1]
         )
         end = time()
 
         total_time = end - start
         times.append(total_time)
 
-    np.copyto(X, x_ndarray)
-    np.copyto(D, d_ndarray)
-
     return times
 
 
 def main():
     times = None
 
-    # Use the environment variable SYCL_DEVICE_FILTER to change the default device.
-    # See https://github.com/intel/llvm/blob/sycl/sycl/doc/EnvironmentVariables.md#sycl_device_filter.
-    device = dpctl.select_default_device()
-    print("Using device ...")
-    device.print_device_info()
-
-    with dpctl.device_context(device):
-        times = driver()
+    times = driver()
 
     times = np.asarray(times, dtype=np.float32)
     t = Template("Average time of $runs is = ${timing}")
diff --git a/numba_dpex/examples/rand.py b/numba_dpex/examples/rand.py
diff --git a/numba_dpex/examples/sum_reduction.py b/numba_dpex/examples/sum_reduction.py
