Skip to content

Commit 2995796

Browse files
authored
Merge branch 'master' into resolve-cmpl-warning
2 parents cf44a17 + 9127df2 commit 2995796

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
pull-requests: write
3737

3838
env:
39-
python-ver: '3.9'
39+
python-ver: '3.12'
4040
CHANNELS: '-c dppy/label/dev -c intel -c conda-forge --override-channels'
4141
NO_INTEL_CHANNELS: '-c dppy/label/dev -c conda-forge --override-channels'
4242
# Install the latest oneAPI compiler to work around an issue
@@ -132,16 +132,16 @@ jobs:
132132
- name: Install dpnp dependencies
133133
if: env.INSTALL_ONE_API == 'yes'
134134
run: |
135-
mamba install numpy"<1.24" dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
135+
mamba install numpy dpctl">=0.18.0dev0" cmake cython pytest ninja scikit-build ${{ env.NO_INTEL_CHANNELS }}
136136
137137
- name: Install dpnp dependencies
138138
if: env.INSTALL_ONE_API != 'yes'
139139
run: |
140-
mamba install numpy"<1.24" dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
140+
mamba install numpy dpctl">=0.18.0dev0" mkl-devel-dpcpp onedpl-devel tbb-devel dpcpp_linux-64 \
141141
cmake cython pytest ninja scikit-build ${{ env.CHANNELS }}
142142
143143
- name: Install cuPy dependencies
144-
run: mamba install cupy cudatoolkit=10.0
144+
run: mamba install cupy
145145

146146
- name: Conda info
147147
run: mamba info

tests/test_arraypad.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from dpnp.dpnp_utils.dpnp_utils_pad import _as_pairs as dpnp_as_pairs
1313
from tests.third_party.cupy import testing
1414

15-
from .helper import assert_dtype_allclose, get_all_dtypes
15+
from .helper import assert_dtype_allclose, get_all_dtypes, has_support_aspect64
1616

1717

1818
class TestPad:
@@ -384,6 +384,7 @@ def test_reflect_symmetric_1d(self, pad_width, mode, reflect_type):
384384
result = dpnp.pad(a_dp, pad_width, mode=mode, reflect_type=reflect_type)
385385
assert_array_equal(result, expected)
386386

387+
@pytest.mark.skipif(not has_support_aspect64(), reason="dpctl-gh-1887")
387388
@pytest.mark.parametrize("data", [[[4, 5, 6], [6, 7, 8]], [[4, 5, 6]]])
388389
@pytest.mark.parametrize("pad_width", [10, (5, 7)])
389390
@pytest.mark.parametrize("mode", ["reflect", "symmetric"])

0 commit comments

Comments
 (0)