Skip to content

fix: revert np.where to xarray.where when adding vars/ constraints #575

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

Merged
FabianHofmann merged 3 commits into from
Feb 10, 2026
Merged

fix: revert np.where to xarray.where when adding vars/ constraints #575

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a758cfb
fix: revert np.where to xarray.where
lkstrp Feb 9, 2026
c3ed97d
Merge branch 'master' into fix
lkstrp Feb 9, 2026
eccdfb0
trigger
lkstrp Feb 10, 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
9 changes: 2 additions & 7 deletions linopy/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,7 @@ def add_variables(
self._xCounter += data.labels.size

if mask is not None:
# Use numpy where for speed (38x faster than xarray where)
data.labels.values = np.where(mask.values, data.labels.values, -1)
data.labels.values = data.labels.where(mask, -1).values

data = data.assign_attrs(
label_range=(start, end), name=name, binary=binary, integer=integer
Expand Down Expand Up @@ -750,9 +749,6 @@ def add_constraints(
assert set(mask.dims).issubset(data.dims), (
"Dimensions of mask not a subset of resulting labels dimensions."
)
# Broadcast mask to match data shape for correct numpy where behavior
if mask.shape != data.labels.shape:
mask, _ = xr.broadcast(mask, data.labels)

# Auto-mask based on null expressions or NaN RHS (use numpy for speed)
if self.auto_mask:
Expand Down Expand Up @@ -785,8 +781,7 @@ def add_constraints(
self._cCounter += data.labels.size

if mask is not None:
# Use numpy where for speed (38x faster than xarray where)
data.labels.values = np.where(mask.values, data.labels.values, -1)
data.labels.values = data.labels.where(mask, -1).values

data = data.assign_attrs(label_range=(start, end), name=name)

Expand Down