Skip to content

Commit 63b2799

Browse files
Merge remote-tracking branch 'origin/master' into reduction-changes
2 parents da1cc5b + 074ec3a commit 63b2799

File tree

131 files changed

+12400
-2121
lines changed

Some content is hidden

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

131 files changed

+12400
-2121
lines changed

.github/workflows/conda-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
run: |
169169
. $CONDA/etc/profile.d/conda.sh
170170
conda activate test_dpctl
171-
gdb --batch -ex r -ex 'info sharedlibrary' -ex 'set print elements 1000' -ex bt --args ${CONDA_PREFIX}/bin/python -m pytest -q -ra --disable-warnings --pyargs dpctl.tests.test_tensor_elementwise::test_cos_order -vv || true
171+
gdb --batch -ex r -ex 'info sharedlibrary' -ex 'set print elements 1000' -ex bt --args ${CONDA_PREFIX}/bin/python -m pytest -q -ra --disable-warnings --pyargs dpctl.tests.elementwise.test_trigonometric::test_trig_order -vv || true
172172
- name: Run tests
173173
env:
174174
SYCL_QUEUE_THREAD_POOL_SIZE: 6
@@ -486,7 +486,7 @@ jobs:
486486
done
487487
488488
array-api-conformity:
489-
needs: test_linux
489+
needs: build_linux
490490
runs-on: ${{ matrix.runner }}
491491

492492
strategy:

.github/workflows/generate-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Install dpctl dependencies
8080
shell: bash -l {0}
8181
run: |
82-
pip install numpy cython"<3" setuptools pytest pytest-cov scikit-build cmake coverage[toml]
82+
pip install numpy cython setuptools pytest pytest-cov scikit-build cmake coverage[toml]
8383
8484
- name: Build dpctl with coverage
8585
shell: bash -l {0}

.github/workflows/generate-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if: ${{ !github.event.pull_request || github.event.action != 'closed' }}
5050
shell: bash -l {0}
5151
run: |
52-
pip install numpy cython"<3" setuptools scikit-build cmake sphinx sphinx_rtd_theme pydot graphviz sphinxcontrib-programoutput sphinxcontrib-googleanalytics
52+
pip install numpy cython setuptools scikit-build cmake sphinx sphinx_rtd_theme pydot graphviz sphinxcontrib-programoutput sphinxcontrib-googleanalytics
5353
- name: Checkout repo
5454
uses: actions/checkout@v3
5555
with:

.github/workflows/os-llvm-sycl-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
- name: Install dpctl dependencies
109109
shell: bash -l {0}
110110
run: |
111-
pip install numpy cython"<3" setuptools pytest scikit-build cmake
111+
pip install numpy cython setuptools pytest scikit-build cmake
112112
113113
- name: Checkout repo
114114
uses: actions/checkout@v3

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
### Added
1010
### Changed
11+
12+
* Removed `dpctl.tensor.numpy_usm_shared` obsolete class and associated tests which were being skipped
13+
1114
### Fixed
1215

1316
## [0.14.5] - 07/17/2023

conda-recipe/meta.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@ build:
1313
requirements:
1414
build:
1515
- {{ compiler('cxx') }}
16-
- {{ compiler('dpcpp') }} >=2023.1 # [not osx]
16+
- {{ compiler('dpcpp') }} >=2023.2 # [not osx]
1717
- sysroot_linux-64 >=2.28 # [linux]
1818
host:
1919
- setuptools
2020
- cmake >=3.21
2121
- ninja
2222
- git
23-
- cython <3
23+
- cython
2424
- python
2525
- scikit-build
2626
- numpy
2727
- wheel
2828
run:
2929
- python
3030
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }}
31-
- {{ pin_compatible('dpcpp-cpp-rt', min_pin='x.x', max_pin='x') }} # [py<=39]
32-
- dpcpp-cpp-rt >=2023.1 # [py>39]
31+
- dpcpp-cpp-rt >=2023.2
3332
- level-zero # [linux]
3433

