Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing the torch and sbi version to the last actively tested ones #102

Merged
merged 4 commits into from
Dec 20, 2023
Merged

Fixing the torch and sbi version to the last actively tested ones #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc9398c
Back to fixing the torch version
famura Dec 19, 2023
ae79d8e
Simpler badge
famura Dec 19, 2023
566fb09
Fixing the sbi version to the last one that was actively used
famura Dec 19, 2023
c1e8df6
Formatting
famura Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
<!-- [![codecov](https://codecov.io/gh/famura/SimuRLacra/branch/master/graph/badge.svg)](https://codecov.io/gh/famura/SimuRLacra) -->
Expand Down
9 changes: 5 additions & 4 deletions setup_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}

Expand Down Expand Up @@ -551,17 +550,19 @@ 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"])
sp.check_call([sys.executable, "-m", "pip", "install", "-U", "--no-deps", "pyro-ppl"])
# 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"])

Expand Down
Loading