Skip to content

Update pybind11 used #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 2, 2023
Merged

Update pybind11 used #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a6bf20
Update pybind11 to 2.10.2
oleksandr-pavlyk Jan 1, 2023
920e6df
Renamed use_dpctl_syclqueue->use_dpctl_sycl_queue
oleksandr-pavlyk Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/conda-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions examples/pybind11/external_usm_allocation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 4 additions & 3 deletions examples/pybind11/onemkl_gemv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions examples/pybind11/use_dpctl_sycl_kernel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions ...bind11/use_dpctl_syclqueue/CMakeLists.txt → ...ind11/use_dpctl_sycl_queue/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
0 ...es/pybind11/use_dpctl_syclqueue/README.md → ...s/pybind11/use_dpctl_sycl_queue/README.md
View file
Open in desktop
File renamed without changes.
0 ...s/pybind11/use_dpctl_syclqueue/example.py → .../pybind11/use_dpctl_sycl_queue/example.py
View file
Open in desktop
File renamed without changes.
0 ...les/pybind11/use_dpctl_syclqueue/setup.py → ...es/pybind11/use_dpctl_sycl_queue/setup.py
View file
Open in desktop
File renamed without changes.
0 ...pctl_syclqueue/tests/test_queue_device.py → ...ctl_sycl_queue/tests/test_queue_device.py
View file
Open in desktop
File renamed without changes.
0 ...tl_syclqueue/use_queue_device/__init__.py → ...l_sycl_queue/use_queue_device/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...l_syclqueue/use_queue_device/_example.cpp → ..._sycl_queue/use_queue_device/_example.cpp
View file
Open in desktop
File renamed without changes.