-
Notifications
You must be signed in to change notification settings - Fork 18
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.
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 TomoPhantom and CCPi regularisation tags #813
Conversation
I've merged |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please update CHANGES.md
CIL_regularisation tests failing with stuff like
|
add_test(NAME CIL_REGULARISATION_TEST_1 | ||
COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -s test -p test_*.py | ||
add_test(NAME CIL_REGULARISATION_TEST_CPU | ||
COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -s test -p test_CPU_*.py |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can't we discover if there's a GPU (I think we have a CMake variable for it)? If not, then this is fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have a variable ${${proj}_USE_CUDA}
but it only detects if CUDA SDK is present not the availability of a GPU.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At any rate this should be handled upstream, TomographicImaging/CCPi-Regularisation-Toolkit#177
Uses environment.yml from SIRF-Exercises if using conda, and it is found. Defaults to requirements.txt if not found or not using conda.
we forced BUILD_TESTING=ON for some reason. Now we use the value of our own CMake variable Fixes #824
we're no longer patching it
should never have been here. The CMAKE_INCLUDE_PATH should not point to CMAKE_INSTALL_PREFIX/include, as it should be used for CMake files
- fixes #826
SIRF Matlab support is out-of-date and could generate conflicts with Python shared libraries.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's squash-merge this one. No idea why there are so many commits here!
* Update TomoPhantom and CCPi regularisation tags closes #812
closes #812