Failsafe find_package(PythonLibs REQUIRED)

Add cmake to conda env

Fix CI build issues

setup.py docs fix

Debug github CI test issues

Fix jenkins

Author: chudur-budur

CMakeLists.txt

@@ -1,3 +1,21 @@
+#[=======================================================================[.rst:
+numba_dpex
+-----------
+
+A cmake file to compile the ``_dpexrt_python`` Python C extension for
+``numba_dpex``. You can build this component locally in-place by invoking these
+commands:
+
+.. code-block:: cmake
+    ~$ cmake .
+    ~$ cmake --build . --verbose
+
+Once compiled, the _dpexrt_python library will be in ``numba_dpex/core/runtime``
+folder.
+
+This ``CMakeLists.txt`` file will be used by ``setup.py``.
+#]=======================================================================]
+
 cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR)
 
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
@@ -11,4 +29,10 @@ project(numba-dpex
     VERSION ${NUMBA_DPEX_VERSION}
 )
 
+if(IS_INSTALL)
+    install(DIRECTORY numba_dpex
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
+        FILES_MATCHING PATTERN "*.py")
+endif()
+
 add_subdirectory(numba_dpex)

conda-recipe/meta.yaml

@@ -18,6 +18,7 @@ requirements:
         - python
         - setuptools >=63.*
         - scikit-build
+        - cmake
         - numba >=0.57*
         - dpctl >=0.14*
         - dpnp >=0.11*

environment.yml

@@ -8,7 +8,6 @@ channels:
   - nodefaults
 dependencies:
   - python=3.9
-  - scikit-build
   - gxx_linux-64
   - dpcpp_linux-64
   - numba >=0.57*
@@ -17,6 +16,8 @@ dependencies:
   - mkl >=2021.3.0  # for dpnp
   - dpcpp-llvm-spirv
   - packaging
+  - scikit-build
+  - cmake
   - pytest
   - pip
   - pip:

environment/coverage.yml

@@ -21,3 +21,4 @@ dependencies:
   - pytest-xdist
   - pexpect
   - scikit-build
+  - cmake

numba_dpex/CMakeLists.txt

@@ -20,8 +20,7 @@ endif()
 
 if(IS_INSTALL)
     install(DIRECTORY examples
-        DESTINATION numba_dpex
-        FILES_MATCHING PATTERN "*.py")
+        DESTINATION numba_dpex)
 endif()
 
 if(IS_INSTALL)

numba_dpex/core/runtime/CMakeLists.txt

@@ -1,3 +1,19 @@
+#[=======================================================================[.rst:
+_dpexrt_python
+---------------
+
+A cmake file to compile the ``_dpexrt_python`` Python C extension for
+``numba_dpex``. You can build this component locally in-place by invoking these
+commands:
+
+.. code-block:: cmake
+    ~$ cmake .
+    ~$ cmake --build . --verbose
+
+Once compiled, the _dpexrt_python library will be in ``numba_dpex/core/runtime``
+folder.
+#]=======================================================================]
+
 cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR)
 
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
@@ -9,43 +25,49 @@ project(_dpexrt_python
 )
 
 # Get numba include path
