Skip to content

Remove code which has been deprecated since v24.3 or earlier#2309

Open
lauramurgatroyd wants to merge 26 commits into
masterfrom
remove_deprec_26
Open

Remove code which has been deprecated since v24.3 or earlier#2309
lauramurgatroyd wants to merge 26 commits into
masterfrom
remove_deprec_26

Conversation

@lauramurgatroyd
Copy link
Copy Markdown
Member

@lauramurgatroyd lauramurgatroyd commented Apr 15, 2026 •
edited
Loading

Description

Closes #2042

Example Usage

Contribution Notes

  • The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in CIL (the Work) under the terms and conditions of the Apache-2.0 License
  • I confirm that the contribution does not violate any intellectual property rights of third parties

❤️ Thanks for your contribution!

lauramurgatroyd
lauramurgatroyd commented Apr 15, 2026
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/Algorithm.py Outdated
@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented Apr 17, 2026 •
edited by MargaretDuff
Loading

Current failures:

  • test_gd_armijo_rosen
image
  • TestCGLS.test_convergence - something is very wrong
image

lauramurgatroyd
lauramurgatroyd commented Apr 17, 2026
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/Algorithm.py Outdated
@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented Apr 24, 2026

Hi @MargaretDuff I have fixed the CGLS convergence unit test, but please let me know if the fix is acceptable! I will tag you at the relevant lines of code.

lauramurgatroyd
lauramurgatroyd commented Apr 24, 2026
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/CGLS.py Outdated
Comment thread Wrappers/Python/cil/optimisation/algorithms/Algorithm.py Outdated
lauramurgatroyd
lauramurgatroyd commented Apr 24, 2026
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/utilities/callbacks.py
lauramurgatroyd
lauramurgatroyd commented Apr 28, 2026
View reviewed changes
Copy link
Copy Markdown
Member Author

@lauramurgatroyd lauramurgatroyd left a comment

Choose a reason for hiding this comment

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

Hi @MargaretDuff, thanks for your changes!

Comment thread Wrappers/Python/cil/optimisation/algorithms/CGLS.py Outdated
Comment thread Wrappers/Python/cil/optimisation/algorithms/Algorithm.py Outdated
Comment thread Wrappers/Python/test/test_algorithm_convergence.py
Comment thread Wrappers/Python/test/test_algorithms.py
@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented Apr 28, 2026

Tried comparing with the numpy 2 branch to see if the merge will be difficult.
It looks fine: numpy-2...remove_deprec_26

@lauramurgatroyd lauramurgatroyd marked this pull request as ready for review April 28, 2026 13:19
@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented Apr 30, 2026

The new algo docs rendered:
image

@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented Apr 30, 2026 •
edited
Loading

Tried comparing with the numpy 2 branch to see if the merge will be difficult. It looks fine: numpy-2...remove_deprec_26

Checked locally and the only conflicts were in .yml files, which are easy to resolve, and are only there due to one of the branches not being up to date with master.

@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented Apr 30, 2026

This is ready for review.

gfardell
gfardell approved these changes May 1, 2026
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/FISTA.py Outdated
@lauramurgatroyd @gfardell
Update Wrappers/Python/cil/optimisation/algorithms/FISTA.py
8acf541 
Co-authored-by: Gemma Fardell <47746591+gfardell@users.noreply.github.com>
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
@casperdcl casperdcl mentioned this pull request May 8, 2026
Merged
2 tasks
@lauramurgatroyd
Merge branch 'master' into remove_deprec_26
17af2b1 
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
@lauramurgatroyd
Copy link
Copy Markdown
Member Author

lauramurgatroyd commented May 8, 2026

This is ready for merge but will be the last thing we merge before release.

@lauramurgatroyd
Merge branch 'master' into remove_deprec_26
bb1c7e2
@lauramurgatroyd
Merge branch 'master' into remove_deprec_26
669fbf3 
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
@lauramurgatroyd lauramurgatroyd mentioned this pull request May 29, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MargaretDuff MargaretDuff MargaretDuff left review comments

@gfardell gfardell gfardell approved these changes

@paskino paskino Awaiting requested review from paskino

Assignees

@MargaretDuff MargaretDuff

@lauramurgatroyd lauramurgatroyd

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Remove deprecated code in v26.0

3 participants

@lauramurgatroyd @MargaretDuff @gfardell