Merge remote-tracking branch 'origin/main' into bugfix/fix-robohive-t…

…ests
pytorch · Apr 7, 2024 · 6cddb66 · 6cddb66
2 parents ba59958 + 8dc35be
commit 6cddb66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/unittest/linux_libs/scripts_robohive/setup_env.sh b/.github/unittest/linux_libs/scripts_robohive/setup_env.sh
@@ -76,4 +76,6 @@ pip install pip --upgrade
 
 conda env update --file "${this_dir}/environment.yml" --prune
 
+conda install conda-forge::ffmpeg -y
+
 pip install git+https://github.com/vikashplus/robohive@main
diff --git a/torchrl/envs/transforms/transforms.py b/torchrl/envs/transforms/transforms.py
@@ -3805,7 +3805,7 @@ def __init__(
             if torch.cuda.is_available():
                 self._sync_device = torch.cuda.synchronize
             elif torch.backends.mps.is_available():
-                self._sync_device = torch.cuda.synchronize
+                self._sync_device = torch.mps.synchronize
             elif device.type == "cpu":
                 self._sync_device = _do_nothing
         else:
@@ -3901,7 +3901,7 @@ def _sync_orig_device(self):
                 if torch.cuda.is_available():
                     self._sync_orig_device_val = torch.cuda.synchronize
                 elif torch.backends.mps.is_available():
-                    self._sync_orig_device_val = torch.cuda.synchronize
+                    self._sync_orig_device_val = torch.mps.synchronize
                 elif device.type == "cpu":
                     self._sync_orig_device_val = _do_nothing
             else:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,4 +76,6 @@ pip install pip --upgrade

		conda env update --file "${this_dir}/environment.yml" --prune

		conda install conda-forge::ffmpeg -y

		pip install git+https://github.com/vikashplus/robohive@main