remove remaining references to dpctl.program

Author: ndgrigorian

dpctl/_sycl_queue.pxd

@@ -32,7 +32,7 @@ from ._backend cimport (
 from ._sycl_context cimport SyclContext
 from ._sycl_device cimport SyclDevice
 from ._sycl_event cimport SyclEvent
-from .program._program cimport SyclKernel
+from .compiler._compiler cimport SyclKernel
 
 
 cdef public api class _SyclQueue [

dpctl/_sycl_queue.pyx

@@ -383,7 +383,7 @@ kernel_arg_type = _kernel_arg_type()
 cdef class SyclKernelSubmitError(Exception):
     """
     A ``SyclKernelSubmitError`` exception is raised when
-    the provided :class:`.program.SyclKernel` could not be
+    the provided :class:`.compiler.SyclKernel` could not be
     submitted to the :class:`.SyclQueue`.
 
     """
@@ -1178,10 +1178,10 @@ cdef class SyclQueue(_SyclQueue):
         list dEvents=None
     ):
         """
-        Asynchronously submit :class:`dpctl.program.SyclKernel` for execution.
+        Asynchronously submit :class:`dpctl.compiler.SyclKernel` for execution.
 
         Args:
-            kernel (dpctl.program.SyclKernel):
+            kernel (dpctl.compiler.SyclKernel):
                 SYCL kernel object
             args (List[object]):
                 List of kernel arguments
@@ -1339,10 +1339,10 @@ cdef class SyclQueue(_SyclQueue):
         list dEvents=None
     ):
         """
-        Submit :class:`dpctl.program.SyclKernel` for execution.
+        Submit :class:`dpctl.compiler.SyclKernel` for execution.
 
         Args:
-            kernel (dpctl.program.SyclKernel):
+            kernel (dpctl.compiler.SyclKernel):
                 SYCL kernel object
             args (List[object]):
                 List of kernel arguments

dpctl/apis/include/dpctl_capi.h

@@ -45,8 +45,8 @@
 #include "dpctl/_sycl_queue_api.h"
 #include "dpctl/memory/_memory.h"
 #include "dpctl/memory/_memory_api.h"
-#include "dpctl/program/_program.h"
-#include "dpctl/program/_program_api.h"
+#include "dpctl/compiler/_compiler.h"
+#include "dpctl/compiler/_compiler_api.h"
 
 // clang-format on
 
@@ -66,6 +66,6 @@ static inline void import_dpctl(void)
     import_dpctl___sycl_event();
     import_dpctl___sycl_queue();
     import_dpctl__memory___memory();
-    import_dpctl__program___program();
+    import_dpctl__compiler___compiler();
     return;
 }

dpctl/compiler/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 file(GLOB _cython_sources *.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)

dpctl/compiler/_compiler.pxd

@@ -68,7 +68,3 @@ cpdef create_kernel_bundle_from_spirv (
     unicode copts=*,
     list specializations=*,
 )
-cpdef create_program_from_source (SyclQueue q, unicode source, unicode copts=*)
-cpdef create_program_from_spirv (
-    SyclQueue q, const unsigned char[:] IL, unicode copts=*
-)

dpctl/compiler/_compiler.pyx

@@ -186,14 +186,14 @@ cdef class SyclKernel:
 
 cdef api DPCTLSyclKernelRef SyclKernel_GetKernelRef(SyclKernel ker):
     """ C-API function to access opaque kernel reference from
-    Python object of type :class:`dpctl.program.SyclKernel`.
+    Python object of type :class:`dpctl.compiler.SyclKernel`.
     """
     return ker.get_kernel_ref()
 
 
 cdef api SyclKernel SyclKernel_Make(DPCTLSyclKernelRef KRef, const char *name):
     """
-    C-API function to create :class:`dpctl.program.SyclKernel`
+    C-API function to create :class:`dpctl.compiler.SyclKernel`
     instance from opaque sycl kernel reference.
     """
     cdef DPCTLSyclKernelRef copied_KRef = DPCTLKernel_Copy(KRef)
@@ -252,14 +252,14 @@ cdef api DPCTLSyclKernelBundleRef SyclKernelBundle_GetKernelBundleRef(
     SyclKernelBundle kb
 ):
     """ C-API function to access opaque kernel bundle reference from
-    Python object of type :class:`dpctl.program.SyclKernelBundle`.
+    Python object of type :class:`dpctl.compiler.SyclKernelBundle`.
     """
     return kb.get_kernel_bundle_ref()
 
 
 cdef api SyclKernelBundle SyclKernelBundle_Make(DPCTLSyclKernelBundleRef KBRef):
     """
-    C-API function to create :class:`dpctl.program.SyclKernelBundle`
+    C-API function to create :class:`dpctl.compiler.SyclKernelBundle`
     instance from opaque ``sycl::kernel_bundle<sycl::bundle_state::executable>``
     reference.
     """
@@ -272,7 +272,7 @@ cdef class SpecializationConstant:
     SpecializationConstant(spec_id, *args)
 
     Python class representing SYCL specialization constants that can be used
-    when creating a :class:`dpctl.program.SyclKernelBundle` from SPIR-V.
+    when creating a :class:`dpctl.compiler.SyclKernelBundle` from SPIR-V.
 
     There are multiple ways to create a :class:`.SpecializationConstant`:
 

dpctl/tests/test_raw_kernel_arg.py

@@ -69,7 +69,7 @@ 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()
-    kb = dpctl.program.create_kernel_bundle_from_spirv(q, spv_bytes)
+    kb = dpctl.compiler.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_work_group_memory.py

@@ -62,7 +62,7 @@ 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()
-    kb = dpctl.program.create_kernel_bundle_from_spirv(q, spv_bytes)
+    kb = dpctl.compiler.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,7 +45,7 @@ def test_submit_work_group_memory_opencl():
     except dpctl.SyclQueueCreationError:
         pytest.skip("OpenCL queue could not be created")
 
-    kb = dpctl.program.create_kernel_bundle_from_source(q, ocl_kernel_src)
+    kb = dpctl.compiler.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/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR)
 
 project(use_queue_device VERSION 0.1 LANGUAGES CXX
-  DESCRIPTION "Example of using dpctl.program.SyclKernel <-> sycl::kernel type casting")
+  DESCRIPTION "Example of using dpctl.compiler.SyclKernel <-> sycl::kernel type casting")
 
 set(DPCTL_CMAKE_MODULES_PATH "${CMAKE_SOURCE_DIR}/../../../cmake")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DPCTL_CMAKE_MODULES_PATH})