Remove more references to programs

Author: ndgrigorian

dpctl/tests/test_raw_kernel_arg.py

@@ -69,8 +69,8 @@ def launch_raw_arg_kernel(raw):
     spirv_file = get_spirv_abspath("raw-arg-kernel.spv")
     with open(spirv_file, "br") as spv:
         spv_bytes = spv.read()
-    prog = dpctl.program.create_kernel_bundle_from_spirv(q, spv_bytes)
-    kernel = prog.get_sycl_kernel("__sycl_kernel_raw_arg_kernel")
+    kb = dpctl.program.create_kernel_bundle_from_spirv(q, spv_bytes)
+    kernel = kb.get_sycl_kernel("__sycl_kernel_raw_arg_kernel")
     local_size = 16
     global_size = local_size * 8
 

dpctl/tests/test_sycl_event.py

@@ -37,8 +37,8 @@ def produce_event(profiling=False):
         q = dpctl.SyclQueue("opencl:cpu", property="enable_profiling")
     else:
         q = dpctl.SyclQueue("opencl:cpu")
-    prog = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
-    addKernel = prog.get_sycl_kernel("add")
+    kb = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
+    addKernel = kb.get_sycl_kernel("add")
 
     n = 1024 * 1024
     a = np.arange(n, dtype="i")
@@ -158,10 +158,10 @@ def test_get_wait_list():
             size_t index = get_global_id(0);                               \
             a[index] = sin(a[index]);                                      \
         }"
-    prog = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
-    addKernel = prog.get_sycl_kernel("add_k")
-    sqrtKernel = prog.get_sycl_kernel("sqrt_k")
-    sinKernel = prog.get_sycl_kernel("sin_k")
+    kb = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
+    addKernel = kb.get_sycl_kernel("add_k")
+    sqrtKernel = kb.get_sycl_kernel("sqrt_k")
+    sinKernel = kb.get_sycl_kernel("sin_k")
 
     n = 1024 * 1024
     a = np.arange(n, dtype="f")

dpctl/tests/test_sycl_kernel_submit.py

@@ -59,8 +59,8 @@ def test_create_kernel_bundle_from_source(ctype_str, dtype, ctypes_ctor):
         "   c[index] = d * a[index] + b[index];"
         "}"
     )
-    prog = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
-    axpyKernel = prog.get_sycl_kernel("axpy")
+    kb = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
+    axpyKernel = kb.get_sycl_kernel("axpy")
 
     n_elems = 1024 * 512
     lws = 128
@@ -174,10 +174,10 @@ def test_submit_async():
         "      (arg1[index] < arg2[index]) ? arg1[index] : arg2[index];"
         "}"
     )
-    prog = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
-    kern1Kernel = prog.get_sycl_kernel("kern1")
-    kern2Kernel = prog.get_sycl_kernel("kern2")
-    kern3Kernel = prog.get_sycl_kernel("kern3")
+    kb = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
+    kern1Kernel = kb.get_sycl_kernel("kern1")
+    kern2Kernel = kb.get_sycl_kernel("kern2")
+    kern3Kernel = kb.get_sycl_kernel("kern3")
 
     assert isinstance(kern1Kernel, dpctl_prog.SyclKernel)
     assert isinstance(kern2Kernel, dpctl_prog.SyclKernel)
@@ -322,8 +322,8 @@ def test_submit_local_accessor_arg():
     fn = get_spirv_abspath("local_accessor_kernel_inttys_fp32.spv")
     with open(fn, "br") as f:
         spirv_bytes = f.read()
-    prog = dpctl_prog.create_kernel_bundle_from_spirv(q, spirv_bytes)
-    krn = prog.get_sycl_kernel("_ZTS14SyclKernel_SLMIlE")
+    kb = dpctl_prog.create_kernel_bundle_from_spirv(q, spirv_bytes)
+    krn = kb.get_sycl_kernel("_ZTS14SyclKernel_SLMIlE")
     lws = 32
     gws = lws * 10
     x = np.ones(gws, dtype="i8")

dpctl/tests/test_sycl_program.py

@@ -147,15 +147,15 @@ def _check_cpython_api_SyclKernel_Make(krn):
     assert krn.work_group_size == k3.work_group_size
 
 
-def _check_multi_kernel_program(prog):
-    assert type(prog) is dpctl_prog.SyclKernelBundle
+def _check_multi_kernel_program(kb):
+    assert type(kb) is dpctl_prog.SyclKernelBundle
 