-execute_process(
-    COMMAND python -c "import numba; print(numba.extending.include_path());"
-    OUTPUT_VARIABLE Numba_INCLUDE_DIRS
-    RESULT_VARIABLE RET
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+if(NOT DEFINED Numba_INCLUDE_DIRS)
+    execute_process(
+        COMMAND python -c "import numba; print(numba.extending.include_path());"
+        OUTPUT_VARIABLE Numba_INCLUDE_DIRS
+        RESULT_VARIABLE RET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 
-if(RET EQUAL "1")
-    message(FATAL_ERROR "Module \'numba\' not found.")
+    if(RET EQUAL "1")
+        message(FATAL_ERROR "Module \'numba\' not found.")
+    endif()
 endif()
 
 # Get dpctl library path
-execute_process(
-    COMMAND python -c "import dpctl; import os; print(os.path.dirname(dpctl.__file__));"
-    OUTPUT_VARIABLE DPCTL_LIBRARY_PATH
-    RESULT_VARIABLE RET
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+if(NOT DEFINED DPCTL_LIBRARY_PATH)
+    execute_process(
+        COMMAND python -c "import dpctl; import os; print(os.path.dirname(dpctl.__file__));"
+        OUTPUT_VARIABLE DPCTL_LIBRARY_PATH
+        RESULT_VARIABLE RET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 
-if(RET EQUAL "1")
-    message(FATAL_ERROR "Module \'dpctl\' not found.")
+    if(RET EQUAL "1")
+        message(FATAL_ERROR "Module \'dpctl\' not found.")
+    endif()
 endif()
 
 # Update CMAKE_MODULE_PATH
 set(DPCTL_MODULE_PATH ${DPCTL_LIBRARY_PATH}/resources/cmake)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DPCTL_MODULE_PATH})
 
 # Get scikit-build path
-execute_process(
-    COMMAND python -c "import skbuild; print(skbuild.__path__[0]);"
-    OUTPUT_VARIABLE SKBUILD_PATH
-    RESULT_VARIABLE RET
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+if(NOT DEFINED SKBUILD_PATH)
+    execute_process(
+        COMMAND python -c "import skbuild; print(skbuild.__path__[0]);"
+        OUTPUT_VARIABLE SKBUILD_PATH
+        RESULT_VARIABLE RET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 
-if(RET EQUAL "1")
-    message(FATAL_ERROR "Module \'skbuild\' not found.")
+    if(RET EQUAL "1")
+        message(FATAL_ERROR "Module \'skbuild\' not found.")
+    endif()
 endif()
 
 # Update CMAKE_MODULE_PATH
@@ -63,7 +85,7 @@ find_package(Dpctl REQUIRED)
 
 # Includes
 include(GNUInstallDirs)
-include_directories(${PYTHON_INCLUDE_DIRS})
+include_directories(${Python_INCLUDE_DIRS})
 include_directories(${NumPy_INCLUDE_DIRS})
 include_directories(${Numba_INCLUDE_DIRS})
 include_directories(${Dpctl_INCLUDE_DIRS})
@@ -79,7 +101,7 @@ link_directories(${DPCTL_LIBRARY_PATH})
 add_library(${PROJECT_NAME} MODULE ${SOURCES})
 
 # Link the static library to python libraries and DPCTLSyclInterface
-target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${Python_LIBRARIES})
 target_link_libraries(${PROJECT_NAME} DPCTLSyclInterface)
 
 # Build python extension module

numba_dpex/tests/core/types/__init__.py

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: 2020 - 2023 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from . import *

pyproject.toml

@@ -51,6 +51,7 @@ requires = [
     "scikit-build>=0.13",
     "cmake>=3.18",
     "ninja",
+    "numba>=0.57",
     "versioneer-518"
 ]
 build-backend = "setuptools.build_meta"

setup.py

@@ -25,6 +25,9 @@
     `develop` command:
         ~$ python setup.py develop
 
+    To uninstall:
+        ~$ pip uninstall numba-dpex
+
     NOTE: This script doesn't support pypa/build, pypa/installer or other
     standards-based tools like pip, yet.
 
@@ -54,16 +57,16 @@ def to_cmake_format(version):
 
 
 # Set project auxilary data like readme and licence files
-with open("README.md") as f:
-    __readme_file__ = f.read()
+with open("README.md", "r") as f:
+    __readme__ = "".join(line for line in f.readlines()[12:35])
 
 
 # Main setup
 setup(
     name="numba-dpex",
     version=__version__,
     description="An extension for Numba to add data-parallel offload capability",
-    long_description=__readme_file__,
+    long_description=__readme__,
     long_description_content_type="text/markdown",
     license="Apache 2.0",
     classifiers=[
@@ -82,7 +85,7 @@ def to_cmake_format(version):
     author="Intel Corporation",
     url="https://github.com/IntelPython/numba-dpex",
     install_requires=["numba >={0:s}".format("0.57"), "dpctl", "packaging"],
-    packages=find_packages(["numba_dpex", "numba_dpex.*"]),
+    packages=find_packages("."),
     include_package_data=True,
     zip_safe=False,
     cmake_args=[