From 85fa80be3076cf7a04a608ef4dbb96ae02a64048 Mon Sep 17 00:00:00 2001 From: Kelly Chang Date: Thu, 16 Jul 2026 18:48:26 -0700 Subject: [PATCH 1/4] edit for metal install --- AFQ/tasks/data.py | 6 +++--- setup.cfg | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/AFQ/tasks/data.py b/AFQ/tasks/data.py index de21a667..5b126348 100644 --- a/AFQ/tasks/data.py +++ b/AFQ/tasks/data.py @@ -547,7 +547,7 @@ def csd_aodf(structural_imap, csd_params, tracking_params, citations): logger.info("Applying unified filtering to generate asymmetric CSD ODFs...") aodf = unified_filtering( sh_coeff, - get_sphere(tracking_params["sphere"]), + get_sphere(name=tracking_params["sphere"]), n_threads=structural_imap["n_threads"], low_mem=structural_imap["low_mem"], ) @@ -669,7 +669,7 @@ def gq(gtab, data, tracking_params, citations, gq_sampling_length=1.2): citations.add("yeh2010generalized") gqmodel = GeneralizedQSamplingModel(gtab, sampling_length=gq_sampling_length) - sphere = get_sphere(tracking_params["sphere"]) + sphere = get_sphere(name=tracking_params["sphere"]) odf = gwi_odf(gqmodel, data, sphere) @@ -764,7 +764,7 @@ def rumba_params( ) rumba_fit = rumba_model.fit(data, mask=nib.load(brain_mask).get_fdata()) - odf = rumba_fit.odf(sphere=get_sphere(tracking_params["sphere"])) + odf = rumba_fit.odf(sphere=get_sphere(name=tracking_params["sphere"])) model_meta = dict( Description=( diff --git a/setup.cfg b/setup.cfg index 220446d4..b56c2ec5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,6 +97,9 @@ nn = gpu = cuslines[cu13]==2.2.3 onnxruntime-gpu +metal = + pyobjc-framework-Metal + pyobjc-framework-MetalPerformanceShaders all = %(dev)s %(fury)s @@ -104,4 +107,5 @@ all = %(afqbrowser)s %(plot)s %(aws)s + %(metal)s %(nn)s From fffbba5fd61b3b88e6a3a7a6dd37de771c710e18 Mon Sep 17 00:00:00 2001 From: Kelly Chang Date: Thu, 16 Jul 2026 19:40:17 -0700 Subject: [PATCH 2/4] update minimum package requirements --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index b56c2ec5..39557147 100644 --- a/setup.cfg +++ b/setup.cfg @@ -97,9 +97,9 @@ nn = gpu = cuslines[cu13]==2.2.3 onnxruntime-gpu -metal = - pyobjc-framework-Metal - pyobjc-framework-MetalPerformanceShaders +metal = + pyobjc-framework-Metal>=12.2.1 + pyobjc-framework-MetalPerformanceShaders>=12.2.1 all = %(dev)s %(fury)s From eec283106bc33a77e7d2aab461201117e02f50f8 Mon Sep 17 00:00:00 2001 From: Kelly Chang Date: Thu, 16 Jul 2026 22:46:06 -0700 Subject: [PATCH 3/4] simplify the install --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 39557147..9a5268c7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -98,8 +98,7 @@ gpu = cuslines[cu13]==2.2.3 onnxruntime-gpu metal = - pyobjc-framework-Metal>=12.2.1 - pyobjc-framework-MetalPerformanceShaders>=12.2.1 + cuslines[metal]==2.2.3 all = %(dev)s %(fury)s From 7f753eb041ead7708102667469e57ac67de62c0a Mon Sep 17 00:00:00 2001 From: Kelly Chang Date: Fri, 17 Jul 2026 10:28:00 -0700 Subject: [PATCH 4/4] remove metal from all --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9a5268c7..e8f38f6b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -106,5 +106,4 @@ all = %(afqbrowser)s %(plot)s %(aws)s - %(metal)s %(nn)s