Skip to content

Metal fixes #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kellychang4 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Metal fixes #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85fa80b
edit for metal install
kellychang4 Jul 17, 2026
fffbba5
update minimum package requirements
kellychang4 Jul 17, 2026
eec2831
simplify the install
kellychang4 Jul 17, 2026
7f753eb
remove metal from all
kellychang4 Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AFQ/tasks/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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=(
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ nn =
gpu =
cuslines[cu13]==2.2.3
onnxruntime-gpu
metal =
cuslines[metal]==2.2.3

@arokem arokem Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, the gpu and metal are mutually exclusive? Given that, should it really be in all as well?

@36000 36000 Jul 18, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, for cuslines, they are not mutually exclusive. Neither is currently in all, but I don't think they need to be?

@arokem arokem Jul 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you can install cuslines[cu13, metal]? OTOH, as the name implies, maybe they both need to be in all? 😄

@36000 36000 Jul 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you can! GPUstreamlines would still work; it is designed to have multiple backends possible, for example, numba, cuda, and webgpu can all be installed at the same time, and then the user selects which one to use. Practically, I am not sure when you would for this specific combo (a mac with an nvidia gpu?). But I am wondering, maybe all should just include everything that isn't hardware-specific? I am going back and forth on this. I generally think of all as referring to all features, not all hardware, and if we add gpu and metal to it, it will, in most cases, just increase the size of the install unnecessarily. On the other hand, increased install size is not that big of a problem.

all =
%(dev)s
%(fury)s
Expand Down
Loading