3534
test:

docs/generate_rst.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def _is_class_property(o):
170170
Returns:
171171
[type]: [description]
172172
"""
173-
return isinstance(o, property) or (type(o) == _getset_descriptor)
173+
return isinstance(o, property) or (type(o) is _getset_descriptor)
174174

175175

176176
def _is_class_method(o):

dpctl/_backend.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ cdef extern from "syclinterface/dpctl_sycl_enum_types.h":
9595
_usm_device_allocations 'usm_device_allocations',
9696
_usm_host_allocations 'usm_host_allocations',
9797
_usm_shared_allocations 'usm_shared_allocations',
98-
_usm_restricted_shared_allocations 'usm_restricted_shared_allocations',
9998
_usm_system_allocations 'usm_system_allocations',
10099
_usm_atomic_host_allocations 'usm_atomic_host_allocations',
101100
_usm_atomic_shared_allocations 'usm_atomic_shared_allocations',
@@ -300,6 +299,7 @@ cdef extern from "syclinterface/dpctl_sycl_platform_manager.h":
300299

301300

302301
cdef extern from "syclinterface/dpctl_sycl_platform_interface.h":
302+
cdef bool DPCTLPlatform_AreEq(const DPCTLSyclPlatformRef, const DPCTLSyclPlatformRef)
303303
cdef DPCTLSyclPlatformRef DPCTLPlatform_Copy(const DPCTLSyclPlatformRef)
304304
cdef DPCTLSyclPlatformRef DPCTLPlatform_Create()
305305
cdef DPCTLSyclPlatformRef DPCTLPlatform_CreateFromSelector(
@@ -309,6 +309,7 @@ cdef extern from "syclinterface/dpctl_sycl_platform_interface.h":
309309
cdef const char *DPCTLPlatform_GetName(const DPCTLSyclPlatformRef)
310310
cdef const char *DPCTLPlatform_GetVendor(const DPCTLSyclPlatformRef)
311311
cdef const char *DPCTLPlatform_GetVersion(const DPCTLSyclPlatformRef)
312+
cdef size_t DPCTLPlatform_Hash(const DPCTLSyclPlatformRef)
312313
cdef DPCTLPlatformVectorRef DPCTLPlatform_GetPlatforms()
313314
cdef DPCTLSyclContextRef DPCTLPlatform_GetDefaultContext(
314315
const DPCTLSyclPlatformRef)

dpctl/_sycl_context.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ cdef class SyclContextCreationError(Exception):
6868
pass
6969

7070

71-
cdef void _context_capsule_deleter(object o):
71+
cdef void _context_capsule_deleter(object o) noexcept:
7272
cdef DPCTLSyclContextRef CRef = NULL
7373
if pycapsule.PyCapsule_IsValid(o, "SyclContextRef"):
7474
CRef = <DPCTLSyclContextRef> pycapsule.PyCapsule_GetPointer(

dpctl/_sycl_device.pyx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -597,20 +597,6 @@ cdef class SyclDevice(_SyclDevice):
597597
cdef _aspect_type AT = _aspect_type._usm_shared_allocations
598598
return DPCTLDevice_HasAspect(self._device_ref, AT)
599599

600-
@property
601-
def has_aspect_usm_restricted_shared_allocations(self):
602-
""" Returns True if this device supports USM memory
603-
allocated as restricted USM, False otherwise.
604-
605-
Returns:
606-
bool: Indicates that the device supports USM memory allocated using
607-
``sycl::malloc_shared`` as restricted USM.
608-
609-
.. deprecated:: 0.14
610-
"""
611-
cdef _aspect_type AT = _aspect_type._usm_restricted_shared_allocations
612-
return DPCTLDevice_HasAspect(self._device_ref, AT)
613-
614600
@property
615601
def has_aspect_usm_system_allocations(self):
616602
""" Returns True if system allocator may be used instead of SYCL USM

0 commit comments

Comments
 (0)