Skip to content

Support numpy 2#2218

Merged
lauramurgatroyd merged 22 commits into
masterfrom
numpy-2
Jun 11, 2026
Merged

Support numpy 2#2218
lauramurgatroyd merged 22 commits into
masterfrom
numpy-2

Conversation

@casperdcl

@casperdcl casperdcl commented Sep 30, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

unsure about

upstream problems

  • test tomophantom with numpy>=2
  • test tigre with numpy>=2
  • test astra-toolbox CUDA with numpy>=2
  • test_CIL_CVXPy -> cvxpy -> scipy:
test_cil_vs_cvxpy_totalvariation_anisotropic (test_CIL_CVXPy.Test_CIL_vs_CVXPy.test_cil_vs_cvxpy_totalvariation_anisotropic) ... 
...
$CONDA_PREFIX/lib/python3.12/site-packages/scipy/sparse/_dia.py:140: UserWarning: result dtype changed due to the removal of value-based promotion from NumPy. Changed from int64 to int32.
  nnz += min(M+k,N)
...
$CONDA_PREFIX/lib/python3.12/site-packages/cvxpy/utilities/coeff_extractor.py:296: UserWarning: result dtype changed due to the removal of value-based promotion from NumPy. Changed from int32 to int64.
  P.row += offset

@casperdcl casperdcl self-assigned this Sep 30, 2025
@casperdcl casperdcl force-pushed the numpy-2 branch 4 times, most recently from 32b30db to 712e848 Compare October 1, 2025 13:37
@github-project-automation github-project-automation Bot moved this to Todo in CIL work Oct 1, 2025
@casperdcl casperdcl added the help wanted Extra attention is needed label Oct 1, 2025
@casperdcl casperdcl moved this from Todo to In Progress in CIL work Oct 1, 2025
@gfardell gfardell requested review from gfardell and paskino October 14, 2025 14:24
@gfardell gfardell moved this from In Progress to Priority review in CIL work Oct 14, 2025
@paskino paskino mentioned this pull request Oct 23, 2025
Closed
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread README.md Outdated
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/PD3O.py
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/SPDHG.py
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/Function.py Outdated
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/Function.py Outdated
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/processors/MaskGenerator.py

@paskino paskino Oct 23, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm assuming that all the filters in this file return the same type as the input.

paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/test/test_BlockDataContainer.py
paskino
paskino reviewed Oct 23, 2025
View reviewed changes
Comment thread Wrappers/Python/test/test_functions.py Outdated
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/framework/acquisition_data.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/framework/block.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/framework/data_container.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/io/TIFF.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/PDHG.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/algorithms/SPDHG.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/Function.py
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/LeastSquares.py Outdated
paskino
paskino reviewed Oct 24, 2025
View reviewed changes
Comment thread Wrappers/Python/cil/optimisation/functions/LeastSquares.py
casperdcl and others added 15 commits June 11, 2026 10:45
@casperdcl
fix test precision
0d33059
@paskino @casperdcl
Fix NaN usage in show_geometry function (#2246)
a250b43
@paskino @casperdcl
Fix ISTA initialization by disabling acceleration
af9869a 
Set accelerated=False in IndicatorBox to fix issue SyneRBI/SIRF-SuperBuild#987
@paskino @casperdcl
Pass linear acquisition model to sensitivity preconditioner in SIRF test
9a586f9
@gfardell @casperdcl
Update test to more numerically stable ROI
2354636 
Co-authored-by: Copilot <copilot@github.com>
@gfardell @casperdcl
Update shape attribute to return as python ints
058e8c0
@lauramurgatroyd @casperdcl
Fixes to unit tests
c864db5
@casperdcl
fix channel dependency hell
cdfacf2
@gfardell @casperdcl
relax tigre siddon unittest
dd69883
@gfardell @casperdcl
fix to tigre wrappers to support np 2.4
b8803af
@casperdcl
array(range) -> arange
e5b4186
@lauramurgatroyd @casperdcl
Enhance developer guide with scalar types section (#2335)
d3c818c 
Added section on scalar types and updated logging convention.
@gfardell @casperdcl
show_geometry fix for np2.4
66965cd
@paskino @casperdcl
use conda-forge and py package of astra-toolbox for macosx (experimen…
29b9e2b 
…tal)
@casperdcl
DEBUG: test regulariser pre-release
79f0898
lauramurgatroyd
lauramurgatroyd approved these changes Jun 11, 2026
View reviewed changes

@lauramurgatroyd lauramurgatroyd left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Test looks good 😄

@lauramurgatroyd lauramurgatroyd marked this pull request as ready for review June 11, 2026 14:06
@lauramurgatroyd lauramurgatroyd requested a review from a team as a code owner June 11, 2026 14:06
@lauramurgatroyd lauramurgatroyd changed the title numpy 2 Support numpy 2 Jun 11, 2026
lauramurgatroyd and others added 2 commits June 11, 2026 15:10
@lauramurgatroyd
Update Wrappers/Python/cil/utilities/__init__.py
b6bd39b 
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
@lauramurgatroyd
Update Change Log
ac89884
@lauramurgatroyd lauramurgatroyd merged commit ce75cc8 into master Jun 11, 2026
8 of 9 checks passed
@github-project-automation github-project-automation Bot moved this from Blocked to Done in CIL work Jun 11, 2026
@lauramurgatroyd lauramurgatroyd deleted the numpy-2 branch June 11, 2026 14:56
casperdcl added a commit that referenced this pull request Jun 11, 2026
@casperdcl
Merge pull request #2218 from numpy-2
2d03882
@casperdcl

casperdcl commented Jun 11, 2026

Copy link
Copy Markdown
Member Author

wait what? not with the debug commits...

nvm I just force-pushed a corrected merge to master

@casperdcl casperdcl mentioned this pull request Jun 11, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@paskino paskino paskino left review comments

@gfardell gfardell gfardell requested changes

@lauramurgatroyd lauramurgatroyd lauramurgatroyd approved these changes

Assignees

@casperdcl casperdcl

Labels

help wanted Extra attention is needed

Projects

CIL work
Status: Done

Milestone

v26.0

Development

Successfully merging this pull request may close these issues.

show_geometry fails with numpy2 support numpy v2

5 participants

@casperdcl @lauramurgatroyd @gfardell @AnderBiguri @paskino