From 70d67177100409e376fd0003243e0c7958311ab8 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Wed, 19 Jun 2024 03:26:00 -0500 Subject: [PATCH 1/9] [CI] Use Python 3.12 as default for tests * Add Python 3.12 to the Linux test matrix. * Use Python 3.12 as the default Python for all other CI tests. --- .github/workflows/build_tests.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index cd45633de..a265c79ec 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -4,10 +4,10 @@ on: workflow_dispatch: pull_request: branches: - - 'master' + - 'master' push: branches: - - 'master' + - 'master' create: branches: - 'master' @@ -22,7 +22,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 @@ -49,14 +49,14 @@ jobs: if: "!contains(github.event.head_commit.message, 'no pep8')" steps: - uses: actions/checkout@v4 - - name: Set up Python + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.x" - name: Install dependencies run: | python -m pip install --upgrade pip setuptools - pip install flake8 + pip install flake8 - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names @@ -70,10 +70,10 @@ jobs: if: "!contains(github.event.head_commit.message, 'no ci')" steps: - uses: actions/checkout@v4 - - name: Set up Python + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - name: Install dependencies run: | python -m pip install --upgrade pip setuptools @@ -94,7 +94,7 @@ jobs: max-parallel: 4 matrix: os: [macos-latest, macos-13] - python-version: ["3.11"] + python-version: ["3.12"] steps: - uses: actions/checkout@v4 @@ -109,7 +109,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools pip install -r requirements_all.txt - pip install pytest + pip install pytest - name: Run tests run: | python -m pytest --durations=20 -v test/ ot/ --color=yes @@ -121,7 +121,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.11"] + python-version: ["3.12"] steps: - uses: actions/checkout@v4 From 6ecfbec52d243daee255cab4cdedc7b535d9c3d6 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Mon, 24 Jun 2024 11:43:08 -0500 Subject: [PATCH 2/9] [CI] Remove jax upper bounds for testing --- requirements_all.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index bffaf892f..acaae0d1a 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -6,8 +6,8 @@ pymanopt cvxopt scikit-learn torch -jax<=0.4.24 -jaxlib<=0.4.24 +jax +jaxlib tensorflow pytest torch_geometric From 63b92c29a65a32457f04f492ce9e427f21417840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 11:33:17 +0200 Subject: [PATCH 3/9] reset caps on jax --- requirements_all.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index acaae0d1a..bffaf892f 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -6,8 +6,8 @@ pymanopt cvxopt scikit-learn torch -jax -jaxlib +jax<=0.4.24 +jaxlib<=0.4.24 tensorflow pytest torch_geometric From 039fe06696f5cad47faeea8e9d6c3e327088ddfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 12:01:28 +0200 Subject: [PATCH 4/9] Update requirements_all.txt --- requirements_all.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index bffaf892f..da3f58949 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,12 +2,12 @@ numpy>=1.20 scipy>=1.6 matplotlib autograd -pymanopt +https://github.com/pymanopt/pymanopt/archive/master.zip cvxopt scikit-learn torch -jax<=0.4.24 -jaxlib<=0.4.24 +jax +jaxlib tensorflow pytest torch_geometric From ee47d981a8878f94db3f9901bbf91f82616283e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 12:05:04 +0200 Subject: [PATCH 5/9] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dea4da670..581d8eb06 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ 'backend-tf': ['tensorflow'], 'backend-torch': ['torch'], 'cvxopt': ['cvxopt'], # on it's own to prevent accidental GPL violations - 'dr': ['scikit-learn', 'pymanopt', 'autograd'], + 'dr': ['scikit-learn', 'https://github.com/pymanopt/pymanopt/archive/master.zip', 'autograd'], 'gnn': ['torch', 'torch_geometric'], 'all': optional_requirements }, From 7ebe5e60a7b8a38e472279c81eab725ba85eccc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 12:06:52 +0200 Subject: [PATCH 6/9] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 581d8eb06..dea4da670 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ 'backend-tf': ['tensorflow'], 'backend-torch': ['torch'], 'cvxopt': ['cvxopt'], # on it's own to prevent accidental GPL violations - 'dr': ['scikit-learn', 'https://github.com/pymanopt/pymanopt/archive/master.zip', 'autograd'], + 'dr': ['scikit-learn', 'pymanopt', 'autograd'], 'gnn': ['torch', 'torch_geometric'], 'all': optional_requirements }, From 7de747a25f769c8f1af0ab0360b6216441629dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 12:19:10 +0200 Subject: [PATCH 7/9] Update requirements_all.txt --- requirements_all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_all.txt b/requirements_all.txt index da3f58949..839517782 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,7 +2,7 @@ numpy>=1.20 scipy>=1.6 matplotlib autograd -https://github.com/pymanopt/pymanopt/archive/master.zip +pymanopt @ git+https://github.com/pymanopt.git@master cvxopt scikit-learn torch From 1b109be3cf9fc777917d38be0ace98261b46c57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 12:21:31 +0200 Subject: [PATCH 8/9] Update requirements_all.txt --- requirements_all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_all.txt b/requirements_all.txt index 839517782..a015855f6 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,7 +2,7 @@ numpy>=1.20 scipy>=1.6 matplotlib autograd -pymanopt @ git+https://github.com/pymanopt.git@master +pymanopt @ git+https://github.com/pymanopt/pymanopt.git@master cvxopt scikit-learn torch From ac9f01756d0862f17590ddb71d47488070f20bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Tue, 25 Jun 2024 13:20:42 +0200 Subject: [PATCH 9/9] Update requirements_all.txt --- requirements_all.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_all.txt b/requirements_all.txt index a015855f6..66a7c2dfc 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -6,8 +6,8 @@ pymanopt @ git+https://github.com/pymanopt/pymanopt.git@master cvxopt scikit-learn torch -jax -jaxlib +jax<=0.4.24 +jaxlib<=0.4.24 tensorflow pytest torch_geometric