-    assert type(prog.addressof_ref()) is int
-    assert prog.has_sycl_kernel("add")
-    assert prog.has_sycl_kernel("axpy")
+    assert type(kb.addressof_ref()) is int
+    assert kb.has_sycl_kernel("add")
+    assert kb.has_sycl_kernel("axpy")
 
-    addKernel = prog.get_sycl_kernel("add")
-    axpyKernel = prog.get_sycl_kernel("axpy")
+    addKernel = kb.get_sycl_kernel("add")
+    axpyKernel = kb.get_sycl_kernel("axpy")
 
     assert "add" == addKernel.get_function_name()
     assert "axpy" == axpyKernel.get_function_name()
@@ -185,8 +185,8 @@ def _check_multi_kernel_program(prog):
         cmsgsz = krn.compile_sub_group_size
         assert type(cmsgsz) is int
 
-    _check_cpython_api_SyclKernelBundle_GetKernelBundleRef(prog)
-    _check_cpython_api_SyclKernelBundle_Make(prog)
+    _check_cpython_api_SyclKernelBundle_GetKernelBundleRef(kb)
+    _check_cpython_api_SyclKernelBundle_Make(kb)
 
 
 def test_create_kernel_bundle_from_source_ocl():
@@ -203,8 +203,8 @@ def test_create_kernel_bundle_from_source_ocl():
         q = dpctl.SyclQueue("opencl")
     except dpctl.SyclQueueCreationError:
         pytest.skip("No OpenCL queue is available")
-    prog = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
-    _check_multi_kernel_program(prog)
+    kb = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
+    _check_multi_kernel_program(kb)
 
 
 def test_create_kernel_bundle_from_spirv_ocl():
@@ -215,8 +215,8 @@ def test_create_kernel_bundle_from_spirv_ocl():
     spirv_file = get_spirv_abspath("multi_kernel.spv")
     with open(spirv_file, "rb") as fin:
         spirv = fin.read()
-    prog = dpctl_prog.create_kernel_bundle_from_spirv(q, spirv)
-    _check_multi_kernel_program(prog)
+    kb = dpctl_prog.create_kernel_bundle_from_spirv(q, spirv)
+    _check_multi_kernel_program(kb)
 
 
 def test_create_kernel_bundle_from_spirv_l0():
@@ -227,8 +227,8 @@ def test_create_kernel_bundle_from_spirv_l0():
     spirv_file = get_spirv_abspath("multi_kernel.spv")
     with open(spirv_file, "rb") as fin:
         spirv = fin.read()
-    prog = dpctl_prog.create_kernel_bundle_from_spirv(q, spirv)
-    _check_multi_kernel_program(prog)
+    kb = dpctl_prog.create_kernel_bundle_from_spirv(q, spirv)
+    _check_multi_kernel_program(kb)
 
 
 @pytest.mark.xfail(
@@ -248,8 +248,8 @@ def test_create_kernel_bundle_from_source_l0():
         size_t index = get_global_id(0);                                   \
         c[index] = a[index] + d*b[index];                                  \
     }"
-    prog = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
-    _check_multi_kernel_program(prog)
+    kb = dpctl_prog.create_kernel_bundle_from_source(q, oclSrc)
+    _check_multi_kernel_program(kb)
 
 
 def test_create_kernel_bundle_from_invalid_src_ocl():

dpctl/tests/test_work_group_memory.py

@@ -62,8 +62,8 @@ def test_submit_work_group_memory():
     spirv_file = get_spirv_abspath("work-group-memory-kernel.spv")
     with open(spirv_file, "br") as spv:
         spv_bytes = spv.read()
-    prog = dpctl.program.create_kernel_bundle_from_spirv(q, spv_bytes)
-    kernel = prog.get_sycl_kernel("__sycl_kernel_local_mem_kernel")
+    kb = dpctl.program.create_kernel_bundle_from_spirv(q, spv_bytes)
+    kernel = kb.get_sycl_kernel("__sycl_kernel_local_mem_kernel")
     local_size = 16
     global_size = local_size * 8
 

dpctl/tests/test_work_group_memory_opencl.py

@@ -45,8 +45,8 @@ def test_submit_work_group_memory_opencl():
     except dpctl.SyclQueueCreationError:
         pytest.skip("OpenCL queue could not be created")
 
-    prog = dpctl.program.create_kernel_bundle_from_source(q, ocl_kernel_src)
-    kernel = prog.get_sycl_kernel("local_mem_kernel")
+    kb = dpctl.program.create_kernel_bundle_from_source(q, ocl_kernel_src)
+    kernel = kb.get_sycl_kernel("local_mem_kernel")
     local_size = 16
     global_size = local_size * 8
 

