From e6a084142ecdc689599ab50b482d769bca9fe678 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Fri, 27 Mar 2026 13:56:24 -0400 Subject: [PATCH 1/4] Bump finufft to 2.5.0 --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 536fb1ab01..f39f1f24d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,8 +31,7 @@ dependencies = [ "click", "confuse == 2.1.0", "cvxpy", - "finufft==2.4.0 ; sys_platform!='darwin'", - "finufft==2.3.0 ; sys_platform=='darwin'", + "finufft==2.5.0", "gemmi >= 0.6.5", "joblib", "matplotlib >= 3.2.0", From a0b7ad09d49e261128fb109c4b7d1d22fda84ece Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Mon, 30 Mar 2026 07:49:51 -0400 Subject: [PATCH 2/4] 2.5.0 still having trouble on darwin platform --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f39f1f24d4..465c2c38f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,8 @@ dependencies = [ "click", "confuse == 2.1.0", "cvxpy", - "finufft==2.5.0", + "finufft==2.5.0 ; sys_platform!='darwin'", + "finufft==2.3.0 ; sys_platform=='darwin'", "gemmi >= 0.6.5", "joblib", "matplotlib >= 3.2.0", From 3223d4c1121858a5fa4fb9e1a6d808c2a1a62b06 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Mon, 30 Mar 2026 15:05:57 -0400 Subject: [PATCH 3/4] try to get osx arm on latest finufft --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 465c2c38f6..c68edf4427 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,8 +31,8 @@ dependencies = [ "click", "confuse == 2.1.0", "cvxpy", - "finufft==2.5.0 ; sys_platform!='darwin'", - "finufft==2.3.0 ; sys_platform=='darwin'", + "finufft==2.5.0 ; sys_platform!='darwin' or (sys_platform=='darwin' and platform_machine!='x86_64')", + "finufft==2.3.0 ; sys_platform=='darwin' and platform_machine=='x86_64'", "gemmi >= 0.6.5", "joblib", "matplotlib >= 3.2.0", From f94df8cc16f9c4d0117ade9d369c88d708e73398 Mon Sep 17 00:00:00 2001 From: Garrett Wright Date: Mon, 13 Apr 2026 09:57:30 -0400 Subject: [PATCH 4/4] rollback cufinufft 2.5.0 for now --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c68edf4427..df390d72ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ dependencies = [ [project.optional-dependencies] gpu-12x = ["cupy-cuda12x<14", "cufinufft==2.4.0"] -gpu-13x = ["cupy-cuda13x", "cufinufft==2.5.0"] +gpu-13x = ["cupy-cuda13x", "cufinufft==2.4.1"] dev = [ "black", "bumpversion",