From f47b8092afe1106be5f37c31f248b8875f27f601 Mon Sep 17 00:00:00 2001 From: galleibo-intel Date: Mon, 6 Nov 2017 19:41:32 +0200 Subject: [PATCH] fix for intel optimized tensorflow on distributed runs + adding coach_env to .gitignore --- .gitignore | 1 + agents/agent.py | 4 ++-- coach.py | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e3aa5d..6fc79b4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ roboschool *.doc *.orig docs/site +coach_env diff --git a/agents/agent.py b/agents/agent.py index 289e534..3e83c4b 100644 --- a/agents/agent.py +++ b/agents/agent.py @@ -343,8 +343,8 @@ class Agent(object): :param to_type: can be 'channels_first' or 'channels_last' :return: a new observation with the requested axes order """ - if from_type == to_type: - return + if from_type == to_type or len(observation.shape) == 1: + return observation assert 2 <= len(observation.shape) <= 3, 'num axes of an observation must be 2 for a vector or 3 for an image' assert type(observation) == np.ndarray, 'observation must be a numpy array' if len(observation.shape) == 3: diff --git a/coach.py b/coach.py index 1624632..ffddbc9 100644 --- a/coach.py +++ b/coach.py @@ -37,7 +37,6 @@ time_started = datetime.datetime.now() cur_time = time_started.time() cur_date = time_started.date() - def get_experiment_path(general_experiments_path): if not os.path.exists(general_experiments_path): os.makedirs(general_experiments_path) @@ -265,7 +264,7 @@ if __name__ == "__main__": # Multi-threaded runs else: assert args.framework.lower() == 'tensorflow', "Distributed training works only with TensorFlow" - + os.environ["OMP_NUM_THREADS"]="1" # set parameter server and workers addresses ps_hosts = "localhost:{}".format(get_open_port()) worker_hosts = ",".join(["localhost:{}".format(get_open_port()) for i in range(run_dict['num_threads'] + 1)])