-
Notifications
You must be signed in to change notification settings - Fork 23
Add implementation of dpnp.ndarray.data
and dpnp.ndarray.data.ptr
attributes
#2521
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
80dcf13
Add dpnp.ndarray.data property
antonwolfy 9455faf
Add dpnp.memory module to return s data object holding USM memory
antonwolfy 7918bcf
Update third party tests
antonwolfy 4eba18a
Use ndarray.data.ptr in the tests
antonwolfy 6f15dff
Add PR to the changelog
antonwolfy f1a039c
Remove stride checks where not supported still
antonwolfy ace5d19
Add docstring to ptr attribute
antonwolfy 8a79cff
Merge branch 'master' into add-data-attribute
antonwolfy bb7d9e7
Merge branch 'master' into add-data-attribute
antonwolfy d3b1728
Apply suggestions from code review
antonwolfy 3a729ac
Merge branch 'master' into add-data-attribute
antonwolfy 6334991
Add more tests to cover new dpnp.memory.create_data function
antonwolfy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# -*- coding: utf-8 -*- | ||
# ***************************************************************************** | ||
# Copyright (c) 2025, Intel Corporation | ||
# All rights reserved. | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are met: | ||
# - Redistributions of source code must retain the above copyright notice, | ||
# this list of conditions and the following disclaimer. | ||
# - Redistributions in binary form must reproduce the above copyright notice, | ||
# this list of conditions and the following disclaimer in the documentation | ||
# and/or other materials provided with the distribution. | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
# THE POSSIBILITY OF SUCH DAMAGE. | ||
# ***************************************************************************** | ||
|
||
from ._memory import ( | ||
MemoryUSMDevice, | ||
MemoryUSMHost, | ||
MemoryUSMShared, | ||
create_data, | ||
) | ||
|
||
__all__ = [ | ||
"MemoryUSMDevice", | ||
"MemoryUSMHost", | ||
"MemoryUSMShared", | ||
"create_data", | ||
] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
# -*- coding: utf-8 -*- | ||
# ***************************************************************************** | ||
# Copyright (c) 2025, Intel Corporation | ||
# All rights reserved. | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are met: | ||
# - Redistributions of source code must retain the above copyright notice, | ||
# this list of conditions and the following disclaimer. | ||
# - Redistributions in binary form must reproduce the above copyright notice, | ||
# this list of conditions and the following disclaimer in the documentation | ||
# and/or other materials provided with the distribution. | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
# THE POSSIBILITY OF SUCH DAMAGE. | ||
# ***************************************************************************** | ||
|
||
import dpctl.tensor as dpt | ||
from dpctl.memory import MemoryUSMDevice as DPCTLMemoryUSMDevice | ||
from dpctl.memory import MemoryUSMHost as DPCTLMemoryUSMHost | ||
from dpctl.memory import MemoryUSMShared as DPCTLMemoryUSMShared | ||
|
||
|
||
def _add_ptr_property(cls): | ||
_storage_attr = "_ptr" | ||
|
||
@property | ||
def ptr(self): | ||
""" | ||
Returns USM pointer to the start of array (element with zero | ||
multi-index) encoded as integer. | ||
|
||
""" | ||
|
||
return getattr(self, _storage_attr, None) | ||
|
||
@ptr.setter | ||
def ptr(self, value): | ||
setattr(self, _storage_attr, value) | ||
|
||
cls.ptr = ptr | ||
return cls | ||
|
||
|
||
@_add_ptr_property | ||
class MemoryUSMDevice(DPCTLMemoryUSMDevice): | ||
pass | ||
|
||
|
||
@_add_ptr_property | ||
class MemoryUSMHost(DPCTLMemoryUSMHost): | ||
pass | ||
|
||
|
||
@_add_ptr_property | ||
class MemoryUSMShared(DPCTLMemoryUSMShared): | ||
pass | ||
|
||
|
||
def create_data(x): | ||
""" | ||
Create an instance of :class:`.MemoryUSMDevice`, :class:`.MemoryUSMHost`, | ||
or :class:`.MemoryUSMShared` class depending on the type of USM allocation. | ||
|
||
Parameters | ||
---------- | ||
x : usm_ndarray | ||
Input array of :class:`dpctl.tensor.usm_ndarray` type. | ||
|
||
Returns | ||
------- | ||
out : {MemoryUSMDevice, MemoryUSMHost, MemoryUSMShared} | ||
A data object with a reference on USM memory. | ||
|
||
""" | ||
|
||
dispatch = { | ||
DPCTLMemoryUSMDevice: MemoryUSMDevice, | ||
DPCTLMemoryUSMHost: MemoryUSMHost, | ||
DPCTLMemoryUSMShared: MemoryUSMShared, | ||
} | ||
|
||
if not isinstance(x, dpt.usm_ndarray): | ||
raise TypeError( | ||
f"An array must be any of supported type, but got {type(x)}" | ||
) | ||
usm_data = x.usm_data | ||
|
||
cls = dispatch.get(type(usm_data), None) | ||
if cls: | ||
data = cls(usm_data) | ||
# `ptr` is expecting to point at the start of the array's data, | ||
# while `usm_data._pointer` is a pointer at the start of memory buffer | ||
data.ptr = x._pointer | ||
return data | ||
raise TypeError(f"Expected USM memory, but got {type(usm_data)}") | ||
antonwolfy marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import dpctl.tensor as dpt | ||
import numpy | ||
import pytest | ||
|
||
import dpnp | ||
import dpnp.memory as dpm | ||
|
||
|
||
class IntUsmData(dpt.usm_ndarray): | ||
"""Class that overrides `usm_data` property in `dpt.usm_ndarray`.""" | ||
|
||
@property | ||
def usm_data(self): | ||
return 1 | ||
|
||
|
||
class TestCreateData: | ||
@pytest.mark.parametrize("x", [numpy.ones(4), dpnp.zeros(2)]) | ||
def test_wrong_input_type(self, x): | ||
with pytest.raises(TypeError): | ||
dpm.create_data(x) | ||
|
||
def test_wrong_usm_data(self): | ||
a = dpt.ones(10) | ||
d = IntUsmData(a.shape, buffer=a) | ||
|
||
with pytest.raises(TypeError): | ||
dpm.create_data(d) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.