ITK5 migration #384
Merged
ITK5 migration #384
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Missing typename directives in declarations. Confusion between long and long long Use of itkMutexLock instead of std::mutex. Failure to include <itkMacro.h>. Use of ComposeRGBImageFilter instead of ComposeImageFilter. Use of NULL instead of nullptr. Use of vcl_sqrt instead of std::sqrt, etc. itk::MultiThreader --> itk::MultiThreaderBase. Removal of inappropriate Seg3D:: explicit qualification.
This is a squashed commit with erroneous changes of NULL to nullptr and its revert to fix the introduced SQL errors and Tinyxml updates.
so we don't need to have it as a dependency. Error was: M:\Dev\Seg3D\src\Application\LayerIO\Matlab73LayerImporter.cc(32,10): fatal error C1083: Cannot open include file: 'itkhdf5/H5LTpublic.h': No such file or directory
registration->StartRegistration() ==> registration->Update() GetJacobian(...) ==> ComputeJacobianWithRespectToPosition(...)
Closed
|
Here's the build log on linux(gcc 10.2): |
|
@rubiojr That error appears with non-default option |
|
@allywarner I cherry-picked your revert of |
|
Re: Mac-build github build error, they (Github build farm) updated to the latest XCode and now Seg3d's ancient Python and Boost dependencies don't compile. There's an issue for that already, #315. |
allywarner
requested review from
jessdtate
and removed request for
allywarner
|
The build works now on my linux machine now. |
tarkpate
reviewed
Nov 10, 2020
|
@RubioJr9 I just applied all your suggestions in a new commit. |
dzenanz
added a commit
to dzenanz/Seg3D
that referenced
this pull request
Nov 11, 2020
Counting on compilers to be smart enough to vectorize the new style as well as, or better than, the old unrolled style.
|
I force-pushed to this branch to retain the const-related suggestion. Loop unrolling is now in my fork's branch. As that commit contains a lot of whitespace trimming done in this branch, rebasing on current master causes conflicts. I will make a new PR once this PR is merged. This should avoid confusion. |
|
Sounds good, thanks a lot |
|
Thanks, @dzenanz! The mac build is showing a failure related to python. Would you like me to test a mac build on my local machine? |
|
@RubioJr9 yes! Python build fails on my local machine too ( |
|
The python crash is likely related to the new clang version used in github actions. We can deal with it in a new PR if it builds on other mac machines. |
|
I have this building with clang 11, but it is crashing due a previous opengl problem. If @RubioJr9 and @allywarner can build and run it, let's merge it. |
|
@jessdtate It built fine on my machine. I'm running 10.14 with clang 10.0.1. |
tarkpate
approved these changes
Nov 14, 2020
|
@jessdtate also builds for me on 10.14.6. |
jessdtate
approved these changes
Nov 18, 2020
dcwhite
approved these changes
Nov 18, 2020
|
Let's merge this and then immediately fix #385. |
Closed
|
Hooray!😄 |
|
💯 |
dzenanz
added a commit
to dzenanz/Seg3D
that referenced
this pull request
Nov 23, 2020
Counting on compilers to be smart enough to vectorize the new style as well as, or better than, the old unrolled style.
allywarner
added a commit
that referenced
this pull request
Jan 14, 2021
Review suggestion by @RubioJr9 in PR #384
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a cleaned-up version of #382. Closes #382.