Skip to content

support newer versions of tensorflow (2.1+) #3830

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

Merged
merged 4 commits into from
Apr 24, 2020
Merged

support newer versions of tensorflow (2.1+) #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85237ec
support tf2.x and python3.8
Apr 23, 2020
5f79a76
tensorflow==2.2.0rc3 for python3.8
Apr 23, 2020
7979cc2
stick with tf2.1 and py3.7 for now
Apr 23, 2020
09e8ea9
More gail visual steps in simple test (#3836)
andrewcoh Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ executors:
python373:
docker:
- image: circleci/python:3.7.3
python382:
docker:
- image: circleci/python:3.8.2

jobs:
build_python:
Expand Down
2 changes: 1 addition & 1 deletion ml-agents/mlagents/trainers/tests/test_simple_rl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ def test_gail_visual_ppo(simple_record, use_discrete):
step_size=0.2,
)
override_vals = {
"max_steps": 500,
"max_steps": 750,
"learning_rate": 3.0e-4,
"behavioral_cloning": {"demo_path": demo_path, "strength": 1.0, "steps": 1000},
"reward_signals": {
Expand Down
3 changes: 2 additions & 1 deletion ml-agents/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def run(self):
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
],
# find_namespace_packages will recurse through the directories and find all the packages
packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
Expand All @@ -61,7 +62,7 @@ def run(self):
"Pillow>=4.2.1",
"protobuf>=3.6",
"pyyaml",
"tensorflow>=1.7,<2.1",
"tensorflow>=1.7,<3.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

I did have to add six>=1.12.0 to setup.py for tf>2.1.0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, I'm not sure what to do about this. pip should be able to figure it out; it's not really our requirement, just a transitive one.

'pypiwin32==223;platform_system=="Windows"',
],
python_requires=">=3.6.1",
Expand Down
2 changes: 1 addition & 1 deletion test_constraints_max_tf2_version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# For projects with upper bounds, we should periodically update this list to the latest release version
grpcio>=1.23.0
numpy>=1.17.2
tensorflow>=2.0.0,<2.1.0
tensorflow>=2.1.0
h5py>=2.10.0