diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ad2040183..4fb7bf226b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,17 +21,14 @@ jobs: pip_constraints: type: string description: Constraints file that is passed to "pip install". We constraint older versions of libraries for older python runtime, in order to help ensure compatibility. - enforce_onnx_conversion: - type: integer - default: 0 - description: Whether to raise an exception if ONNX models couldn't be saved. executor: << parameters.executor >> working_directory: ~/repo # Run additional numpy checks on unit tests environment: TEST_ENFORCE_NUMPY_FLOAT32: 1 - TEST_ENFORCE_ONNX_CONVERSION: << parameters.enforce_onnx_conversion >> + # Whether to raise an exception if ONNX models couldn't be saved. + TEST_ENFORCE_ONNX_CONVERSION: 1 steps: - checkout @@ -252,16 +249,8 @@ workflows: name: python_3.7.3 executor: python373 pyversion: 3.7.3 - # Test python 3.7 with the newest supported versions + # Test python 3.7 with the newest supported versions of 1.x pip_constraints: test_constraints_max_tf1_version.txt - # Make sure ONNX conversion passes here (recent version of tensorflow 1.x) - enforce_onnx_conversion: 1 - - build_python: - name: python_3.7.3+tf2 - executor: python373 - pyversion: 3.7.3 - # Test python 3.7 with the newest supported versions - pip_constraints: test_constraints_max_tf2_version.txt - build_python: name: python_3.8.2+tf2.2 executor: python382 diff --git a/com.unity.ml-agents/CHANGELOG.md b/com.unity.ml-agents/CHANGELOG.md index 6916f4945f..cba76d9cb5 100755 --- a/com.unity.ml-agents/CHANGELOG.md +++ b/com.unity.ml-agents/CHANGELOG.md @@ -17,6 +17,11 @@ and this project adheres to - Update Barracuda to 1.0.2. - Enabled C# formatting using `dotnet-format`. #### ml-agents / ml-agents-envs / gym-unity (Python) +- Experimental PyTorch support has been added. Use `--torch` when running `mlagents-learn`, or add +`framework: pytorch` to your trainer configuration (under the behavior name) to enable it. +Note that PyTorch 1.6.0 or greater should be installed to use this feature; see +[the PyTorch website](https://pytorch.org/) for installation instructions. (#4335) +- The minimum supported version of TensorFlow was increased to 1.14.0. (#4411) ### Bug Fixes #### com.unity.ml-agents (C#) @@ -32,10 +37,6 @@ and this project adheres to - The interaction between EnvManager and TrainerController was changed; EnvManager.advance() was split into to stages, and TrainerController now uses the results from the first stage to handle new behavior names. This change speeds up Python training by approximately 5-10%. (#4259) -- Experimental PyTorch support has been added. Use `--torch` when running `mlagents-learn`, or add -`framework: pytorch` to your trainer configuration (under the behavior name) to enable it. -Note that PyTorch 1.6.0 or greater should be installed to use this feature; see -[the PyTorch website](https://pytorch.org/) for installation instructions. (#4335) ### Minor Changes #### com.unity.ml-agents (C#) diff --git a/ml-agents/setup.py b/ml-agents/setup.py index 248bdefa89..2b7a72e0a6 100644 --- a/ml-agents/setup.py +++ b/ml-agents/setup.py @@ -63,7 +63,7 @@ def run(self): "Pillow>=4.2.1", "protobuf>=3.6", "pyyaml>=3.1.0", - "tensorflow>=1.7,<3.0", + "tensorflow>=1.14,<3.0", "cattrs>=1.0.0", "attrs>=19.3.0", 'pypiwin32==223;platform_system=="Windows"', diff --git a/test_constraints_max_tf2_version.txt b/test_constraints_max_tf2_version.txt index 268b74ed07..74dca2a3c7 100644 --- a/test_constraints_max_tf2_version.txt +++ b/test_constraints_max_tf2_version.txt @@ -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.2.0rc3 +tensorflow==2.3.0 h5py>=2.10.0 diff --git a/test_constraints_min_version.txt b/test_constraints_min_version.txt index a83b513f31..b30759c89d 100644 --- a/test_constraints_min_version.txt +++ b/test_constraints_min_version.txt @@ -3,5 +3,5 @@ grpcio==1.11.0 numpy==1.14.1 Pillow==4.2.1 protobuf==3.6 -tensorflow==1.7.0 +tensorflow==1.14.0 h5py==2.9.0 diff --git a/test_requirements.txt b/test_requirements.txt index 99e96f919f..656ae427a4 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -6,5 +6,4 @@ pytest-xdist==1.34.0 # PyTorch tests are here for the time being, before they are used in the codebase. torch>=1.5.0 -# onnx doesn't currently have a wheel for 3.8 -tf2onnx>=1.5.5;python_version<'3.8' +tf2onnx>=1.5.5