From 12d2085a186d3fd0d24b5268c954989c981b5d92 Mon Sep 17 00:00:00 2001 From: Simon Adamov Date: Sat, 4 May 2024 21:19:15 +0200 Subject: [PATCH] Simplified pip env setup --- README.md | 15 +++------------ requirements.txt | 10 ++++++++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 67d9d9b1..9a2865fe 100644 --- a/README.md +++ b/README.md @@ -56,19 +56,10 @@ Below follows instructions on how to use Neural-LAM to train and evaluate models ## Installation Follow the steps below to create the necessary python environment. -1. Install GEOS for your system. For example with `sudo apt-get install libgeos-dev`. This is necessary for the Cartopy requirement. -2. Use python 3.9. -3. Install version 2.0.1 of PyTorch. Follow instructions on the [PyTorch webpage](https://pytorch.org/get-started/previous-versions/) for how to set this up with GPU support on your system. -4. Install required packages specified in `requirements.txt`. -5. Install PyTorch Geometric version 2.2.0. This can be done by running -``` -TORCH="2.0.1" -CUDA="cu117" +1. Use python >= 3.9. +2. Install PyTorch by following instructions on the [PyTorch webpage](https://pytorch.org/get-started/previous-versions/) for how to set this up with GPU support on your system. +3. Install required packages specified in `requirements.txt`. -pip install pyg-lib==0.2.0 torch-scatter==2.1.1 torch-sparse==0.6.17 torch-cluster==1.6.1\ - torch-geometric==2.3.1 -f https://pytorch-geometric.com/whl/torch-${TORCH}+${CUDA}.html -``` -You will have to adjust the `CUDA` variable to match the CUDA version on your system or to run on CPU. See the [installation webpage](https://pytorch-geometric.readthedocs.io/en/latest/install/installation.html) for more information. ## Data Datasets should be stored in a directory called `data`. diff --git a/requirements.txt b/requirements.txt index 5a2111b2..c7c85a87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -# for all numpy>=1.24.2 wandb>=0.13.10 matplotlib>=3.7.0 @@ -6,10 +5,17 @@ scipy>=1.10.0 pytorch-lightning>=2.0.3 shapely>=2.0.1 networkx>=3.0 -Cartopy>=0.22.0 +Cartopy>=0.20.0 pyproj>=3.4.1 tueplots>=0.0.8 plotly>=5.15.0 +torch>=2.0.1 +--find-links https://data.pyg.org/whl/torch-${TORCH}.html +torch-scatter>=2.1.0 +torch-sparse>=0.6.15 +torch-cluster>=1.6.0 +torch-spline-conv>=1.2.1 +torch-geometric>=2.3.0 # for dev codespell>=2.0.0 black>=21.9b0