UCL / STIR

Software for Tomographic Image Reconstruction
http://stir.sourceforge.net/
Other
107 stars 90 forks source link

apxby backwards compatibility #765

Closed KrisThielemans closed 3 years ago

KrisThielemans commented 3 years ago

@gfardell SIRF is currently breaking on Travis (example

/home/travis/build/SyneRBI/SIRF/src/xSTIR/cSTIR/stir_data_containers.cpp:109:13: error: ‘class stir::ProjData’ has no member named ‘axpby’
     data()->axpby(a, *x->data(), b, *y->data());

admittedly, this is on https://github.com/SyneRBI/SIRF/pull/543 but the failure has nothing to do with that PR.

@evgueni-ovtchinnikov , heads-up on this.

Obviously, we will need to adapt SIRF according to new convention. @gfardell can you create a SIRF issue for that (if it doesn't exist yet)

gfardell commented 3 years ago

https://github.com/SyneRBI/SIRF/issues/834

gfardell commented 3 years ago

Ah, I see the problem. https://github.com/UCL/STIR/blob/f2e894de6d861114cc9525659e1948e11724a202/src/include/stir/ProjData.h#L310

I updated the class to use xapby instead of axpby. Should I change that back for now, or include both versions? Or should we just focus on updating SIRF?

I guess I missed something in cleaning up my environment and it still found the old one when I was trying to test it.

gfardell commented 3 years ago

https://github.com/UCL/STIR/blob/f2e894de6d861114cc9525659e1948e11724a202/src/include/stir/ProjDataInMemory.h#L103 also now uses xapyb

evgueni-ovtchinnikov commented 3 years ago

I vote for having both versions for now

KrisThielemans commented 3 years ago

that was the original plan, yes

KrisThielemans commented 3 years ago

fixed by #767

evgueni-ovtchinnikov commented 3 years ago

SIRF Travis builds 2768.3 and 2768.4 failed with the same no member named ‘axpby’ error.

KrisThielemans commented 3 years ago

This seems to be on the DEVEL builds only. I've now merged release_4 (and hence #767) on to master so it should be fixed now.

I've restarted the 2 failed travis jobs in https://travis-ci.org/github/SyneRBI/SIRF/builds/748388755. Please close this if they succeed (or fail because of a different reason!)

evgueni-ovtchinnikov commented 3 years ago

all well now, thanks!