Merge pull request #2648 from erwincoumans/master

workaround for Tensorflow 2.x breaking API:

examples/pybullet/gym/pybullet_envs/agents/configs.py

@@ -26,7 +26,10 @@ from pybullet_envs.bullet import minitaur_duck_gym_env
 from pybullet_envs.bullet import minitaur_env_randomizer
 import pybullet_envs.bullet.minitaur_gym_env as minitaur_gym_env
 import pybullet_envs
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 def default():

examples/pybullet/gym/pybullet_envs/agents/networks.py

@@ -21,7 +21,10 @@ import collections
 import functools
 import operator
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 NetworkOutput = collections.namedtuple('NetworkOutput', 'policy, mean, logstd, value, state')
 

examples/pybullet/gym/pybullet_envs/agents/ppo/algorithm.py

@@ -23,7 +23,10 @@ from __future__ import print_function
 
 import functools
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from . import memory
 from . import normalize

examples/pybullet/gym/pybullet_envs/agents/ppo/memory.py

@@ -17,7 +17,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class EpisodeMemory(object):

examples/pybullet/gym/pybullet_envs/agents/ppo/normalize.py

@@ -17,7 +17,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class StreamingNormalize(object):

examples/pybullet/gym/pybullet_envs/agents/ppo/utility.py

@@ -21,7 +21,10 @@ import collections
 import math
 import re
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 from tensorflow.python.client import device_lib
 
 

examples/pybullet/gym/pybullet_envs/agents/tools/count_weights.py

@@ -20,7 +20,10 @@ from __future__ import print_function
 import re
 
 import numpy as np
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 def count_weights(scope=None, exclude=None, graph=None):

examples/pybullet/gym/pybullet_envs/agents/tools/in_graph_batch_env.py

@@ -18,7 +18,10 @@ from __future__ import division
 from __future__ import print_function
 
 import gym
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class InGraphBatchEnv(object):

examples/pybullet/gym/pybullet_envs/agents/tools/in_graph_env.py

@@ -18,7 +18,10 @@ from __future__ import division
 from __future__ import print_function
 
 import gym
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class InGraphEnv(object):

examples/pybullet/gym/pybullet_envs/agents/tools/loop.py

@@ -20,7 +20,10 @@ from __future__ import print_function
 import collections
 import os
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from . import streaming_mean
 

examples/pybullet/gym/pybullet_envs/agents/tools/mock_algorithm.py

@@ -16,8 +16,10 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class MockAlgorithm(object):

examples/pybullet/gym/pybullet_envs/agents/tools/simulate.py

@@ -17,7 +17,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from . import streaming_mean
 

examples/pybullet/gym/pybullet_envs/agents/tools/streaming_mean.py

@@ -16,8 +16,10 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class StreamingMean(object):

examples/pybullet/gym/pybullet_envs/agents/tools/wrappers.py

@@ -25,7 +25,10 @@ import traceback
 import gym
 import gym.spaces
 import numpy as np
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 
 class AutoReset(object):

examples/pybullet/gym/pybullet_envs/agents/train_ppo.py

@@ -26,7 +26,10 @@ import datetime
 import os
 
 import gym
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from . import tools
 from . import configs

examples/pybullet/gym/pybullet_envs/agents/utility.py

@@ -22,7 +22,10 @@ import os
 import re
 
 import ruamel.yaml as yaml
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from . import tools
 

examples/pybullet/gym/pybullet_envs/agents/visualize_ppo.py

@@ -27,7 +27,10 @@ import os
 
 import gym
 from gym import wrappers
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from . import tools
 from . import utility

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/nets/fc_2layers_1024units.py

@@ -1,4 +1,8 @@
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
+
 import pybullet_envs.deep_mimic.learning.tf_util as TFUtil
 
 NAME = "fc_2layers_1024units"

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/pg_agent.py

@@ -1,5 +1,9 @@
 import numpy as np
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
+
 import copy
 
 from pybullet_envs.deep_mimic.learning.tf_agent import TFAgent

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/ppo_agent.py

@@ -1,6 +1,9 @@
 import numpy as np
 import copy as copy
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 
 from pybullet_envs.deep_mimic.learning.pg_agent import PGAgent
 from pybullet_envs.deep_mimic.learning.solvers.mpi_solver import MPISolver

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/solvers/mpi_solver.py

@@ -1,5 +1,9 @@
 from mpi4py import MPI
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
+  
 import numpy as np
 import pybullet_envs.deep_mimic.learning.tf_util as TFUtil
 import pybullet_utils.math_util as MathUtil

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/tf_agent.py

@@ -1,5 +1,8 @@
 import numpy as np
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 from abc import abstractmethod
 
 from pybullet_envs.deep_mimic.learning.rl_agent import RLAgent

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/tf_normalizer.py

@@ -1,6 +1,9 @@
 import numpy as np
 import copy
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 from pybullet_envs.deep_mimic.learning.normalizer import Normalizer
 
 

examples/pybullet/gym/pybullet_envs/deep_mimic/learning/tf_util.py

@@ -1,8 +1,14 @@
-import tf.compat.v1 as tf
+try:
+  import tensorflow.compat.v1 as tf
+except Exception:
+  import tensorflow as tf
 import numpy as np
 import os
 
-xavier_initializer = tf.contrib.layers.xavier_initializer()
+try:
+  xavier_initializer = tf.contrib.layers.xavier_initializer()
+except Exception:
+  xavier_initializer = None
 
 
 def disable_gpu():