-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Make the model names unique and fix the tox package deps for tensorflow tests #33216
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
78a9c70
make the model names unique
liferoad 8550497
fixed lint
liferoad 10cde1d
pin keras==3.6.0
liferoad 36e8bec
pin keras==2.12.0
liferoad 3db7dfe
pin tf_keras==2.18.0
liferoad c699cd9
pin tensorflow==2.18.0
liferoad a0fdb6b
use 1 worker for pytest
liferoad 1875ee1
Fixed the tensorflow version
liferoad 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
{ | ||
"comment": "Modify this file in a trivial way to cause this test suite to run", | ||
"modification": 1 | ||
} |
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 |
---|---|---|
|
@@ -410,8 +410,9 @@ deps = | |
tensorflow>=2.12rc1,<2.13 | ||
# Help pip resolve conflict with typing-extensions for old version of TF https://github.com/apache/beam/issues/30852 | ||
pydantic<2.7 | ||
protobuf==4.25.5 | ||
extras = test,gcp,ml_test | ||
extras = test,gcp | ||
commands_pre = | ||
pip install -U 'protobuf==4.25.5' | ||
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. install_requires will install protobuf with 5.x, which is not supported by tesnsorflow 2.12.x. So we reinstall protobuf with the fix version here. |
||
commands = | ||
# Log tensorflow version for debugging | ||
/bin/sh -c "pip freeze | grep -E tensorflow" | ||
|
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.
Tox honors the package deps with this order: deps -> extras -> install_requires. So if tensorflow is set several times, only the last one takes the effect. @jrmccluskey FYI.
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.
we remove
ml-test
here since these tests only rely on tensorflow.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.
Gotcha, I see