Skip to content

Commit 9d6d5a5

Browse files
authored
Bump max versions in run dependencies on DPC++ compiler and OneMKL (#2765)
The PR bumps run dependencies on DPC++ compiler and OneMKL packages in scope of 2026.0 release enabling. Also it includes the workaround for the CMake compiler issue on Windows, which has to be removed once the compiler resolve that.
1 parent 35d88b8 commit 9d6d5a5

File tree

5 files changed

+36
-8
lines changed

5 files changed

+36
-8
lines changed

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
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")

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 & 1 deletion
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

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/tests/third_party/cupy/linalg_tests/test_decomposition.py

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1+
from __future__ import annotations
2+
13
import unittest
24

35
import numpy
46
import pytest
57

68
import dpnp as cupy
9+
10+
# from cupyx import cusolver
11+
# from cupy.cuda import driver
12+
# from cupy.cuda import runtime
13+
# from cupy.linalg import _util
714
from dpnp.tests.helper import (
15+
LTS_VERSION,
816
has_support_aspect64,
9-
is_cpu_device,
17+
is_lts_driver,
1018
)
1119
from dpnp.tests.third_party.cupy import testing
1220
from dpnp.tests.third_party.cupy.testing import _condition
1321

22+
# import cupyx
23+
1424

1525
def random_matrix(shape, dtype, scale, sym=False):
1626
m, n = shape[-2:]
@@ -95,6 +105,8 @@ def test_decomposition(self, dtype):
95105
]
96106
)
97107
def test_batched_decomposition(self, dtype):
108+
# if not cusolver.check_availability("potrfBatched"):
109+
# pytest.skip("potrfBatched is not available")
98110
Ab1 = random_matrix((3, 5, 5), dtype, scale=(10, 10000), sym=True)
99111
self.check_L(Ab1)
100112
Ab2 = random_matrix((2, 2, 5, 5), dtype, scale=(10, 10000), sym=True)
@@ -134,9 +146,6 @@ def check_L(self, array):
134146
with pytest.raises(xp.linalg.LinAlgError):
135147
xp.linalg.cholesky(a)
136148

137-
# TODO: remove skipif when MKLD-17318 is resolved
138-
# _potrf does not raise an error with singular matrices on CPU.
139-
@pytest.mark.skipif(is_cpu_device(), reason="MKLD-17318")
140149
@testing.for_dtypes(
141150
[
142151
numpy.int32,
@@ -163,6 +172,10 @@ class TestQRDecomposition(unittest.TestCase):
163172

164173
@testing.for_dtypes("fdFD")
165174
def check_mode(self, array, mode, dtype):
175+
# if runtime.is_hip and driver.get_build_version() < 307:
176+
# if dtype in (numpy.complex64, numpy.complex128):
177+
# pytest.skip("ungqr unsupported")
178+
166179
a_cpu = numpy.asarray(array, dtype=dtype)
167180
a_gpu = cupy.asarray(array, dtype=dtype)
168181
result_gpu = cupy.linalg.qr(a_gpu, mode=mode)
@@ -189,13 +202,19 @@ def test_mode(self):
189202
self.check_mode(numpy.random.randn(3, 3), mode=self.mode)
190203
self.check_mode(numpy.random.randn(5, 4), mode=self.mode)
191204

205+
@pytest.mark.skipif(
206+
is_lts_driver(version=LTS_VERSION.V1_6), reason="SAT-8375"
207+
)
192208
@testing.with_requires("numpy>=1.22")
193209
@testing.fix_random()
194210
def test_mode_rank3(self):
195211
self.check_mode(numpy.random.randn(3, 2, 4), mode=self.mode)
196212
self.check_mode(numpy.random.randn(4, 3, 3), mode=self.mode)
197213
self.check_mode(numpy.random.randn(2, 5, 4), mode=self.mode)
198214

215+
@pytest.mark.skipif(
216+
is_lts_driver(version=LTS_VERSION.V1_6), reason="SAT-8375"
217+
)
199218
@testing.with_requires("numpy>=1.22")
200219
@testing.fix_random()
201220
def test_mode_rank4(self):

0 commit comments

Comments
 (0)