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.

Sign up for GitHub

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

Jump to bottom

[RLlib] Tf2x preparation; part 2 (upgrading try_import_tf()). #9136

Merged
merged 22 commits into from
Jun 30, 2020
Merged

[RLlib] Tf2x preparation; part 2 (upgrading try_import_tf()). #9136

merged 22 commits into from
Jun 30, 2020

Conversation

sven1977
Copy link
Contributor

@sven1977 sven1977 commented Jun 25, 2020 •
edited
Loading

This PR changes try_import_tf to return the tuple: tf(v1 compat), tf (1x or 2x), [version int 1 or 2].
This is in preparation of the upcoming full tf2.x support PR.

Related issue number

Checks

  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/latest/.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failure rates at https://ray-travis-tracker.herokuapp.com/.
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested (please justify below)

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27553/
Test FAILed.

@sven1977
Merge branch 'master' of https://github.com/ray-project/ray into tf2x…
47fe0e8 
…_preparation_2

� Conflicts:
�	rllib/agents/ddpg/ddpg.py
�	rllib/agents/marwil/marwil_tf_policy.py
�	rllib/agents/sac/sac.py
�	rllib/agents/trainer.py
�	rllib/agents/trainer_template.py
�	rllib/models/tf/layers/noisy_layer.py
�	rllib/models/tf/tf_action_dist.py
@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27569/
Test FAILed.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27598/
Test PASSed.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27600/
Test PASSed.

@sven1977
Merge branch 'master' of https://github.com/ray-project/ray into tf2x…
274fb22 
…_preparation_2

� Conflicts:
�	rllib/offline/json_reader.py
@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27604/
Test PASSed.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27619/
Test PASSed.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27621/
Test PASSed.

@sven1977
Merge branch 'master' of https://github.com/ray-project/ray into tf2x…
4feddb6 
…_preparation_2

� Conflicts:
�	rllib/agents/ppo/tests/test.py
�	rllib/utils/test_utils.py
�	rllib/utils/tracking_dict.py
@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27642/
Test PASSed.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/27654/
Test PASSed.

@sven1977 sven1977 requested a review from ericl June 29, 2020 15:05
@sven1977 sven1977 merged commit 43043ee into ray-project:master Jun 30, 2020
@sven1977 sven1977 deleted the tf2x_preparation_2 branch August 21, 2020 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ericl ericl ericl approved these changes

Assignees

@ericl ericl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sven1977 @AmplabJenkins @ericl