-
Notifications
You must be signed in to change notification settings - Fork 29
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
ENH: ndonnx device() support; TST: better ndonnx test coverage #232
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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 |
---|---|---|
|
@@ -3,11 +3,12 @@ | |
import pytest | ||
|
||
wrapped_libraries = ["numpy", "cupy", "torch", "dask.array"] | ||
all_libraries = wrapped_libraries + ["array_api_strict", "jax.numpy", "sparse"] | ||
|
||
all_libraries = wrapped_libraries + [ | ||
"array_api_strict", "jax.numpy", "ndonnx", "sparse" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This too. Why are we testing here libraries which we don't wrap? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because |
||
] | ||
|
||
def import_(library, wrapper=False): | ||
if library == 'cupy': | ||
if library in ('cupy', 'ndonnx'): | ||
pytest.importorskip(library) | ||
if wrapper: | ||
if 'jax' in library: | ||
|
@@ -20,3 +21,14 @@ def import_(library, wrapper=False): | |
library = 'array_api_compat.' + library | ||
|
||
return import_module(library) | ||
|
||
|
||
def xfail(request: pytest.FixtureRequest, reason: str) -> None: | ||
""" | ||
XFAIL the currently running test. | ||
|
||
Unlike ``pytest.xfail``, allow rest of test to execute instead of immediately | ||
halting it, so that it may result in a XPASS. | ||
xref https://github.com/pandas-dev/pandas/issues/38902 | ||
""" | ||
request.node.add_marker(pytest.mark.xfail(reason=reason)) |
This file contains 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 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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What I don't quite understand is this: https://github.com/data-apis/array-api-compat/pull/232/files#diff-d5d8fa69860e03769cc235a54027efad4376a8c48eeab71aaa11365ea308123bR141 states that the array API support is internal to
ndonnx
, which seems to imply there's no need to special-case it here?The note reads "Similar to JAX,
ndonnx
Array API support is contained directly inndonnx
." --- and indeed, there are no workarounds for jax in the codebase.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because they support the standard imperfectly. The array-api-tests for
.device
and.to_device
are XFAILed:https://github.com/Quantco/ndonnx/actions/workflows/array-api.yml
Adding
.device
and.to_device
won't break any library's backwards compatibility, so it would be best if each library just fixed it on their side. And yet here we have a function that works around the quirks of every library - last but not least to support least-than-newest versions of it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will address this upstream. I should say that it might be deceptive to allow this to work with "cpu".
A serialized ONNX graph from ndonnx could later be executed on many different hardware targets or runtimes. ONNX is one level removed from the execution target by design.
Based on a quick read of the device page of the specification, we may do something similar to what you're doing with Dask.