Merge branch 'main'

2023-07-18 16:32:33 +02:00 · 2023-07-18 16:32:33 +02:00 · 3b61469681
commit 3b61469681
parent a0cb89820e 0ac3131dad
36 changed files with 22 additions and 19 deletions
--- a/Dreamer/pycache/dreamers.cpython-37.pyc
+++ b/Dreamer/pycache/dreamers.cpython-37.pyc
--- a/Dreamer/pycache/env_tools.cpython-37.pyc
+++ b/Dreamer/pycache/env_tools.cpython-37.pyc
--- a/Dreamer/pycache/models.cpython-37.pyc
+++ b/Dreamer/pycache/models.cpython-37.pyc
--- a/Dreamer/pycache/tools.cpython-37.pyc
+++ b/Dreamer/pycache/tools.cpython-37.pyc
--- a/Dreamer/pycache/tools.cpython-38.pyc
+++ b/Dreamer/pycache/tools.cpython-38.pyc
--- a/Dreamer/pycache/wrappers.cpython-37.pyc
+++ b/Dreamer/pycache/wrappers.cpython-37.pyc
--- a/Dreamer/pycache/wrappers.cpython-38.pyc
+++ b/Dreamer/pycache/wrappers.cpython-38.pyc
--- a/Dreamer/dmc2gym/pycache/init.cpython-37.pyc
+++ b/Dreamer/dmc2gym/pycache/init.cpython-37.pyc
--- a/Dreamer/dmc2gym/pycache/natural_imgsource.cpython-37.pyc
+++ b/Dreamer/dmc2gym/pycache/natural_imgsource.cpython-37.pyc
--- a/Dreamer/dmc2gym/pycache/wrappers.cpython-37.pyc
+++ b/Dreamer/dmc2gym/pycache/wrappers.cpython-37.pyc
--- a/Dreamer/dreamers.py
+++ b/Dreamer/dreamers.py
@ -308,6 +308,7 @@ class SeparationDreamer(Dreamer):
        with tf.GradientTape(persistent=True) as model_tape:

            # main
+            data["image"] = tf.transpose(data["image"], perm=[0, 1, 3, 4, 2])
            embed = self._encode(data)
            post, prior = self._dynamics.observe(embed, data['action'])
            feat = self._dynamics.get_feat(post)
--- a/Dreamer/local_dm_control_suite/pycache/init.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/init.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/acrobot.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/acrobot.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/ball_in_cup.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/ball_in_cup.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/base.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/base.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/cartpole.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/cartpole.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/cheetah.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/cheetah.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/finger.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/finger.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/fish.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/fish.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/hopper.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/hopper.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/humanoid.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/humanoid.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/humanoid_CMU.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/humanoid_CMU.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/lqr.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/lqr.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/manipulator.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/manipulator.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/pendulum.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/pendulum.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/point_mass.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/point_mass.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/quadruped.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/quadruped.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/reacher.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/reacher.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/stacker.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/stacker.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/swimmer.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/swimmer.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/pycache/walker.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/pycache/walker.cpython-37.pyc
--- a/Dreamer/local_dm_control_suite/common/pycache/init.cpython-37.pyc
+++ b/Dreamer/local_dm_control_suite/common/pycache/init.cpython-37.pyc
--- a/Dreamer/tools.py
+++ b/Dreamer/tools.py
@ -87,10 +87,12 @@ def video_summary(name, video, step=None, fps=20):
 def encode_gif(frames, fps):
    from subprocess import Popen, PIPE
    print(frames[0].shape)
-    if frames[0].shape[-1] != 3:
+    if frames[0].shape[-1] > 3:
        frames =  np.transpose(frames, [0, 2, 3, 1])
    h, w, c = frames[0].shape
-    print(h,w,c)
+    print(frames[0].shape)
+
+    if c!=64:
        pxfmt = {1: 'gray', 3: 'rgb24'}[c]
        cmd = ' '.join([
            f'ffmpeg -y -f rawvideo -vcodec rawvideo',
--- a/Dreamer/train_configs/dreamer.yaml
+++ b/Dreamer/train_configs/dreamer.yaml
@ -1,6 +1,6 @@
 dmc: 

-  logdir: /home/vedant/tia/Dreamer/logdir
+  logdir: /media/vedant/cpsDataStorageWK/Vedant/tia_logs
  video_dir_train: /media/vedant/cpsDataStorageWK/Vedant/natural_video_setting/train/
  video_dir_test: /media/vedant/cpsDataStorageWK/Vedant/natural_video_setting/test/
  debug: False
--- a/Dreamer/train_configs/tia.yaml
+++ b/Dreamer/train_configs/tia.yaml
@ -1,6 +1,6 @@
 dmc:

-  logdir: /home/vedant/tia/Dreamer/logdir
+  logdir: /media/vedant/cpsDataStorageWK/Vedant/tia_logs
  video_dir_train: /media/vedant/cpsDataStorageWK/Vedant/natural_video_setting/train/
  video_dir_test: /media/vedant/cpsDataStorageWK/Vedant/natural_video_setting/test/
  debug: False