Skip to content

Update To NumPy 2.0 And SciPy 1.12 #23

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
marcpaterno wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update To NumPy 2.0 And SciPy 1.12 #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c495832
Update To NumPy 2.0 And SciPy 1.12
marcpaterno Jan 7, 2026
8b9f865
Update minimum dependency versions
marcpaterno Feb 24, 2026
5487f11
Expand CI testing matrix
marcpaterno Feb 24, 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
2 changes: 1 addition & 1 deletion fastpt/core/FASTPT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ def _get_sig4(self, P, P_window=None, C_window=None):
# Returns relevant correlations (including contraction factors),
# but WITHOUT bias values and other pre-factors.
# Uses standard "full initialization" of J terms
sig4 = np.trapz(self.k_extrap ** 3 * Ps ** 2, x=np.log(self.k_extrap)) / (2. * pi ** 2)
sig4 = np.trapezoid(self.k_extrap ** 3 * Ps ** 2, x=np.log(self.k_extrap)) / (2. * pi ** 2)
self.cache.set(sig4, "sig4", hash_key, P_hash)
return sig4

Expand Down
4 changes: 2 additions & 2 deletions fastpt/core/FASTPT_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ def P_bias(self,P,P_window=None,C_window=None):
# Uses standard "full initialization" of J terms

Power, mat=self.J_k(P,P_window=P_window,C_window=C_window)
sig4=np.trapz(self.k_old**2*Power**2,x=self.k_old)/(2.*pi**2)
#sig2=np.trapz(self.k_old**2*Power,x=self.k_old)/(2.*pi**2)
sig4=np.trapezoid(self.k_old**2*Power**2,x=self.k_old)/(2.*pi**2)
#sig2=np.trapezoid(self.k_old**2*Power,x=self.k_old)/(2.*pi**2)

Pd1d2=2.*(17./21*mat[0,:]+mat[4,:]+4./21*mat[1,:])
Pd2d2=2.*(mat[0,:])
Expand Down
1 change: 0 additions & 1 deletion fastpt/utils/matter_power_spt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

import numpy as np
from numpy import log, exp, pi
#from scipy.integrate import trapz
from scipy.signal import fftconvolve
from .J_k import J_k
import sys
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
numpy>=1.17
scipy>=1.2
numpy>=2.0
scipy>=1.12
matplotlib>=3.0
Loading