From be83cabeb130b7e11067cd257c82f006ab367982 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 13:58:14 +0200 Subject: [PATCH 01/31] test removal of stuff in workflow --- .github/workflows/build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75be67797..325de3efc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,19 @@ jobs: matrix: python-version: [3.8, 3.9, '3.10', '3.11'] steps: + - name: Maximize build space + uses: easimon/maximize-build-space@master + with: + root-reserve-mb: 512 + swap-size-mb: 1024 + remove-dotnet: 'true' + - name: Checkout + uses: actions/checkout@v3 + + - name: Build + run: | + echo "Free space:" + df -h - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 From 9ef974e6c55797db29ecb49461a99f42335a344c Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 13:58:58 +0200 Subject: [PATCH 02/31] add print statements of df --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 325de3efc..2be9d5eec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,6 +80,10 @@ jobs: matrix: python-version: [3.8, 3.9, '3.10', '3.11'] steps: + - name: Before Clean-up + run: | + echo "Free space:" + df -h - name: Maximize build space uses: easimon/maximize-build-space@master with: @@ -89,7 +93,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Build + - name: After Clean-up run: | echo "Free space:" df -h From e5afbcd6883cb11c1bc9e5c118837c8dbf3f72fc Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:05:04 +0200 Subject: [PATCH 03/31] 2nd test --- .github/workflows/build.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2be9d5eec..e6037e985 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,14 +84,19 @@ jobs: run: | echo "Free space:" df -h - - name: Maximize build space - uses: easimon/maximize-build-space@master + + - name: Free Disk Space + uses: jlumbroso/free-disk-space@main with: - root-reserve-mb: 512 - swap-size-mb: 1024 - remove-dotnet: 'true' - - name: Checkout - uses: actions/checkout@v3 + 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: | From 02c1602507d243cb09e3786d5772d640f9a9aa53 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:12:15 +0200 Subject: [PATCH 04/31] try for icetray... --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6037e985..ed4792fb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,28 @@ jobs: runs-on: ubuntu-latest container: icecube/icetray:icetray-prod-v1.8.1-ubuntu20.04-X64 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: Set environment variables run: | echo "PATH=/usr/local/icetray/bin:$PATH" >> $GITHUB_ENV From fc82fb44881bf20a1fd47b3b3479c09681024651 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:24:53 +0200 Subject: [PATCH 05/31] try to install git in icetray cvmfs --- .github/workflows/build.yml | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed4792fb4..1f7614798 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,30 +36,12 @@ 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: 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: install git + run: sudo apt-get install git-all - name: Set environment variables run: | echo "PATH=/usr/local/icetray/bin:$PATH" >> $GITHUB_ENV @@ -83,9 +65,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' From 0821a5e1a1b359a3f4de2e40d74715132b7f6f16 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:32:36 +0200 Subject: [PATCH 06/31] install sudo.. --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f7614798..bcc845095 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,9 @@ jobs: options: --user root steps: - name: install git - run: sudo apt-get install git-all + run: | + apt-get install sudo + sudo apt-get install git-all - name: Set environment variables run: | echo "PATH=/usr/local/icetray/bin:$PATH" >> $GITHUB_ENV From ace0ebd988c2f9be01be07042da730646f364a32 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:35:28 +0200 Subject: [PATCH 07/31] force "yes" --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bcc845095..0dac4d4ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: steps: - name: install git run: | - apt-get install sudo + apt-get -y install sudo sudo apt-get install git-all - name: Set environment variables run: | From 9651070f48a0467d2a3228e38de16e5b6a5f652e Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:38:26 +0200 Subject: [PATCH 08/31] really force yes --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dac4d4ea..6f46e81f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: steps: - name: install git run: | - apt-get -y install sudo + apt-get --yes --force-yes install sudo sudo apt-get install git-all - name: Set environment variables run: | From 2d8382821298c79d46826c0e45a1a7993b7681df Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:51:56 +0200 Subject: [PATCH 09/31] linux sucks --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f46e81f3..611a31bfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: steps: - name: install git run: | - apt-get --yes --force-yes install sudo + apt-get --allow-change-held-packages install sudo sudo apt-get install git-all - name: Set environment variables run: | From e6f2c99807b2ee8aa1a9ec3a473b581d5df322cf Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:55:39 +0200 Subject: [PATCH 10/31] liiiinux --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 611a31bfc..eb750164e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: steps: - name: install git run: | - apt-get --allow-change-held-packages install sudo + apt-get -y --allow-change-held-packages install sudo sudo apt-get install git-all - name: Set environment variables run: | From e0fd0dd31d1916c22ae8abe053cb341c2f4a8f6a Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 14:59:32 +0200 Subject: [PATCH 11/31] lets go --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb750164e..e8f655e2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,8 +42,8 @@ jobs: steps: - name: install git run: | - apt-get -y --allow-change-held-packages install sudo - sudo apt-get install git-all + apt-get --yes install sudo + sudo apt-get install --yes git-all - name: Set environment variables run: | echo "PATH=/usr/local/icetray/bin:$PATH" >> $GITHUB_ENV From 5326fab802229469c065f6a467785f573fa6da7c Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 15:07:45 +0200 Subject: [PATCH 12/31] update docker workflow to remove space --- .github/workflows/build.yml | 22 ---------------------- .github/workflows/docker.yml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8f655e2a..1a23eea64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,28 +86,6 @@ jobs: matrix: python-version: [3.8, 3.9, '3.10', '3.11'] 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 - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 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 From 05d7e9b8c91967cf07be8032ea5106a1004fcac8 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 16:09:43 +0200 Subject: [PATCH 13/31] remove macos as supported OS --- .github/workflows/build.yml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a23eea64..3b959584a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,22 +108,22 @@ jobs: - name: Print available disk space after unit tests run: df -h - build-macos: - name: Unit tests - macOS - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Install package - uses: ./.github/actions/install - with: - editable: true - hardware: "macos" - - 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 +# build-macos: +# name: Unit tests - macOS +# runs-on: macos-latest +# steps: +# - uses: actions/checkout@v3 +# - name: Set up Python 3.8 +# uses: actions/setup-python@v4 +# with: +# python-version: 3.8 +# - name: Install package +# uses: ./.github/actions/install +# with: +# editable: true +# hardware: "macos" +# - 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 From 9250da9c37d9442368c884afcf0f4d9c5e378a37 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 16:10:30 +0200 Subject: [PATCH 14/31] remove macos from readme.md --- README.md | 1 - 1 file changed, 1 deletion(-) 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. From d5164f6a3a65db8c7076865412f3cfedac7e15a0 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 21:03:03 +0200 Subject: [PATCH 15/31] remove macos lines --- .github/workflows/build.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b959584a..ad5a9b6a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,23 +107,3 @@ jobs: coverage report -m - name: Print available disk space after unit tests run: df -h - -# build-macos: -# name: Unit tests - macOS -# runs-on: macos-latest -# steps: -# - uses: actions/checkout@v3 -# - name: Set up Python 3.8 -# uses: actions/setup-python@v4 -# with: -# python-version: 3.8 -# - name: Install package -# uses: ./.github/actions/install -# with: -# editable: true -# hardware: "macos" -# - 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 From 4af1bd41c4d5a14daaa79b0df9de9b2abfcda9e7 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Wed, 4 Oct 2023 21:19:10 +0200 Subject: [PATCH 16/31] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad5a9b6a9..49ac2fbbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,4 +106,4 @@ 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 \ No newline at end of file From f3aa58998edb062901b56fffbb5d14ac017e7c8d Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Thu, 5 Oct 2023 12:33:25 +0200 Subject: [PATCH 17/31] torch version test --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ef1b48e52..84a731bf8 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch>=2.0", + "torch=2.0", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From 94732844beee91aeeb6c6fe076d0391436e4b595 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Thu, 5 Oct 2023 13:29:32 +0200 Subject: [PATCH 18/31] == --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 84a731bf8..133dac79e 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch=2.0", + "torch==2.0", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From c7a878be01f3ac8bcbc4f57e48f1c16a60eecc9c Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Thu, 5 Oct 2023 15:26:36 +0200 Subject: [PATCH 19/31] fix linux --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49ac2fbbb..5d0578d5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,8 @@ jobs: - name: install git run: | apt-get --yes install sudo + sudo apt update --fix-missing + sudo apt upgrade sudo apt-get install --yes git-all - name: Set environment variables run: | From 40fab7b0cdcf449bc51387f139c7dd7199d31455 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Thu, 5 Oct 2023 15:38:11 +0200 Subject: [PATCH 20/31] --yes --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d0578d5e..ef509972d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,8 +43,8 @@ jobs: - name: install git run: | apt-get --yes install sudo - sudo apt update --fix-missing - sudo apt upgrade + sudo apt update --fix-missing --yes + sudo apt upgrade --yes sudo apt-get install --yes git-all - name: Set environment variables run: | From d5d099b1932f6eb090977ceb70991925ed08719c Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Thu, 5 Oct 2023 16:00:48 +0200 Subject: [PATCH 21/31] test macos --- .github/workflows/build.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef509972d..2f7086b8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,4 +108,24 @@ jobs: coverage run --source=graphnet -m pytest tests/utilities coverage report -m - name: Print available disk space after unit tests - run: df -h \ No newline at end of file + run: df -h + + build-macos: + name: Unit tests - macOS + runs-on: macos-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Python 3.8 + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Install package + uses: ./.github/actions/install + with: + editable: true + hardware: "macos" + - 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 \ No newline at end of file From 5cec45e04ff122bcec2068d6d463edf602bfc042 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sat, 7 Oct 2023 14:34:42 +0200 Subject: [PATCH 22/31] bump to torch 2.1 --- requirements/torch_cpu.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/setup.py b/setup.py index 133dac79e..ef1b48e52 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch==2.0", + "torch>=2.0", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From dc5997b00e861cbb04f24def42e4b8007693371a Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sat, 7 Oct 2023 14:49:04 +0200 Subject: [PATCH 23/31] bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ef1b48e52..671bc626b 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch>=2.0", + "torch>=2.1", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From 8939a9860f2c99f622876c9d448c29a98e9031b1 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 09:01:01 +0200 Subject: [PATCH 24/31] print versions --- .github/workflows/build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f7086b8d..116c7a85b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,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 @@ -124,6 +131,13 @@ 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 From 14f9312aea4cce9ad9b6d77d2173dc534c06353a Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 09:29:46 +0200 Subject: [PATCH 25/31] bump pyg to 2.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 671bc626b..1253108c1 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", - "torch-geometric>=2.1", + "torch-geometric>=2.4", "pytorch-lightning>=2.0", ], } From e5b67ed578774290a9fa1a55860e7ebf8ed1fa17 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 09:38:02 +0200 Subject: [PATCH 26/31] bump to pyg 2.3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1253108c1..3b70233ab 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", - "torch-geometric>=2.4", + "torch-geometric>=2.3", "pytorch-lightning>=2.0", ], } From d138a3a36860ffb0bb709ebe815c7c73a0eba611 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 10:06:28 +0200 Subject: [PATCH 27/31] fix torch to 2.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3b70233ab..938daf694 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch>=2.1", + "torch==2.1", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From 979a9e160b5464f1ff63cffee17362d55be35372 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 10:15:12 +0200 Subject: [PATCH 28/31] fix to 2.0 --- requirements/torch_cpu.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/torch_cpu.txt b/requirements/torch_cpu.txt index 59e273288..6f68e3600 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.1.0+cpu.html \ No newline at end of file +--find-links https://data.pyg.org/whl/torch-2.0.0+cpu.html \ No newline at end of file diff --git a/setup.py b/setup.py index 938daf694..d4d5f3f45 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch==2.1", + "torch==2.0", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From 4c47d0f85e708415dfcb866b0d708ef8be4de6d3 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 10:17:05 +0200 Subject: [PATCH 29/31] macos --- requirements/torch_cpu.txt | 2 +- requirements/torch_macos.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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_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 d4d5f3f45..3b70233ab 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ "versioneer", ], "torch": [ - "torch==2.0", + "torch>=2.1", "torch-cluster>=1.6", "torch-scatter>=2.0", "torch-sparse>=0.6", From fc93799d5e3602bb8a1fe04d320a7f2891b66b57 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 10:36:29 +0200 Subject: [PATCH 30/31] bump gpu to 2.1 --- requirements/torch_gpu.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/torch_gpu.txt b/requirements/torch_gpu.txt index 553d306e5..3ccedd562 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 +--find-links https://data.pyg.org/whl/torch-2.1.0+cu117.html From 057f1bec67b89b926b8542adca50fd26f3ceb268 Mon Sep 17 00:00:00 2001 From: Rasmus Oersoe Date: Sun, 8 Oct 2023 10:39:32 +0200 Subject: [PATCH 31/31] bump gpu to torch 2.1 --- requirements/torch_gpu.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/torch_gpu.txt b/requirements/torch_gpu.txt index 3ccedd562..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 +torch==2.1.1+cu117 --find-links https://data.pyg.org/whl/torch-2.1.0+cu117.html