-
Notifications
You must be signed in to change notification settings - Fork 141
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
ENH: Remove ITKCudaCommon from the source tree #492
ENH: Remove ITKCudaCommon from the source tree #492
Conversation
Thanks @AlexyPellegrini! I think that the CI must be updated to account for the ITKCudaCommon dependency. See this comment to know how to do it: |
522aed4
to
58efe1d
Compare
FYI, my plan is to finalize SimonRit/ITKCudaCommon#15. I'll update then #495. I will ask you then to rebase your PR on it... It's taking longer than expected because I have uncovered some issues by setting up the CI, sorry for the delay. |
cacea8a
to
8077364
Compare
@@ -95,7 +98,7 @@ jobs: | |||
mkdir ITK-build | |||
cd ITK-build | |||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" | |||
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK | |||
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DModule_CudaCommon:BOOL=ON -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK |
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.
There seems to be a problem wtith itkCudaSquareImage.cu
see the log. Maybe you should try to compile the master version of ITKCudaCommon by setting Module_CudaCommon_GIT_TAG
here?
db039dd
to
d559d31
Compare
Sorry, the docker service was no longer running. It should be fixed now, I have scheduled a new run or all jobs. However, shouldn't this trigger a job failure? I'm not sure to understand why it doesn't. |
The compilation is still struggling due to missing |
To be honest, we copied it from ITKUltrasound's source code, all remote module are build this way with this copy of their include at the end. Maybe we need to also copy that generated config header to that include directory to make it accessible, or maybe it is not the good way of doing this and we should find a way to build it without any copy. |
I can't find the file... I can find |
As far as I can see, the remote modules BSplineGradient, HigherOrderAccurateGradient, SplitComponents, Strain, from which Ultrasound depends, do not need this generated file (grep Export in their source repo was empty). |
I found a typo in what I wrote, and it was one of the include dir copy so I could make sense, can you try to launch build-linux-cuda-python-packages (37) once again ? |
I'd like to quickly do a release now that #507 is merged (see InsightSoftwareConsortium/ITK#3528). Do you think we should finalize this PR before? What is its status? |
Yes I will rebase this on master and it should be ready |
4a8351c
to
da0d1f7
Compare
54d39a9
to
195888b
Compare
195888b
to
dcd19c0
Compare
@SimonRit This should finally pass once InsightSoftwareConsortium/ITKPythonPackage#200 is merged and new ITKPythonBuilds are released |
Following @thewtex' comment, I have relaunched the checks. But it will likely fail for manylinux2014... |
Can you rebase on master to retrigger the tests based on #510? |
dcd19c0
to
1ffe8bb
Compare
Done! Thanks for the update! Please make sure to use "squash and merge" button if everything goes well. |
@SimonRit It looks like the pipelines are passing 🥳 🎉 We should test the produced wheels and merge if everything is fine |
Can you please rebase on master? I have updated the CI infrastructure for compability with the latest ITK builds, see 7cda37a. |
cbef5d7
to
b37c5e5
Compare
I have tested the Linux 3.10 CI package (from ITKCudaCommon and this PR) and it works! There are a bunch of warnings at execution to address, see below. I also think that there is a missing install requirement for
|
62792b0
to
8ae0735
Compare
efb54dc
to
7fd1fab
Compare
Now builds with the remote module CudaCommon of ITK. Builds both as a remote module of ITK and as a standalone library.
7fd1fab
to
0f67b3c
Compare
I have been working on this PR and inadvertently modified @AlexyPellegrini's branch, sorry. The reference PRs are now RTKConsortium/ITKCudaCommon#20 and #528. |
Now builds with the remote module CudaCommon of ITK. Builds both as a remote module of ITK and as a standalone library.
This MR replaces https://github.com/SimonRit/RTK/pull/427