From 969d95907bee2e2fb1c688aded5133346bc99f7c Mon Sep 17 00:00:00 2001 From: Felix Chalumeau Date: Mon, 20 Nov 2023 11:28:44 +0200 Subject: [PATCH 1/9] fix(readme): update the paper to cite --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8b321c6b..249de523 100644 --- a/README.md +++ b/README.md @@ -164,11 +164,13 @@ Issues and contributions are welcome. Please refer to the [contribution guide](h ## Citing QDax If you use QDax in your research and want to cite it in your work, please use: ``` -@article{lim2022accelerated, - title={Accelerated Quality-Diversity for Robotics through Massive Parallelism}, - author={Lim, Bryan and Allard, Maxime and Grillotti, Luca and Cully, Antoine}, - journal={arXiv preprint arXiv:2202.01258}, - year={2022} +@misc{chalumeau2023qdax, + title={QDax: A Library for Quality-Diversity and Population-based Algorithms with Hardware Acceleration}, + author={Felix Chalumeau and Bryan Lim and Raphael Boige and Maxime Allard and Luca Grillotti and Manon Flageat and Valentin Macé and Arthur Flajolet and Thomas Pierrot and Antoine Cully}, + year={2023}, + eprint={2308.03665}, + archivePrefix={arXiv}, + primaryClass={cs.AI} } ``` From 559d16631772478552f4057dbd29ae65d364d57c Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Fri, 24 Nov 2023 16:22:51 +0900 Subject: [PATCH 2/9] Fix python version in .readthedocs.yaml python 3.8 -> 3.9 --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 7eec359d..d9f0965b 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,7 +8,7 @@ version: 2 build: os: ubuntu-20.04 tools: - python: "3.8" + python: "3.9" apt_packages: - swig From f4d7ba153ae5c1d60f55a4c63b59f079e4966cfa Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Fri, 24 Nov 2023 17:11:10 +0900 Subject: [PATCH 3/9] Remove dependency to deprecated version of jax --- dev.Dockerfile | 12 ++++++------ requirements.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index a6ac351f..458599db 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:0.22.0 as conda +FROM mambaorg/micromamba:1.5.1 as conda # Speed up the build, and avoid unnecessary writes to disk ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 CONDA_DIR=/opt/conda @@ -16,7 +16,7 @@ RUN micromamba create -y --file /tmp/environment.yaml \ FROM python as test-image -ENV PATH=/opt/conda/envs/qdaxpy38/bin/:$PATH APP_FOLDER=/app +ENV PATH=/opt/conda/envs/qdaxpy39/bin/:$PATH APP_FOLDER=/app ENV PYTHONPATH=$APP_FOLDER:$PYTHONPATH COPY --from=conda /opt/conda/envs/. /opt/conda/envs/ @@ -25,8 +25,8 @@ COPY requirements-dev.txt ./ RUN pip install -r requirements-dev.txt -FROM nvidia/cuda:11.4.1-cudnn8-devel-ubuntu20.04 as cuda-image -ENV PATH=/opt/conda/envs/qdaxpy38/bin/:$PATH APP_FOLDER=/app +FROM nvidia/cuda:11.5.2-cudnn8-devel-ubuntu20.04 as cuda-image +ENV PATH=/opt/conda/envs/qdaxpy39/bin/:$PATH APP_FOLDER=/app ENV PYTHONPATH=$APP_FOLDER:$PYTHONPATH @@ -40,7 +40,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-11.0/targets/x86_64-linux/l ENV TZ=Europe/Paris RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN pip --no-cache-dir install jaxlib==0.3.15+cuda11.cudnn82 \ +RUN pip --no-cache-dir install jaxlib==0.4.16+cuda11.cudnn86 \ -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html \ && rm -rf /tmp/* @@ -70,7 +70,7 @@ RUN apt-get update && \ libosmesa6-dev \ patchelf \ python3-opengl \ - python3-dev=3.8* \ + python3-dev=3.9* \ python3-pip \ screen \ sudo \ diff --git a/requirements.txt b/requirements.txt index 16c91bc3..b66411c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ dm-haiku==0.0.5 flax==0.6.0 gym==0.23.1 ipython -jax==0.3.17 -jaxlib==0.3.15 +jax==0.4.16 +jaxlib==0.4.16 jumanji==0.1.3 jupyter numpy==1.22.3 From f9837aeea4447594f80b8f4639708d5b8e55ce61 Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Tue, 28 Nov 2023 00:55:11 +0900 Subject: [PATCH 4/9] retest with old versions of jax --- .pre-commit-config.yaml | 4 ++-- dev.Dockerfile | 2 +- docs/installation.md | 2 +- environment.yaml | 4 ++-- requirements.txt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af8f2bc2..a9329a64 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,8 +8,8 @@ repos: rev: 22.3.0 hooks: - id: black - language_version: python3.8 - args: ["--target-version", "py38"] + language_version: python3.9 + args: ["--target-version", "py39"] - repo: https://github.com/PyCQA/flake8 rev: 3.8.4 hooks: diff --git a/dev.Dockerfile b/dev.Dockerfile index 458599db..5ff639de 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -40,7 +40,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-11.0/targets/x86_64-linux/l ENV TZ=Europe/Paris RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN pip --no-cache-dir install jaxlib==0.4.16+cuda11.cudnn86 \ +RUN pip --no-cache-dir install jaxlib==0.3.15+cuda11.cudnn82 \ -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html \ && rm -rf /tmp/* diff --git a/docs/installation.md b/docs/installation.md index 319a88c7..10e45ea1 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -139,7 +139,7 @@ git clone git@github.com:adaptive-intelligent-robotics/QDax.git 2. Activate the environment and manually install the package qdax ```zsh - conda activate qdaxpy38 + conda activate qdaxpy39 pip install -e . ``` diff --git a/environment.yaml b/environment.yaml index e46c034e..0ddf80d5 100644 --- a/environment.yaml +++ b/environment.yaml @@ -1,9 +1,9 @@ -name: qdaxpy38 +name: qdaxpy39 channels: - defaults - conda-forge dependencies: -- python=3.8 +- python=3.9 - pip>=20.3.3 - conda>=4.9.2 - pip: diff --git a/requirements.txt b/requirements.txt index b66411c9..16c91bc3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ dm-haiku==0.0.5 flax==0.6.0 gym==0.23.1 ipython -jax==0.4.16 -jaxlib==0.4.16 +jax==0.3.17 +jaxlib==0.3.15 jumanji==0.1.3 jupyter numpy==1.22.3 From 6bba333b8b90dca15b24c72b9eb331098c4492b7 Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Tue, 28 Nov 2023 01:11:34 +0900 Subject: [PATCH 5/9] another try of jaxlib versions --- dev.Dockerfile | 2 +- requirements.txt | 4 ++-- tool.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index 5ff639de..458599db 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -40,7 +40,7 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda-11.0/targets/x86_64-linux/l ENV TZ=Europe/Paris RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN pip --no-cache-dir install jaxlib==0.3.15+cuda11.cudnn82 \ +RUN pip --no-cache-dir install jaxlib==0.4.16+cuda11.cudnn86 \ -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html \ && rm -rf /tmp/* diff --git a/requirements.txt b/requirements.txt index 16c91bc3..b66411c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ dm-haiku==0.0.5 flax==0.6.0 gym==0.23.1 ipython -jax==0.3.17 -jaxlib==0.3.15 +jax==0.4.16 +jaxlib==0.4.16 jumanji==0.1.3 jupyter numpy==1.22.3 diff --git a/tool.Dockerfile b/tool.Dockerfile index 2def88da..10b15b02 100644 --- a/tool.Dockerfile +++ b/tool.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8.13-slim +FROM python:3.9.18-slim ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 ENV PIPENV_VENV_IN_PROJECT=true PIP_NO_CACHE_DIR=false PIP_DISABLE_PIP_VERSION_CHECK=1 From 632c338f8addd1ca8c2ca5f1bce2d8b2065f0f5d Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Tue, 28 Nov 2023 01:35:50 +0900 Subject: [PATCH 6/9] update requirements --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index b66411c9..23130709 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ absl-py==1.0.0 brax==0.0.15 -chex==0.1.5 -dm-haiku==0.0.5 -flax==0.6.0 -gym==0.23.1 +chex==0.1.83 +dm-haiku==0.0.9 +flax==0.7.4 +gym==0.26.2 ipython jax==0.4.16 jaxlib==0.4.16 jumanji==0.1.3 jupyter -numpy==1.22.3 -optax==0.1.4 +numpy==1.24.1 +optax==0.1.7 protobuf==3.19.4 scikit-learn==1.0.2 scipy==1.8.0 From 973ad0c75387ff2256af2fc2bf1aef99232d08c3 Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Tue, 28 Nov 2023 01:57:45 +0900 Subject: [PATCH 7/9] update brax version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 23130709..00f44ae9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ absl-py==1.0.0 -brax==0.0.15 +brax==0.1.2 chex==0.1.83 dm-haiku==0.0.9 flax==0.7.4 From 2251a6994deacd652e9858994d840c7a5c11d7a5 Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Tue, 28 Nov 2023 12:08:37 +0900 Subject: [PATCH 8/9] update dm-haiku version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 00f44ae9..6bb71e02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ absl-py==1.0.0 brax==0.1.2 chex==0.1.83 -dm-haiku==0.0.9 +dm-haiku==0.0.10 flax==0.7.4 gym==0.26.2 ipython From 067636462d431b9cf957700ff2058923ded4c0f5 Mon Sep 17 00:00:00 2001 From: Luca Grillotti Date: Tue, 28 Nov 2023 13:07:40 +0900 Subject: [PATCH 9/9] update tf proba version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6bb71e02..40626724 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,5 +15,5 @@ protobuf==3.19.4 scikit-learn==1.0.2 scipy==1.8.0 seaborn==0.11.2 -tensorflow-probability==0.15.0 +tensorflow-probability==0.19.0 typing-extensions==4.3.0