diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index f81e635e60..81f50b8307 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -452,7 +452,7 @@ jobs: -DMKL_INCLUDE_DIR=${MKLROOT}/include \ -DTBB_INCLUDE_DIR=${TBBROOT}/include || exit 1 else - CC=dpcpp CXX=dpcpp LDSHARED="dpcpp -shared" \ + CC=icx CXX=icpx CFLAGS="-fsycl" LDSHARED="dpcpp -shared" \ python setup.py build_ext --inplace || exit 1 fi conda deactivate diff --git a/CMakeLists.txt b/CMakeLists.txt index da138c1da3..6251797a86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,8 +33,8 @@ include(FetchContent) FetchContent_Declare( pybind11 - URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.tar.gz - URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad + URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.2.tar.gz + URL_HASH SHA256=93bd1e625e43e03028a3ea7389bba5d3f9f2596abc074b068e70f4ef9b1314ae ) FetchContent_MakeAvailable(pybind11) diff --git a/examples/pybind11/external_usm_allocation/CMakeLists.txt b/examples/pybind11/external_usm_allocation/CMakeLists.txt index fdd6ad71ef..ce231fad4a 100644 --- a/examples/pybind11/external_usm_allocation/CMakeLists.txt +++ b/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.1.tar.gz - URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad + URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.2.tar.gz + URL_HASH SHA256=93bd1e625e43e03028a3ea7389bba5d3f9f2596abc074b068e70f4ef9b1314ae ) FetchContent_MakeAvailable(pybind11) diff --git a/examples/pybind11/onemkl_gemv/CMakeLists.txt b/examples/pybind11/onemkl_gemv/CMakeLists.txt index 9c31b91c9a..25589e4202 100644 --- a/examples/pybind11/onemkl_gemv/CMakeLists.txt +++ b/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.1.tar.gz - URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad + URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.2.tar.gz + URL_HASH SHA256=93bd1e625e43e03028a3ea7389bba5d3f9f2596abc074b068e70f4ef9b1314ae ) FetchContent_MakeAvailable(pybind11) @@ -38,8 +38,9 @@ pybind11_add_module(${py_module_name} MODULE sycl_gemm/_onemkl.cpp ) +target_compile_definitions(${py_module_name} PRIVATE -DMKL_ILP64) target_include_directories(${py_module_name} - PUBLIC ${MKL_INCLUDE_DIR} ${TBB_INCLUDE_DIR} sycl_gemm + PUBLIC ${MKL_INCLUDE_DIR} sycl_gemm ) target_link_libraries(${py_module_name} PRIVATE ${mkl_sycl} ${mkl_intel_ilp64} ${mkl_tbb_thread} ${mkl_core} ${tbb} diff --git a/examples/pybind11/use_dpctl_sycl_kernel/CMakeLists.txt b/examples/pybind11/use_dpctl_sycl_kernel/CMakeLists.txt index 441a0997c6..f246d29924 100644 --- a/examples/pybind11/use_dpctl_sycl_kernel/CMakeLists.txt +++ b/examples/pybind11/use_dpctl_sycl_kernel/CMakeLists.txt @@ -14,8 +14,8 @@ set(CMAKE_BUILD_TYPE Debug) 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.2.tar.gz + URL_HASH SHA256=93bd1e625e43e03028a3ea7389bba5d3f9f2596abc074b068e70f4ef9b1314ae ) FetchContent_MakeAvailable(pybind11) diff --git a/examples/pybind11/use_dpctl_syclqueue/CMakeLists.txt b/examples/pybind11/use_dpctl_sycl_queue/CMakeLists.txt similarity index 90% rename from examples/pybind11/use_dpctl_syclqueue/CMakeLists.txt rename to examples/pybind11/use_dpctl_sycl_queue/CMakeLists.txt index 0b6d4062d4..f7b843d7f5 100644 --- a/examples/pybind11/use_dpctl_syclqueue/CMakeLists.txt +++ b/examples/pybind11/use_dpctl_sycl_queue/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.1.tar.gz - URL_HASH SHA256=111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad + URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.2.tar.gz + URL_HASH SHA256=93bd1e625e43e03028a3ea7389bba5d3f9f2596abc074b068e70f4ef9b1314ae ) FetchContent_MakeAvailable(pybind11) diff --git a/examples/pybind11/use_dpctl_syclqueue/README.md b/examples/pybind11/use_dpctl_sycl_queue/README.md similarity index 100% rename from examples/pybind11/use_dpctl_syclqueue/README.md rename to examples/pybind11/use_dpctl_sycl_queue/README.md diff --git a/examples/pybind11/use_dpctl_syclqueue/example.py b/examples/pybind11/use_dpctl_sycl_queue/example.py similarity index 100% rename from examples/pybind11/use_dpctl_syclqueue/example.py rename to examples/pybind11/use_dpctl_sycl_queue/example.py diff --git a/examples/pybind11/use_dpctl_syclqueue/setup.py b/examples/pybind11/use_dpctl_sycl_queue/setup.py similarity index 100% rename from examples/pybind11/use_dpctl_syclqueue/setup.py rename to examples/pybind11/use_dpctl_sycl_queue/setup.py diff --git a/examples/pybind11/use_dpctl_syclqueue/tests/test_queue_device.py b/examples/pybind11/use_dpctl_sycl_queue/tests/test_queue_device.py similarity index 100% rename from examples/pybind11/use_dpctl_syclqueue/tests/test_queue_device.py rename to examples/pybind11/use_dpctl_sycl_queue/tests/test_queue_device.py diff --git a/examples/pybind11/use_dpctl_syclqueue/use_queue_device/__init__.py b/examples/pybind11/use_dpctl_sycl_queue/use_queue_device/__init__.py similarity index 100% rename from examples/pybind11/use_dpctl_syclqueue/use_queue_device/__init__.py rename to examples/pybind11/use_dpctl_sycl_queue/use_queue_device/__init__.py diff --git a/examples/pybind11/use_dpctl_syclqueue/use_queue_device/_example.cpp b/examples/pybind11/use_dpctl_sycl_queue/use_queue_device/_example.cpp similarity index 100% rename from examples/pybind11/use_dpctl_syclqueue/use_queue_device/_example.cpp rename to examples/pybind11/use_dpctl_sycl_queue/use_queue_device/_example.cpp