Upgrading Pyo3 0.22 (with gil-refs) #504
Merged
Conversation
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
Narsil
commented
Jul 25, 2024
| let tensor = if count == 0 { | ||
| // Torch==1.10 does not allow frombuffer on empty buffers so we create | ||
| // the tensor manually. | ||
| // let zeros = module.getattr(intern!(py, "zeros"))?; | ||
| let args = (shape.clone(),); | ||
| let shape: PyObject = shape.clone().into_py(py); |
There was a problem hiding this comment.
PyObject doesn'tseem to implement clone anymore therefore we're just cloning the raw Rust object.
Narsil
changed the title
ArthurZucker
approved these changes
Jul 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Upgrades to PyO3 0.22.
gil-refsstill required because I couldn't find a way to get access to the&[u8]from the data pybuffer.Without gil-refs, the data is created in
pydatawhich is dropped at the end of the loop, therefore the reference doesn't live long enough.I also tried changing everything around to use
FromPyObjectbut it's not implemented for&[u8]as it would requireFromPyObjectBoundwhich is a sealed trait.Additionally, the
SafetensorErrorcustom exception doesn't work withgil-refsbecause it doesn't implement theHasPyGilRef.Moving to just renaming
PyExceptionsort of seems to work without too much breaking change, although the exception is now the regular exception being effectively a catch all which is a breaking change.Fixes # (issue) or description of the problem this PR solves.