Skip to content
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

Jump to bottom

replace .A and .A1 with explicit array conversion #559

Merged
merged 2 commits into from
Aug 26, 2024
Merged

replace .A and .A1 with explicit array conversion #559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
765ac02
replace .A and .A1 with explicit array conversion
m-reuter Aug 22, 2024
3ee038b
remove deprecated in1d and fix array conversion for matrix
m-reuter Aug 23, 2024
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
10 changes: 5 additions & 5 deletions recon_surf/smooth_aparc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ def mode_filter(
# get rid of rows that have uniform vote (or are empty)
# for this to work no negative numbers should exist
# get row counts, max and sums
rmax = nlabels.max(1).A.squeeze()
sums = nlabels.sum(axis=1).A1
rmax = nlabels.max(1).toarray().squeeze()
sums = np.asarray(nlabels.sum(axis=1)).ravel()
counts = np.diff(nlabels.indptr)
# then keep rows where max*counts differs from sums
rmax = np.multiply(rmax, counts)
Expand All @@ -224,7 +224,7 @@ def mode_filter(
# since we have only rows that were non-uniform, they should not become empty
# rows may become unform: we still need to vote below to update this label
if novote:
rr = np.in1d(nlabels.data, novote)
rr = np.isin(nlabels.data, novote)
nlabels.data[rr] = 0
nlabels.eliminate_zeros()
# run over all rows and compute mode (maybe vectorize later)
Expand Down Expand Up @@ -303,7 +303,7 @@ def smooth_aparc(surf, labels, cortex = None):
noncortids = np.where(~mask)

# remove triangles where one vertex is non-cortex to avoid these edges to vote on neighbors later
rr = np.in1d(faces, noncortids)
rr = np.isin(faces, noncortids)
rr = np.reshape(rr, faces.shape)
rr = np.amax(rr, 1)
faces = faces[~rr, :]
Expand Down Expand Up @@ -342,7 +342,7 @@ def smooth_aparc(surf, labels, cortex = None):
)
fillids = np.where(labels == fillonlylabel)[0]
labels[fillids] = 0
rr = np.in1d(faces, fillids)
rr = np.isin(faces, fillids)
rr = np.reshape(rr, faces.shape)
rr = np.amax(rr, 1)
faces = faces[~rr, :]
Expand Down