examples/pybind11/use_dpctl_sycl_kernel/tests/test_user_kernel.py

@@ -45,8 +45,8 @@ def test_kernel_can_be_found():
         q = dpctl.SyclQueue()
     except dpctl.SyclQueueCreationError:
         pytest.skip("Could not create default queue")
-    pr = dppr.create_kernel_bundle_from_spirv(q, il, "")
-    assert pr.has_sycl_kernel("double_it")
+    kb = dppr.create_kernel_bundle_from_spirv(q, il, "")
+    assert kb.has_sycl_kernel("double_it")
 
 
 def test_kernel_submit_through_extension():
@@ -57,8 +57,8 @@ def test_kernel_submit_through_extension():
         q = dpctl.SyclQueue()
     except dpctl.SyclQueueCreationError:
         pytest.skip("Could not create default queue")
-    pr = dppr.create_kernel_bundle_from_spirv(q, il, "")
-    krn = pr.get_sycl_kernel("double_it")
+    kb = dppr.create_kernel_bundle_from_spirv(q, il, "")
+    krn = kb.get_sycl_kernel("double_it")
     assert krn.num_args == 2
 
     x = np.arange(0, stop=13, step=1, dtype="i4")

libsyclinterface/include/syclinterface/dpctl_sycl_kernel_bundle_interface.h

@@ -20,8 +20,8 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// This header declares a C API to create Sycl interoperability programs for
-/// OpenCL and Level Zero driver API.
+/// This header declares a C API to create Sycl kernel bundles for OpenCL and
+/// Level Zero backends.
 ///
 //===----------------------------------------------------------------------===//
 
@@ -70,7 +70,7 @@ DPCTLKernelBundle_CreateFromSpirv(__dpctl_keep const DPCTLSyclContextRef Ctx,
  * @param    Dev            An opaque pointer to a sycl::device
  * @param    Source         OpenCL source string
  * @param    CompileOpts    Extra compiler flags (refer Sycl spec.)
- * @return   A new SyclKernelBundleRef pointer if the program creation
+ * @return   A new SyclKernelBundleRef pointer if the kernel bundle creation
  * succeeded, else returns NULL.
  * @ingroup KernelBundleInterface
  */
@@ -82,8 +82,8 @@ __dpctl_give DPCTLSyclKernelBundleRef DPCTLKernelBundle_CreateFromOCLSource(
     __dpctl_keep const char *CompileOpts);
 
 /*!
- * @brief Returns the SyclKernel with given name from the program, if not found
- * then return NULL.
+ * @brief Returns the SyclKernel with given name from the kernel bundle, if
+ * not found then return NULL.
  *
  * @param    KBRef          Opaque pointer to a sycl::kernel_bundle
  * @param    KernelName     Name of kernel
@@ -96,8 +96,8 @@ DPCTLKernelBundle_GetKernel(__dpctl_keep DPCTLSyclKernelBundleRef KBRef,
                             __dpctl_keep const char *KernelName);
 
 /*!
- * @brief Return True if a SyclKernel with given name exists in the program, if
- * not found then returns False.
+ * @brief Return True if a SyclKernel with given name exists in the kernel
+ * bundle, if not found then returns False.
  *
  * @param    KBRef          Opaque pointer to a sycl::kernel_bundle
  * @param    KernelName     Name of kernel

libsyclinterface/tests/test_sycl_kernel_bundle_interface.cpp

@@ -147,7 +147,7 @@ TEST_P(TestDPCTLSyclKernelBundleInterface, ChkCreateFromSpirvNull)
     ASSERT_TRUE(KBRef == nullptr);
 }
 
-TEST_P(TestDPCTLSyclKernelBundleInterface, ChkHasKernelNullProgram)
+TEST_P(TestDPCTLSyclKernelBundleInterface, ChkHasKernelNullKernelBundle)
 {
 
     DPCTLSyclKernelBundleRef NullRef = nullptr;
@@ -168,7 +168,7 @@ TEST_P(TestDPCTLSyclKernelBundleInterface, ChkGetKernel)
     EXPECT_NO_FATAL_FAILURE(DPCTLKernel_Delete(NullKernel));
 }
 
-TEST_P(TestDPCTLSyclKernelBundleInterface, ChkGetKernelNullProgram)
+TEST_P(TestDPCTLSyclKernelBundleInterface, ChkGetKernelNullKernelBundle)
 {
     DPCTLSyclKernelBundleRef NullRef = nullptr;
     DPCTLSyclKernelRef KRef = nullptr;