From dc9398c0009d5b3b87060e13349859a86c01af67 Mon Sep 17 00:00:00 2001 From: Fabio Muratore Date: Tue, 19 Dec 2023 18:08:23 +0100 Subject: [PATCH 1/4] Back to fixing the torch version --- setup_deps.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup_deps.py b/setup_deps.py index 56076d4fc18..1db29fa33e5 100644 --- a/setup_deps.py +++ b/setup_deps.py @@ -218,7 +218,6 @@ "PYBIND11_PYTHON_VERSION": "3.7", "SETUP_PYTHON_DEVEL": "ON", "Rcs_DIR": rcs_build_dir, - "USE_LIBTORCH": uselibtorch, # use the manually build PyTorch from thirdParty/pytorch # Do NOT set CMAKE_PREFIX_PATH here, it will get overridden later on. } @@ -551,9 +550,9 @@ def setup_pytorch_based(): # Set up GPyTorch without touching the PyTorch installation (requires scikit-learn which requires threadpoolctl) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "threadpoolctl"]) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "scikit-learn"]) - sp.check_call([sys.executable, "-m", "pip", "install", "-U", "gpytorch"]) + sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "gpytorch"]) # Set up BoTorch without touching the PyTorch installation (requires gpytorch) - sp.check_call([sys.executable, "-m", "pip", "install", "-U", "botorch"]) + sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "botorch"]) # Set up Pyro without touching the PyTorch installation (requires opt-einsum) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "opt-einsum"]) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "pyro-api"]) From ae79d8e7f0ad7f3d5df52ef817ea746a44232f2e Mon Sep 17 00:00:00 2001 From: Fabio Muratore Date: Tue, 19 Dec 2023 18:08:34 +0100 Subject: [PATCH 2/4] Simpler badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9803139d40f..4dc0ca35e90 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The focus is on robotics tasks with mostly continuous control. It features __randomizable simulations__ written __in standalone Python__ (no license required) as well as simulations driven by the physics engines __Bullet__ (no license required), __Vortex__ (license required), __or MuJoCo__ (license required). [![License](https://img.shields.io/badge/License-BSD%203--Clause-green.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Documentation](https://github.com/famura/SimuRLacra/workflows/Documentation/badge.svg?branch=master)](https://famura.github.io/SimuRLacra/) +[![Documentation](https://img.shields.io/badge/docs-informational)](https://famura.github.io/SimuRLacra/) [![codestyle](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![isort](https://img.shields.io/badge/imports-isort-green)](https://pycqa.github.io/isort/) From 566fb09869ac6fa130978f08c82e9c25b7c2ea9f Mon Sep 17 00:00:00 2001 From: Fabio Muratore Date: Tue, 19 Dec 2023 18:08:52 +0100 Subject: [PATCH 3/4] Fixing the sbi version to the last one that was actively used --- setup_deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_deps.py b/setup_deps.py index 1db29fa33e5..337e0cf2623 100644 --- a/setup_deps.py +++ b/setup_deps.py @@ -560,7 +560,7 @@ def setup_pytorch_based(): # Set up SBI without touching the PyTorch installation (requires Pyro and pyknos which requires nflows) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "nflows"]) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "pyknos"]) - sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "sbi"]) + sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "sbi==0.12.0"]) # 0.18 is the last version before arviz # Downgrade to avoid the incompatibility with cliff (whatever cliff is) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "prettytable==0.7.2"]) From c1e8df63b42a1e79b353e85d68cd3abab819ca03 Mon Sep 17 00:00:00 2001 From: Fabio Muratore Date: Tue, 19 Dec 2023 18:19:01 +0100 Subject: [PATCH 4/4] Formatting --- setup_deps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup_deps.py b/setup_deps.py index 337e0cf2623..0779750063d 100644 --- a/setup_deps.py +++ b/setup_deps.py @@ -560,7 +560,9 @@ def setup_pytorch_based(): # Set up SBI without touching the PyTorch installation (requires Pyro and pyknos which requires nflows) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "nflows"]) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "pyknos"]) - sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "sbi==0.12.0"]) # 0.18 is the last version before arviz + sp.check_call( + [sys.executable, "-m", "pip", "install", "-U", "--no-deps", "sbi==0.12.0"] + ) # 0.18 is the last version before arviz # Downgrade to avoid the incompatibility with cliff (whatever cliff is) sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "prettytable==0.7.2"])