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

Update setulb call from Scipy for updated signature of 1.15 #6207

Merged
merged 6 commits into from
Jan 8, 2025
Merged

Update setulb call from Scipy for updated signature of 1.15 #6207

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7973f84
FIX Update setulb call from Scipy for updated signature of 1.15
dantegd Jan 5, 2025
979bbe8
ENH support both scipy 1.15 and earlier
dantegd Jan 7, 2025
5995415
Merge branch 'branch-25.02' into fix-scipy-115
dantegd Jan 7, 2025
6755940
FIX Update task status assignments and disable test case that fails u…
dantegd Jan 7, 2025
9d29dca
Merge branch 'fix-scipy-115' of github.com:dantegd/cuml into fix-scip…
dantegd Jan 7, 2025
5eded65
FIX xfail batched lbfgs test temporarily to unblock CI
dantegd Jan 7, 2025
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
7 changes: 3 additions & 4 deletions python/cuml/cuml/tsa/batched_lbfgs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ def fprime_f(x):
for ib in range(num_batches)
]
iwa = [np.copy(np.zeros(3 * n, np.int32)) for ib in range(num_batches)]
task = [np.copy(np.zeros(1, "S60")) for ib in range(num_batches)]
csave = [np.copy(np.zeros(1, "S60")) for ib in range(num_batches)]
task = [np.copy(np.zeros(1, np.int32)) for ib in range(num_batches)]
ln_task = [np.copy(np.zeros(1, np.int32)) for ib in range(num_batches)]
lsave = [np.copy(np.zeros(4, np.int32)) for ib in range(num_batches)]
isave = [np.copy(np.zeros(44, np.int32)) for ib in range(num_batches)]
dsave = [np.copy(np.zeros(29, np.float64)) for ib in range(num_batches)]
Expand Down Expand Up @@ -175,12 +175,11 @@ def fprime_f(x):
wa[ib],
iwa[ib],
task[ib],
iprint,
Copy link
Member

Choose a reason for hiding this comment

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

Should we also remove this from the functions' signature if it has no more effect?

csave[ib],
lsave[ib],
isave[ib],
dsave[ib],
maxls,
ln_task[ib]
)

xk = np.concatenate(x)
Expand Down
Loading