Skip to content

Commit 1a736f7

Browse files
Merge include-dpctl-tensor into move_tensor_impl_ext_part_2
2 parents 9e7deb3 + 1a1a099 commit 1a736f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1389
-638
lines changed

.github/workflows/conda-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
test-env-name: 'test'
2121
rerun-tests-on-failure: 'true'
2222
rerun-tests-max-attempts: 2
23-
rerun-tests-timeout: 40
23+
rerun-tests-timeout: 45
2424

2525
jobs:
2626
build:

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
75+
uses: github/codeql-action/upload-sarif@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
7676
with:
7777
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ repos:
127127
hooks:
128128
- id: actionlint
129129
- repo: https://github.com/BlankSpruce/gersemi
130-
rev: 0.25.1
130+
rev: 0.25.4
131131
hooks:
132132
- id: gersemi
133133
exclude: "dpnp/backend/cmake/Modules/"

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
4545
* Updated `dpnp.fix` to reuse `dpnp.trunc` internally [#2722](https://github.com/IntelPython/dpnp/pull/2722)
4646
* Changed the build scripts and documentation due to `python setup.py develop` deprecation notice [#2716](https://github.com/IntelPython/dpnp/pull/2716)
4747
* Clarified behavior on repeated `axes` in `dpnp.tensordot` and `dpnp.linalg.tensordot` functions [#2733](https://github.com/IntelPython/dpnp/pull/2733)
48+
* Improved documentation of `file` argument in `dpnp.fromfile` [#2745](https://github.com/IntelPython/dpnp/pull/2745)
49+
* Aligned `dpnp.trim_zeros` with NumPy 2.4 to support a tuple of integers passed with `axis` keyword [#2746](https://github.com/IntelPython/dpnp/pull/2746)
50+
* Aligned `strides` property of `dpnp.ndarray` with NumPy and CuPy implementations [#2747](https://github.com/IntelPython/dpnp/pull/2747)
51+
* Extended `dpnp.nan_to_num` to support broadcasting of `nan`, `posinf`, and `neginf` keywords [#2754](https://github.com/IntelPython/dpnp/pull/2754)
52+
* Changed `dpnp.partition` implementation to reuse `dpnp.sort` where it brings the performance benefit [#2766](https://github.com/IntelPython/dpnp/pull/2766)
53+
* `dpnp` uses pybind11 3.0.2 [#27734](https://github.com/IntelPython/dpnp/pull/2773)
54+
* Modified CMake files for the extension to explicitly mark DPC++ compiler and dpctl headers as system ones and so to suppress the build warning generated inside them [#2770](https://github.com/IntelPython/dpnp/pull/2770)
4855

4956
### Deprecated
5057

@@ -59,6 +66,7 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
5966
* Removed the obsolete interface from DPNP to Numba JIT [#2647](https://github.com/IntelPython/dpnp/pull/2647)
6067
* Removed the `newshape` parameter from `dpnp.reshape`, which has been deprecated since dpnp 0.17.0. Pass it positionally or use `shape=` on newer versions [#2670](https://github.com/IntelPython/dpnp/pull/2670)
6168
* Removed unused `pytest` configuration from `pyproject.toml` [#2729](https://github.com/IntelPython/dpnp/pull/2729)
69+
* Dropped a conda run dependency on `onemkl-sycl-stats` package [#2771](https://github.com/IntelPython/dpnp/pull/2771)
6270

6371
### Fixed
6472

CMakeLists.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,16 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
6060
# 8. Paths stored in the CMake System Package Registry
6161
# 9. Paths specified by the PATHS option (assumed hard-coded guesses)
6262
set(path_to_cmake_dir ${CMAKE_SOURCE_DIR}/dpnp/backend/cmake/Modules)
63-
find_package(IntelSYCL REQUIRED PATHS ${path_to_cmake_dir})
63+
# TODO: use the commented logic once the compiler resolves CMake issue CMPLRLLVM-73484
64+
# find_package(IntelSYCL REQUIRED PATHS ${path_to_cmake_dir})
65+
find_package(IntelSYCL QUIET)
66+
if(SYCL_LIBRARY_FOUND)
67+
find_package(IntelSYCL REQUIRED)
68+
else()
69+
# compiler CMake might have an issue and can't find SYCL_LIBRARY properly
70+
# then use vendored CMake with fixed logic
71+
find_package(IntelSYCL REQUIRED PATHS ${path_to_cmake_dir} NO_DEFAULT_PATH)
72+
endif()
6473
find_package(TBB REQUIRED PATHS ${path_to_cmake_dir})
6574

6675
set(MKL_ARCH "intel64")
@@ -86,8 +95,8 @@ find_package(Python 3.10...<3.15 REQUIRED COMPONENTS Development.Module NumPy)
8695
include(FetchContent)
8796
FetchContent_Declare(
8897
pybind11
89-
URL https://github.com/pybind/pybind11/archive/refs/tags/v3.0.1.tar.gz
90-
URL_HASH SHA256=741633da746b7c738bb71f1854f957b9da660bcd2dce68d71949037f0969d0ca
98+
URL https://github.com/pybind/pybind11/archive/refs/tags/v3.0.2.tar.gz
99+
URL_HASH SHA256=2f20a0af0b921815e0e169ea7fec63909869323581b89d7de1553468553f6a2d
91100
FIND_PACKAGE_ARGS NAMES pybind11
92101
)
93102
FetchContent_MakeAvailable(pybind11)

conda-recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if DEFINED OVERRIDE_INTEL_IPO (
1313
set "CMAKE_ARGS=%CMAKE_ARGS% -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=FALSE"
1414
)
1515

16-
FOR %%V IN (17.0.0 17 18.0.0 18 19.0.0 19 20.0.0 20 21.0.0 21) DO @(
16+
FOR %%V IN (17.0.0 17 18.0.0 18 19.0.0 19 20.0.0 20 21.0.0 21 22.0.0 22) DO @(
1717
REM set DIR_HINT if directory exists
1818
IF EXIST "%BUILD_PREFIX%\Library\lib\clang\%%V\" (
1919
set "SYCL_INCLUDE_DIR_HINT=%BUILD_PREFIX%\Library\lib\clang\%%V"

conda-recipe/meta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set max_compiler_and_mkl_version = environ.get("MAX_BUILD_CMPL_MKL_VERSION", "2026.0a0") %}
1+
{% set max_compiler_and_mkl_version = environ.get("MAX_BUILD_CMPL_MKL_VERSION", "2027.0a0") %}
22
{% set required_compiler_and_mkl_version = "2025.0" %}
33
{% set required_dpctl_version = "0.22.0*" %}
44

@@ -49,7 +49,6 @@ requirements:
4949
- {{ pin_compatible('onemkl-sycl-dft', min_pin='x.x', max_pin='x') }}
5050
- {{ pin_compatible('onemkl-sycl-lapack', min_pin='x.x', max_pin='x') }}
5151
- {{ pin_compatible('onemkl-sycl-rng', min_pin='x.x', max_pin='x') }}
52-
- {{ pin_compatible('onemkl-sycl-stats', min_pin='x.x', max_pin='x') }}
5352
- {{ pin_compatible('onemkl-sycl-vm', min_pin='x.x', max_pin='x') }}
5453
- numpy
5554
- intel-gpu-ocl-icd-system

doc/reference/set.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Boolean operations
2323
:toctree: generated/
2424
:nosignatures:
2525

26-
in1d
2726
intersect1d
2827
isin
2928
setdiff1d

dpnp/backend/cmake/Modules/IntelSYCLConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ if(SYCL_COMPILER)
329329
)
330330
#TODO Make an input file to configure and update the lib current version
331331
if(WIN32)
332-
set(sycl_lib_suffix "8")
332+
set(sycl_lib_suffix "9")
333333
else()
334334
set(sycl_lib_suffix "")
335335
endif()

dpnp/backend/extensions/blas/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,13 @@ target_include_directories(
7070
${CMAKE_SOURCE_DIR}/dpnp/backend/include
7171
${CMAKE_SOURCE_DIR}/dpctl_ext/tensor/libtensor/include
7272
)
73-
target_include_directories(${python_module_name} PUBLIC ${Dpctl_INCLUDE_DIR})
73+
74+
# treat below headers as system to suppress the warnings there during the build
75+
target_include_directories(
76+
${python_module_name}
77+
SYSTEM
78+
PRIVATE ${SYCL_INCLUDE_DIR} ${Dpctl_INCLUDE_DIRS} ${Dpctl_TENSOR_INCLUDE_DIR}
79+
)
7480

7581
if(WIN32)
7682
target_compile_options(

0 commit comments

Comments
 (0)