Skip to content
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

RSDK-9590 - upgrade numpy #805

Merged
merged 7 commits into from
Dec 20, 2024
Merged

RSDK-9590 - upgrade numpy #805

merged 7 commits into from
Dec 20, 2024

Conversation

stuqdog
Copy link
Member

@stuqdog stuqdog commented Dec 19, 2024

No description provided.

@stuqdog stuqdog requested a review from a team as a code owner December 19, 2024 20:11
@@ -16,7 +16,7 @@ buf: clean
rm -rf src/viam/gen
chmod +x plugin/main.py
uv pip install protoletariat
uv pip install protobuf --upgrade
uv pip install protobuf==5.29.1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@njooma this was the one part I wasn't sure on from your commit, I went with the hard locking to 5.29.1 but will change back if that's not right!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I like pinning the version used! That way, when a new employee joins the team in 6 months and gets protobuf 5.30.0, you don't need to track down bugs that happen on your machine but not on theirs, or vice versa.

Slight preference towards pinning the proletariat version (and all other dependencies), too, but that's perhaps off-topic for the current PR.

Copy link
Member

@penguinland penguinland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@@ -16,7 +16,7 @@ buf: clean
rm -rf src/viam/gen
chmod +x plugin/main.py
uv pip install protoletariat
uv pip install protobuf --upgrade
uv pip install protobuf==5.29.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I like pinning the version used! That way, when a new employee joins the team in 6 months and gets protobuf 5.30.0, you don't need to track down bugs that happen on your machine but not on theirs, or vice versa.

Slight preference towards pinning the proletariat version (and all other dependencies), too, but that's perhaps off-topic for the current PR.

src/viam/services/mlmodel/utils.py Outdated Show resolved Hide resolved
src/viam/services/mlmodel/utils.py Outdated Show resolved Hide resolved
@stuqdog
Copy link
Member Author

stuqdog commented Dec 19, 2024

Slight preference towards pinning the proletariat version (and all other dependencies), too, but that's perhaps off-topic for the current PR.

Yeah I'm inclined to leave that for a future PR, though I do like the suggestion!

Copy link
Member

@njooma njooma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor thing that i'm not sure is needed so i'm approving anyway

pyproject.toml Outdated
Comment on lines 50 to 51
"numpy>=1.26.2,<2; python_version>='3.9' and python_version <'3.13'",
"numpy>=2; python_version>='3.13'",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need all of this anymore. I think we just need "numpy<1.25.0; python_version<'3.9'",, and then "numpy>=1.26.2; python_version>='3.9'",

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ooh yeah, good point! will update.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As an aside, that does mean we'll need to update the version check logic in flat_tensors_to_ndrrays to check the numpy version rather than the python version.

@stuqdog stuqdog merged commit f66b367 into viamrobotics:main Dec 20, 2024
12 checks passed
@stuqdog stuqdog deleted the upgrade-numpy branch December 20, 2024 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants