Repository navigation
Implement asynchronous fill method using dpctl kernels
#2055
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
antonwolfy
merged 26 commits into
IntelPython:master
from
ndgrigorian:implement-efficient-fill-method
Oct 25, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
f955945
Enhance `dpnp_array.fill` method
ndgrigorian 13edd84
Fix missing disclaimer in dpnp_arraycreation.py
ndgrigorian 4976a24
Import `dpnp_array` directly
ndgrigorian 978a081
Skip `test_fill_with_numpy_scalar_ndarray`
ndgrigorian 2686af9
Add dependencies to zeros and full kernels in `dpnp_fill`
ndgrigorian 2a826b2
Remove redundant validation of first `dpnp_fill` argument
ndgrigorian 6e2193b
Improve `dpnp_fill` array/scalar path logic
ndgrigorian 08b6c26
Disallow inputs to `dpnp_fill` on separate queues
ndgrigorian c64dc0b
Adjust skip message for `test_fill_with_numpy_scalar_ndarray`
ndgrigorian 9691cf0
Tweak error messages in `dpnp_fill`
ndgrigorian 957b93a
Add tests for new `fill` method
ndgrigorian 87e6560
Update docstring for `fill` method
ndgrigorian 985b4fa
Fix pre-commit in cupy fill tests
ndgrigorian d8a3e65
Change `asarray` to `astype` in `dpnp_fill`
ndgrigorian 70618e1
Expand TEST_SCOPE to include `test_fill.py`
ndgrigorian 478397f
Remove redundant check from `dpnp_fill`
ndgrigorian f782d1c
Use `_cast_fill_val` private function from `dpctl.tensor._ctors`
ndgrigorian e29685e
Add tests per PR review by @antonwolfy
ndgrigorian bd30f85
Improve validation of `val` for `fill` method
ndgrigorian 865867a
Add to permit NumPy bools as `dpnp_fill` scalar fill values
ndgrigorian 4ba7186
Use `dpnp.bool` in `dpnp_fill` and make `isinstance` check more effic…
ndgrigorian 48c8051
Replace branching for `fill` scalar type with `_cast_fill_value`
ndgrigorian 8adc06a
Add additional tests for `fill`
ndgrigorian c91ab47
Merge branch 'master' into implement-efficient-fill-method
antonwolfy c4e0481
Merge branch 'master' into implement-efficient-fill-method
ndgrigorian 387b542
Merge branch 'master' into implement-efficient-fill-method
ndgrigorian 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
Add tests for new
fill method
- Loading branch information
commit 957b93a094449168962a08819aeb8da00da7baab
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import dpctl | ||
| import numpy as np | ||
|
ndgrigorian marked this conversation as resolved.
Resolved
|
||
| import pytest | ||
| from dpctl.utils import ExecutionPlacementError | ||
| from numpy.testing import assert_array_equal | ||
|
|
||
| import dpnp as dnp | ||
|
|
||
|
|
||
| def test_fill_non_scalar(): | ||
| a = dnp.ones(5, dtype="i4") | ||
| val = dnp.ones(2, dtype="i4") | ||
|
|
||
| with pytest.raises(ValueError): | ||
| a.fill(val) | ||
|
|
||
| with pytest.raises(TypeError): | ||
| a.fill(dict()) | ||
|
ndgrigorian marked this conversation as resolved.
Resolved
|
||
|
|
||
|
|
||
|
ndgrigorian marked this conversation as resolved.
Resolved
|
||
| def test_fill_compute_follows_data(): | ||
| q1 = dpctl.SyclQueue() | ||
| q2 = dpctl.SyclQueue() | ||
|
|
||
| a = dnp.ones(5, dtype="i4", sycl_queue=q1) | ||
| val = dnp.ones((), dtype=a.dtype, sycl_queue=q2) | ||
|
|
||
| with pytest.raises(ExecutionPlacementError): | ||
| a.fill(val) | ||
|
|
||
|
|
||
| def test_fill_strided_array(): | ||
| a = dnp.zeros(100, dtype="i4") | ||
| b = a[::-2] | ||
|
|
||
| expected = dnp.tile(dnp.asarray([0, 1], dtype=a.dtype), 50) | ||
|
|
||
| b.fill(1) | ||
| assert_array_equal(b, 1) | ||
| assert_array_equal(a, expected) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("order", ["C", "F"]) | ||
| def test_fill_strided_2d_array(order): | ||
| a = dnp.zeros((10, 10), dtype="i4", order=order) | ||
| b = a[::-2, ::2] | ||
|
|
||
| expected = dnp.copy(a) | ||
| expected[::-2, ::2] = 1 | ||
|
|
||
| b.fill(1) | ||
| assert_array_equal(b, 1) | ||
| assert_array_equal(a, expected) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("order", ["C", "F"]) | ||
| def test_fill_memset(order): | ||
| a = dnp.ones((10, 10), dtype="i4", order=order) | ||
| a.fill(0) | ||
|
|
||
| assert_array_equal(a, 0) | ||
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.