updates to TomoPhantom plugin to use v3.0#2287
updates to TomoPhantom plugin to use v3.0#2287gfardell merged 16 commits intoTomographicImaging:masterfrom
Conversation
added to changelog
a63847a to
2b2dab8
Compare
15a82ff to
a090253
Compare
|
Currently v3.0.2 of TomoPhantom has been released however, it seems to depend on Python 3.14 only. |
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
|
We're working on uploading a release of tomophantom v3.0.3 to the ccpi channel. We will use this or the one from httomo, whatever is ready fastest. Then we can merge in before the numpy 2 PR https://anaconda.org/channels/ccpi/packages/tomophantom/files |
|
I have built the binaries for windows and linux (currently available on ccpi/label/dev), to make this not pinned to a python version I removed this line: For linux the binaries seem to work: but on windows the library isn't found, it might be as simple as making sure ctypes is looking in the right place, but I think requires a code change, not just a new build of 3.0.3. EDIT: I'd built the dll as 32bit, making sure it's built as 64bit fixed it. |
|
note that dkazanc/TomoPhantom#124 could be split into 2 PRs:
the former would allow a simple cross-platform approach like we use in Wrappers/Python/cil/framework/cilacc.py |
Signed-off-by: Gemma Fardell <47746591+gfardell@users.noreply.github.com>
|
This is now passing tests on windows locally. So I think we can promote the binaries |
|
I'm not sure if the changes to build.yml are needed. @casperdcl do you know? I suspect that was just as @paskino was testing. |
8bbe58f to
330752d
Compare
lauramurgatroyd
left a comment
There was a problem hiding this comment.
Please open an issue about windows support when you merge
Co-authored-by: Casper da Costa-Luis <casper.dcl@physics.org> Signed-off-by: Casper da Costa-Luis <casper.dcl@physics.org>
|
Tests all pass on the duplicate local branch. https://github.com/TomographicImaging/CIL/actions/runs/24558373845/workflow |
Description
Update to use TomoPhantom v3.0 from httomo channel.Update: binaries for Tomophantom 3.0.3 provided by anaconda ccpi, and the tomo share.
We now have the python wrappers no-arch as:
https://anaconda.org/channels/ccpi/packages/tomophantom/files
And the c layer build for windows and linux:
https://anaconda.org/channels/ccpi/packages/libtomophantom/overview
This is now not linked to any specific version of Python and NumPy as it uses ctypes instead of Cython.
Depends on:
A followup will be to move to the httomo channel when
Example Usage
No change in the user interface.
Contribution Notes
Changes
Testing you performed
Unittests on local Linux installation. Tested the following and it works as expected and as in the CIL-Demos.
Unittests on local Windows installation.
Related issues/links
Checklist