Merge pull request #1132 from IntelPython/main

Merge into GOLD

Author: Diptorup Deb

.github/workflows/conda-package.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10']
+        python: ['3.9', '3.10', '3.11']
         os: [ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}
@@ -93,7 +93,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10']
+        python: ['3.9', '3.10', '3.11']
         os: [ubuntu-20.04, ubuntu-latest, windows-latest]
         experimental: [false]
 
@@ -157,8 +157,9 @@ jobs:
           echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
 
       # We want to make sure that all dependecies install automatically.
+      # intel::intel-opencl-rt is needed for set-intel-ocl-icd-registry.ps1
       - name: Install builded package
-        run: mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} opencl_rt pytest -c ${{ env.CHANNEL_PATH }}
+        run: mamba install ${{ env.PACKAGE_NAME }}=${{ env.PACKAGE_VERSION }} intel::intel-opencl-rt pytest -c ${{ env.CHANNEL_PATH }}
 
       - name: Setup OpenCL CPU device
         if: runner.os == 'Windows'
@@ -199,7 +200,7 @@ jobs:
 
     strategy:
       matrix:
-        python: ['3.8', '3.9', '3.10']
+        python: ['3.9', '3.10', '3.11']
         os: [ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}

.github/workflows/docker.yml

@@ -22,7 +22,7 @@ on:
       oneapi_version:
         default: '2023.1.0.46401'
       python_versions:
-        default: '["3.8", "3.9", "3.10", "3.11"]'
+        default: '["3.9", "3.10", "3.11"]'
       buildkit_version:
         default: '0.11.6'
 

CHANGELOG.md

@@ -4,10 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.21.3] - 2023-09-21
+
+### Fixed
+* Mangled kernel name generation (#1112)
+
+### Added
+* Python 3.11 support (#1123)
+* Security policy (#1117)
+* scikit-build to build native extensions (#1107, #1127)
+
+### Changed
+* The data model used by the DpnpNdArray type for kernel functions(#1118)
+
+### Removed
+* Support for Python 3.8 (#1113)
+
 ## [0.21.2] - 2023-08-07
 
 ### Fixed
-* Bugs (#1068, #774) in atomic addition caused due to imporper floating point atomic emulation. (#1103)
+* Bugs (#1068, #774) in atomic addition caused due to improper floating point atomic emulation. (#1103)
 
 ### Changed
 * Updated documentation and user guides (#1097, #879)

CMakeLists.txt

@@ -0,0 +1,34 @@
+#[=======================================================================[.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)
+
+message(STATUS "NUMBA_DPEX_VERSION=" "${NUMBA_DPEX_VERSION}")
+
+project(numba-dpex
+    DESCRIPTION "An extension for Numba to add data-parallel offload capability"
+    VERSION ${NUMBA_DPEX_VERSION}
+)
+
+if(IS_INSTALL)
+    install(DIRECTORY numba_dpex
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
+        FILES_MATCHING PATTERN "*.py")
+endif()
+
+add_subdirectory(numba_dpex)

MANIFEST.in

@@ -1,9 +1,6 @@
 include MANIFEST.in
 include README.md setup.py LICENSE
 
-recursive-include numba_dpex *.cl
-recursive-include numba_dpex *.spir
-
 include versioneer.py
 include numba_dpex/_version.py
 

SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Report a Vulnerability
+
+Please report security issues or vulnerabilities to the [Intel® Security Center].
+
+For more information on how Intel® works to resolve security issues, see
+[Vulnerability Handling Guidelines].
+
+[Intel® Security Center]:https://www.intel.com/content/www/us/en/security-center/default.html
+
+[Vulnerability Handling Guidelines]:https://www.intel.com/content/www/us/en/security-center/vulnerability-handling-guidelines.html

build-environment.yml

@@ -17,7 +17,9 @@ requirements:
     host:
         - python
         - setuptools >=63.*
-        - numba 0.57*
+        - scikit-build >=0.15*
+        - cmake >=3.26*
+        - numba >=0.57*
         - dpctl >=0.14*
         - dpnp >=0.11*
         - dpcpp-llvm-spirv

conda-recipe/meta.yaml

@@ -37,7 +37,7 @@ Building from source
 --------------------
 
 ``numba-dpex`` can be built from source using either ``conda-build`` or
-``setuptools``.
+``setuptools`` (with ``scikit-build`` backend).
 
 Steps to build using ``conda-build``:
 
@@ -70,7 +70,7 @@ first step.
 
     # Create a conda environment that hass needed dependencies installed
     conda create -n numba-dpex-env                                             \
-        dpctl dpnp numba dpcpp-llvm-spirv llvmdev pytest           \
+        scikit-build cmake dpctl dpnp numba dpcpp-llvm-spirv llvmdev pytest    \
         -c intel -c conda-forge
     # Activate the environment
     conda activate numba-dpex-env

docs/source/getting_started.rst

@@ -16,6 +16,8 @@ dependencies:
   - mkl >=2021.3.0  # for dpnp
   - dpcpp-llvm-spirv
   - packaging
+  - scikit-build >=0.15*
+  - cmake >=3.26*
   - pytest
   - pip
   - pip: