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

Make the model names unique and fix the tox package deps for tensorflow tests #33216

Merged
merged 8 commits into from
Nov 27, 2024

Conversation

liferoad
Copy link
Collaborator

Addresses #30799


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@liferoad liferoad changed the title Make the model names unique Make the model names unique and fix the tox package deps for tensorflow tests Nov 26, 2024
@liferoad liferoad marked this pull request as ready for review November 26, 2024 21:21
@liferoad liferoad requested a review from jrmccluskey November 26, 2024 21:21
@@ -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
Copy link
Collaborator Author

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.

Copy link
Collaborator Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

Gotcha, I see

extras = test,gcp,ml_test
extras = test,gcp
commands_pre =
pip install -U 'protobuf==4.25.5'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The 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.

Copy link
Contributor

@jrmccluskey jrmccluskey left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment assign set of reviewers

@liferoad
Copy link
Collaborator Author

Failed tests are not related to this PR. https://github.com/apache/beam/actions/runs/12039225345/job/33566573652?pr=33216 is green now.

@liferoad liferoad merged commit 5a6c902 into apache:master Nov 27, 2024
91 of 95 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants