cleanup

ml-agents/mlagents/trainers/__init__.py

-from mlagents.trainers.tf import tf as tf  # noqa
-from mlagents.trainers.tf import tf_flatten, tf_rnn, tf_variance_scaling  # noqa

ml-agents/mlagents/trainers/bc/models.py

-from mlagents.trainers import tf, tf_variance_scaling
+from mlagents.tf_utils import tf, tf_variance_scaling
 
 from mlagents.trainers.models import LearningModel
 

ml-agents/mlagents/trainers/components/bc/model.py

-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.trainers.models import LearningModel
 

ml-agents/mlagents/trainers/components/reward_signals/__init__.py

 import numpy as np
 import abc
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.envs.brain import BrainInfo
 from mlagents.trainers.trainer import UnityTrainerException

ml-agents/mlagents/trainers/components/reward_signals/curiosity/model.py

 from typing import List, Tuple
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.trainers.models import LearningModel
 

ml-agents/mlagents/trainers/components/reward_signals/curiosity/signal.py

 from typing import Any, Dict, List
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.envs.brain import BrainInfo
 

ml-agents/mlagents/trainers/components/reward_signals/gail/model.py

 from typing import List, Optional, Tuple
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.trainers.models import LearningModel
 

ml-agents/mlagents/trainers/components/reward_signals/gail/signal.py

 from typing import Any, Dict, List
 import logging
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.envs.brain import BrainInfo
 from mlagents.trainers.components.reward_signals import RewardSignal, RewardSignalResult

ml-agents/mlagents/trainers/models.py

 from typing import Callable, Dict, List, Optional
 
 import numpy as np
-from mlagents.trainers import tf, tf_variance_scaling, tf_rnn, tf_flatten
+from mlagents.tf_utils import tf, tf_variance_scaling, tf_rnn, tf_flatten
 
 from mlagents.trainers.trainer import UnityTrainerException
 from mlagents.envs.brain import CameraResolution

ml-agents/mlagents/trainers/ppo/models.py

 from typing import Optional
 
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 from mlagents.trainers.models import LearningModel, EncoderType, LearningRateSchedule
 
 logger = logging.getLogger("mlagents.trainers")

ml-agents/mlagents/trainers/ppo/multi_gpu_policy.py

 import logging
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from tensorflow.python.client import device_lib
 from mlagents.envs.timers import timed

ml-agents/mlagents/trainers/ppo/policy.py

 import numpy as np
 from typing import Any, Dict, Optional
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.envs.timers import timed
 from mlagents.envs.brain import BrainInfo, BrainParameters

ml-agents/mlagents/trainers/sac/models.py

 import numpy as np
 from typing import Dict, List, Optional
 
-from mlagents.trainers import tf, tf_variance_scaling
+from mlagents.tf_utils import tf, tf_variance_scaling
 
 from mlagents.trainers.models import LearningModel, LearningRateSchedule, EncoderType
 

ml-agents/mlagents/trainers/sac/policy.py

 import logging
 from typing import Dict, Any, Optional
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.envs.timers import timed
 from mlagents.envs.brain import BrainInfo, BrainParameters

ml-agents/mlagents/trainers/tensorflow_to_barracuda.py

 from __future__ import print_function
 import numpy as np
 import struct  # convert from Python values and C structs
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 import re
 
 # import barracuda

ml-agents/mlagents/trainers/tests/test_bc.py

 import os
 
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 import yaml
 
 from mlagents.trainers.bc.models import BehavioralCloningModel

ml-agents/mlagents/trainers/tests/test_multigpu.py

 import unittest.mock as mock
 import pytest
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 import yaml
 
 from mlagents.trainers.ppo.multi_gpu_policy import MultiGpuPPOPolicy

ml-agents/mlagents/trainers/tests/test_ppo.py

 import pytest
 
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 import yaml
 

ml-agents/mlagents/trainers/tests/test_sac.py

 import yaml
 
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 
 from mlagents.trainers.sac.models import SACModel

ml-agents/mlagents/trainers/tests/test_trainer_controller.py

 from unittest.mock import MagicMock, Mock, patch
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 import yaml
 import pytest

ml-agents/mlagents/trainers/tf_policy.py

 from typing import Any, Dict, List, Optional
 
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 from mlagents.envs.exception import UnityException
 from mlagents.envs.policy import Policy

ml-agents/mlagents/trainers/trainer.py

 from typing import Dict, List, Deque, Any
 import os
 
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 
 import numpy as np
 from collections import deque, defaultdict

ml-agents/mlagents/trainers/trainer_controller.py

 from typing import Dict, List, Optional, Set
 
 import numpy as np
-from mlagents.trainers import tf
+from mlagents.tf_utils import tf
 from time import time
 
 from mlagents.envs.env_manager import EnvironmentStep

test_constraints_max_tf2_version.txt

 # 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>=1.14.0,<2.0
+tensorflow>=2.0.0,<2.1.0

test_constraints_min_version.txt

 numpy==1.16.0  # TEMP
 Pillow==4.2.1
 protobuf==3.6
-# TEMPORARY
-#tensorflow==1.7
-tensorflow==2.0.0
+tensorflow==1.7

ml-agents/mlagents/tf_utils/__init__.py

+from mlagents.tf_utils.tf import tf as tf  # noqa
+from mlagents.tf_utils.tf import tf_flatten, tf_rnn, tf_variance_scaling  # noqa