Skip to content

Add conditional import for trapz based on NumPy version #217

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
srmnitc merged 2 commits into from
Feb 18, 2026
Merged

Add conditional import for trapz based on NumPy version #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62c28e6
Add conditional import for trapz based on NumPy version
pmrv Feb 17, 2026
b596c05
Actually change trapz callsites
pmrv Feb 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
11 changes: 9 additions & 2 deletions calphy/integrators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@
from scipy.integrate import cumtrapz
except ImportError:
from scipy.integrate import cumulative_trapezoid as cumtrapz

npversion = int(np.__version__.split('.')[0])
if npversion <= 1:
from numpy import trapz
else:
from numpy import trapezoid as trapz

from tqdm import tqdm
import pyscal3.core as pc
from ase.io import read
Expand Down Expand Up @@ -122,8 +129,8 @@ def integrate_path(
fdu = fdui - fdur
bdu = bdui - bdur

fw = np.trapz(fdu, flambda)
bw = np.trapz(bdu, blambda)
fw = trapz(fdu, flambda)
bw = trapz(bdu, blambda)

w = 0.5 * (fw - bw)
q = 0.5 * (fw + bw)
Expand Down
Loading