Skip to content

Commit 6eb6c2b

Browse files
authored
Merge branch 'master' into remove-workaraound-dpctl-2030
2 parents 026c39c + 073a86c commit 6eb6c2b

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

.github/workflows/conda-package.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ jobs:
8282
environment-file: ${{ env.build-conda-pkg-env }}
8383
activate-environment: ${{ env.build-env-name }}
8484

85+
- name: List installed packages
86+
run: mamba list
87+
8588
- name: Store conda paths as envs
8689
shell: bash -el {0}
8790
run: |

dpnp/tests/third_party/cupy/core_tests/test_ndarray_adv_indexing.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -609,14 +609,22 @@ def test_invalid_adv_getitem(self):
609609
},
610610
{"shape": (2, 3, 4), "indexes": (slice(None), []), "value": 1},
611611
{"shape": (2, 3, 4), "indexes": ([], []), "value": 1},
612-
# {'shape': (2, 3, 4), 'indexes': numpy.array([], dtype=numpy.bool_),
613-
# 'value': 1}, #dpctl-1913
614-
# {'shape': (2, 3, 4),
615-
# 'indexes': (slice(None), numpy.array([], dtype=numpy.bool_)),
616-
# 'value': 1}, #dpctl-1913
617-
# {'shape': (2, 3, 4), 'indexes': numpy.array([[], []], dtype=numpy.bool_),
618-
# 'value': numpy.random.uniform(size=(4,))}, #dpctl-1913
619-
# {'shape': (2, 3, 4), 'indexes': numpy.empty((0, 0, 4), bool), 'value': 1}, #dpctl-1913
612+
{
613+
"shape": (2, 3, 4),
614+
"indexes": numpy.array([], dtype=numpy.bool_),
615+
"value": 1,
616+
},
617+
{
618+
"shape": (2, 3, 4),
619+
"indexes": (slice(None), numpy.array([], dtype=numpy.bool_)),
620+
"value": 1,
621+
},
622+
{
623+
"shape": (2, 3, 4),
624+
"indexes": numpy.array([[], []], dtype=numpy.bool_),
625+
"value": numpy.random.uniform(size=(4,)),
626+
},
627+
{"shape": (2, 3, 4), "indexes": numpy.empty((0, 0, 4), bool), "value": 1},
620628
# multiple masks
621629
{"shape": (2, 3, 4), "indexes": (True, [True, False]), "value": 1},
622630
{"shape": (2, 3, 4), "indexes": (False, [True, False]), "value": 1},

environments/build_conda_pkg.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ channels:
44
dependencies:
55
- python=3.12 # conda-build does not support python 3.13
66
- conda-build=25.3.1
7+
- libxml2=2.13.7 # libs dependency issue in 2.14.0

0 commit comments

Comments
 (0)