From 5f3847288965380aa3de66d7f26bafe513f746d0 Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Mon, 23 Jun 2025 12:18:27 -0700 Subject: [PATCH 1/8] Update pyproject.toml dep pins --- pyproject.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4e3855c..1451928 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,11 +6,11 @@ build-backend = "hatchling.build" name = "fvgp" dependencies = [ "wheel", - "scipy ~= 1.13.0", - "numpy ~= 2.1.1", - "dask ~= 2024.1.0", - "distributed ~= 2024.1.0", - "hgdl ~= 2.2.2", + "scipy ~= 1.16.0", + "numpy ~= 2.3.1", + "dask ~= 2025.5.1", + "distributed ~= 2025.5.1", + "hgdl ~= 2.2.3", "loguru", ] # imate From aadd99d07f666c0c3314707a71b24749d28a1c51 Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Mon, 23 Jun 2025 12:23:53 -0700 Subject: [PATCH 2/8] advance CI python versions --- .github/workflows/fvGP-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fvGP-CI.yml b/.github/workflows/fvGP-CI.yml index d0de1ca..d58e8cd 100644 --- a/.github/workflows/fvGP-CI.yml +++ b/.github/workflows/fvGP-CI.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.10', '3.11', '3.12' ] + python-version: [ '3.11', '3.12', '3.13' ] steps: - uses: actions/checkout@v2 From cdada48ec60108421a4ad40e859e6b7cb825b8f4 Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Tue, 1 Jul 2025 11:46:52 -0700 Subject: [PATCH 3/8] advance hgdl dep --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1451928..4c6ff08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ "numpy ~= 2.3.1", "dask ~= 2025.5.1", "distributed ~= 2025.5.1", - "hgdl ~= 2.2.3", + "hgdl ~= 2.3.1", "loguru", ] # imate From 1891e8269c48eae71e228cf558fe1dd6fa5c17dd Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Tue, 1 Jul 2025 12:03:53 -0700 Subject: [PATCH 4/8] remove unused import imate --- tests/test_fvgp.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_fvgp.py b/tests/test_fvgp.py index b037373..a6dedb0 100755 --- a/tests/test_fvgp.py +++ b/tests/test_fvgp.py @@ -316,7 +316,6 @@ def mkernel(x1,x2,hps): def test_gp2Scale(client): - from imate import logdet as imate_logdet input_dim = 1 N = 2000 x_data = np.random.rand(N,input_dim) From a723c3ce456173ac5bb55c4f1325515b4292b406 Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Tue, 1 Jul 2025 12:04:17 -0700 Subject: [PATCH 5/8] remove imate dep --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4c6ff08..500ca9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ dynamic = ["version"] [project.optional-dependencies] docs = ['sphinx', 'sphinx-rtd-theme', 'myst-parser', 'myst-nb', 'sphinx-panels', 'autodocs', 'jupytext'] -tests = ['pytest', 'codecov', 'pytest-cov', 'imate', 'torch'] +tests = ['pytest', 'codecov', 'pytest-cov', 'torch'] plotting = ['matplotlib', 'plotly', 'notebook'] [project.urls] From a8b8c3aeb00243f79dbeeb1f2893d68e834b19a8 Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Tue, 1 Jul 2025 13:01:28 -0700 Subject: [PATCH 6/8] revert remove imate dep (needed for gp2scale tests) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 500ca9b..fb7f277 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ dynamic = ["version"] [project.optional-dependencies] docs = ['sphinx', 'sphinx-rtd-theme', 'myst-parser', 'myst-nb', 'sphinx-panels', 'autodocs', 'jupytext'] -tests = ['pytest', 'codecov', 'pytest-cov', 'torch'] +tests = ['pytest', 'codecov', 'pytest-cov', 'torch', 'imate'] plotting = ['matplotlib', 'plotly', 'notebook'] [project.urls] From 8f23be885ba056b3d48704ba883e6c6b7d130ccc Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Wed, 2 Jul 2025 16:26:13 -0700 Subject: [PATCH 7/8] suppress testing with 3.13 --- .github/workflows/fvGP-CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fvGP-CI.yml b/.github/workflows/fvGP-CI.yml index d58e8cd..ebb7970 100644 --- a/.github/workflows/fvGP-CI.yml +++ b/.github/workflows/fvGP-CI.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.11', '3.12', '3.13' ] + python-version: [ '3.11', '3.12'] # 3.13 suppressed until imate releases wheels for 3.13 steps: - uses: actions/checkout@v2 From d914554fb08a0984e81d915192d24bed82993b4e Mon Sep 17 00:00:00 2001 From: Ronald Pandolfi Date: Thu, 3 Jul 2025 13:29:10 -0700 Subject: [PATCH 8/8] fix distributed import --- fvgp/gp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fvgp/gp.py b/fvgp/gp.py index 2eb9fdf..ece800e 100755 --- a/fvgp/gp.py +++ b/fvgp/gp.py @@ -3,7 +3,7 @@ import warnings import numpy as np from loguru import logger -from dask.distributed import Client +from distributed import Client from scipy.stats import norm from .gp_prior import GPprior from .gp_data import GPdata