From 5b9aa7e1b39e6fa608ffd02d6cbf5d29f57b502f Mon Sep 17 00:00:00 2001 From: Sueda Ciftci Date: Fri, 13 Sep 2024 12:58:17 +0100 Subject: [PATCH] update setup and requirements --- .../cleanair/gpjax_models/requirements.txt | 42 +++++++++---------- containers/cleanair/gpjax_models/setup.py | 15 +++---- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/containers/cleanair/gpjax_models/requirements.txt b/containers/cleanair/gpjax_models/requirements.txt index eb2935e0c..c4527dbe3 100644 --- a/containers/cleanair/gpjax_models/requirements.txt +++ b/containers/cleanair/gpjax_models/requirements.txt @@ -1,26 +1,22 @@ -typer -loguru -slurmjobs -sacred -seml -scikit-learn -tabulate -jupyter -PyYAML -black -pandas -matplotlib -geopandas -rtree -dvc -convertbng -rich +git+https://github.com/defaultobject/stdata@update_polygon_patch git+https://github.com/defaultobject/batchjax git+https://github.com/defaultobject/stgp -tensorflow-probability -jaxlib -bibtexparser -flake8 -flake8-docstrings -bng_latlon +typer==0.12.3 +loguru==0.7.2 +slurmjobs==1.1.3 +sacred==0.8.5 +seml==0.5.1 +tabulate==0.9.0 +jupyter==1.0.0 +PyYAML==6.0.1 +black==24.4.2 +rtree==1.2.0 +dvc==3.51.2 +convertbng==0.7.2 +rich==13.7.1 +bibtexparser==1.4.1 +flake8==7.1.0 +flake8-docstrings==1.7.0 +bng-latlon==1.1 +colorlog==6.7.0 diff --git a/containers/cleanair/gpjax_models/setup.py b/containers/cleanair/gpjax_models/setup.py index e9a75d991..435ca698f 100644 --- a/containers/cleanair/gpjax_models/setup.py +++ b/containers/cleanair/gpjax_models/setup.py @@ -20,17 +20,18 @@ # Dependencies INSTALL_REQUIRES = [ - "jax", - "numpy", - "pandas==2.1.3", + "jax==0.4.25", + "jaxlib==0.4.27", + "numpy==1.26.4", + "pandas==2.2.2", "pydantic==1.10.12", - "scikit-learn", + "scikit-learn==1.5.1", "scipy==1.11.2", - "typer==0.9.0", "tinygp==0.3.0", - "tensorflow-probability", - "colorlog==6.7.0", + "tensorflow-probability==0.23.0", "nptyping==2.5.0", + "matplotlib==3.9.1", + "geopandas==1.0.1", ] SETUP_REQUIRES = ["setuptools_scm"]