diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75be67797..116c7a85b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,8 +36,16 @@ jobs: name: Unit tests - IceTray needs: [ check-codeclimate-credentials ] runs-on: ubuntu-latest - container: icecube/icetray:icetray-prod-v1.8.1-ubuntu20.04-X64 + container: + image: icecube/icetray:icetray-prod-v1.8.1-ubuntu20.04-X64 + options: --user root steps: + - name: install git + run: | + apt-get --yes install sudo + sudo apt update --fix-missing --yes + sudo apt upgrade --yes + sudo apt-get install --yes git-all - name: Set environment variables run: | echo "PATH=/usr/local/icetray/bin:$PATH" >> $GITHUB_ENV @@ -61,9 +69,9 @@ jobs: coverage run --source=graphnet -m pytest tests/examples/01_icetray coverage xml -o coverage.xml - #- name: Work around permission issue - # run: | - # git config --global --add safe.directory /__w/graphnet/graphnet + - name: Work around permission issue + run: | + git config --global --add safe.directory /__w/graphnet/graphnet - name: Publish code coverage uses: paambaati/codeclimate-action@v3.0.0 if: needs.check-codeclimate-credentials.outputs.has_credentials == 'true' @@ -93,6 +101,13 @@ jobs: editable: true - name: Print available disk space after graphnet install run: df -h + - name: Print packages in pip + run: | + pip show torch + pip show torch-geometric + pip show torch-cluster + pip show torch-sparse + pip show torch-scatter - name: Run unit tests and generate coverage report run: | set -o pipefail # To propagate exit code from pytest @@ -100,7 +115,7 @@ jobs: coverage run --source=graphnet -m pytest tests/utilities coverage report -m - name: Print available disk space after unit tests - run: df -h + run: df -h build-macos: name: Unit tests - macOS @@ -116,8 +131,15 @@ jobs: with: editable: true hardware: "macos" + - name: Print packages in pip + run: | + pip show torch + pip show torch-geometric + pip show torch-cluster + pip show torch-sparse + pip show torch-scatter - name: Run unit tests and generate coverage report run: | set -o pipefail # To propagate exit code from pytest coverage run --source=graphnet -m pytest tests/ --ignore=tests/data/ --ignore=tests/deployment/ --ignore=tests/examples/ - coverage report -m + coverage report -m \ No newline at end of file diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7d5ad7964..09cb04bf8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -19,6 +19,28 @@ jobs: packages: write contents: read steps: + - name: Before Clean-up + run: | + echo "Free space:" + df -h + + - name: Free Disk Space + uses: jlumbroso/free-disk-space@main + with: + tool-cache: true + + # all of these default to true, but feel free to set to + # false if necessary for your workflow + android: true + dotnet: true + haskell: true + large-packages: true + swap-storage: true + + - name: After Clean-up + run: | + echo "Free space:" + df -h - name: Checkout uses: actions/checkout@v3 - name: Set up QEMU diff --git a/README.md b/README.md index 8afc9d773..7a2e69af9 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,6 @@ $ conda create --name graphnet python=3.8 gcc_linux-64 gxx_linux-64 libgcc cudat $ conda activate graphnet # Optional (graphnet) $ pip install -r requirements/torch_cpu.txt -e .[develop,torch] # CPU-only torch (graphnet) $ pip install -r requirements/torch_gpu.txt -e .[develop,torch] # GPU support -(graphnet) $ pip install -r requirements/torch_macos.txt -e .[develop,torch] # On macOS ``` This should allow you to e.g. run the scripts in [examples/](./examples/) out of the box. diff --git a/requirements/torch_cpu.txt b/requirements/torch_cpu.txt index 6f68e3600..59e273288 100644 --- a/requirements/torch_cpu.txt +++ b/requirements/torch_cpu.txt @@ -1,2 +1,2 @@ --find-links https://download.pytorch.org/whl/cpu ---find-links https://data.pyg.org/whl/torch-2.0.0+cpu.html \ No newline at end of file +--find-links https://data.pyg.org/whl/torch-2.1.0+cpu.html \ No newline at end of file diff --git a/requirements/torch_gpu.txt b/requirements/torch_gpu.txt index 553d306e5..03e2a6906 100644 --- a/requirements/torch_gpu.txt +++ b/requirements/torch_gpu.txt @@ -1,4 +1,4 @@ # Contains packages recommended for functional performance --find-links https://download.pytorch.org/whl/torch_stable.html -torch==2.0.1+cu117 ---find-links https://data.pyg.org/whl/torch-2.0.0+cu117.html +torch==2.1.1+cu117 +--find-links https://data.pyg.org/whl/torch-2.1.0+cu117.html diff --git a/requirements/torch_macos.txt b/requirements/torch_macos.txt index be7a35257..3e9d75df4 100644 --- a/requirements/torch_macos.txt +++ b/requirements/torch_macos.txt @@ -1,2 +1,2 @@ --find-links https://download.pytorch.org/whl/torch_stable.html ---find-links https://data.pyg.org/whl/torch-2.0.0+cpu.html \ No newline at end of file +--find-links https://data.pyg.org/whl/torch-2.1.0+cpu.html \ No newline at end of file diff --git a/setup.py b/setup.py index ef1b48e52..3b70233ab 100644 --- a/setup.py +++ b/setup.py @@ -47,11 +47,11 @@ "versioneer", ], "torch": [ - "torch>=2.0", + "torch>=2.1", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", - "torch-geometric>=2.1", + "torch-geometric>=2.3", "pytorch-lightning>=2.0", ], }