Merge remote-tracking branch 'origin/master' into sycl-kernel-api

Author: oleksandr-pavlyk

.github/workflows/python_style_checks.yml

@@ -27,18 +27,14 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        python-version: ['3.10']
-
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
       # Set up a Python environment for use in actions
       - uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: '3.10'
 
       # Run black code formatter
       - uses: psf/black@stable
@@ -49,16 +45,12 @@ jobs:
   flake8:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        python-version: ['3.10']
-
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

CMakeLists.txt

@@ -33,8 +33,8 @@ include(FetchContent)
 
 FetchContent_Declare(
     pybind11
-    URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.0.tar.gz
-    URL_HASH SHA256=eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec
+    URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.tar.gz
+    URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad
 )
 FetchContent_MakeAvailable(pybind11)
 

dpctl/_version.py

@@ -6,7 +6,7 @@
 # that just contains the computed version number.
 
 # This file is released into the public domain.
-# Generated by versioneer-0.26
+# Generated by versioneer-0.28
 # https://github.com/python-versioneer/python-versioneer
 
 """Git implementation of _version.py."""

examples/pybind11/external_usm_allocation/CMakeLists.txt

@@ -13,8 +13,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 include(FetchContent)
 FetchContent_Declare(
   pybind11
-  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.0.tar.gz
-  URL_HASH SHA256=eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec
+  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.tar.gz
+  URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad
 )
 FetchContent_MakeAvailable(pybind11)
 

examples/pybind11/onemkl_gemv/CMakeLists.txt

@@ -17,8 +17,8 @@ include(GNUInstallDirs)
 include(FetchContent)
 FetchContent_Declare(
   pybind11
-  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.0.tar.gz
-  URL_HASH SHA256=eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec
+  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.tar.gz
+  URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad
 )
 FetchContent_MakeAvailable(pybind11)
 

examples/pybind11/use_dpctl_syclqueue/CMakeLists.txt

@@ -13,8 +13,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 include(FetchContent)
 FetchContent_Declare(
   pybind11
-  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.0.tar.gz
-  URL_HASH SHA256=eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec
+  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.tar.gz
+  URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad
 )
 FetchContent_MakeAvailable(pybind11)
 

libsyclinterface/helper/source/dpctl_utils_helper.cpp

@@ -24,6 +24,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "dpctl_utils_helper.h"
+#include "Config/dpctl_config.h"
 #include <sstream>
 #include <string>
 
@@ -48,9 +49,11 @@ std::string DPCTL_DeviceTypeToStr(info::device_type devTy)
     case info::device_type::custom:
         ss << "custom";
         break;
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case info::device_type::host:
         ss << "host";
         break;
+#endif
     default:
         ss << "unknown";
     }
@@ -90,8 +93,10 @@ backend DPCTL_DPCTLBackendTypeToSyclBackend(DPCTLSyclBackendType BeTy)
     switch (BeTy) {
     case DPCTLSyclBackendType::DPCTL_CUDA:
         return backend::ext_oneapi_cuda;
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case DPCTLSyclBackendType::DPCTL_HOST:
         return backend::host;
+#endif
     case DPCTLSyclBackendType::DPCTL_LEVEL_ZERO:
         return backend::ext_oneapi_level_zero;
     case DPCTLSyclBackendType::DPCTL_OPENCL:
@@ -108,8 +113,10 @@ DPCTLSyclBackendType DPCTL_SyclBackendToDPCTLBackendType(backend B)
     switch (B) {
     case backend::ext_oneapi_cuda:
         return DPCTLSyclBackendType::DPCTL_CUDA;
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case backend::host:
         return DPCTLSyclBackendType::DPCTL_HOST;
+#endif
     case backend::ext_oneapi_level_zero:
         return DPCTLSyclBackendType::DPCTL_LEVEL_ZERO;
     case backend::opencl:
@@ -170,9 +177,11 @@ std::string DPCTL_AspectToStr(aspect aspectTy)
 {
     std::stringstream ss;
     switch (aspectTy) {
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case aspect::host:
         ss << "host";
         break;
+#endif
     case aspect::cpu:
         ss << "cpu";
         break;
@@ -242,12 +251,14 @@ std::string DPCTL_AspectToStr(aspect aspectTy)
 aspect DPCTL_StrToAspectType(const std::string &aspectTyStr)
 {
     aspect aspectTy;
-    if (aspectTyStr == "host") {
-        aspectTy = aspect::host;
-    }
-    else if (aspectTyStr == "cpu") {
+    if (aspectTyStr == "cpu") {
         aspectTy = aspect::cpu;
     }
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
+    else if (aspectTyStr == "host") {
+        aspectTy = aspect::host;
+    }
+#endif
     else if (aspectTyStr == "gpu") {
         aspectTy = aspect::gpu;
     }
@@ -312,8 +323,10 @@ aspect DPCTL_StrToAspectType(const std::string &aspectTyStr)
 aspect DPCTL_DPCTLAspectTypeToSyclAspect(DPCTLSyclAspectType AspectTy)
 {
     switch (AspectTy) {
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case DPCTLSyclAspectType::host:
         return aspect::host;
+#endif
     case DPCTLSyclAspectType::cpu:
         return aspect::cpu;
     case DPCTLSyclAspectType::gpu:
@@ -360,8 +373,10 @@ aspect DPCTL_DPCTLAspectTypeToSyclAspect(DPCTLSyclAspectType AspectTy)
 DPCTLSyclAspectType DPCTL_SyclAspectToDPCTLAspectType(aspect Aspect)
 {
     switch (Aspect) {
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case aspect::host:
         return DPCTLSyclAspectType::host;
+#endif
     case aspect::cpu:
         return DPCTLSyclAspectType::cpu;
     case aspect::gpu:
@@ -487,9 +502,11 @@ std::string DPCTL_GetDeviceFilterString(const device &Device)
     case backend::opencl:
         ss << "opencl";
         break;
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case backend::host:
         ss << "host";
         break;
+#endif
     default:
         ss << "unknown";
     };

libsyclinterface/include/Config/dpctl_config.h.in

@@ -29,6 +29,13 @@
 #cmakedefine DPCTL_ENABLE_L0_PROGRAM_CREATION                                  \
     @DPCTL_ENABLE_L0_PROGRAM_CREATION@
 
+/* Version of SYCL DPC++ 2023 compiler at which transition to SYCL 2020 occurs */
+#define __SYCL_COMPILER_2023_SWITCHOVER 20221020L
+
+/* Version of SYCL DPC++ compiler at which info::max_work_item_size was
+   made templated */
+#define __SYCL_COMPILER_MAX_WORK_ITEM_SIZE_THRESHOLD 20220805L
+
 /* The DPCPP version used to build dpctl */
 #define DPCTL_DPCPP_VERSION "@IntelSycl_VERSION@"