Skip to content

WIP: ENH: CI builds against ITK 6.0 Alpha 1#308

Closed
thewtex wants to merge 2 commits intomainfrom
itk-6-ci
Closed

WIP: ENH: CI builds against ITK 6.0 Alpha 1#308
thewtex wants to merge 2 commits intomainfrom
itk-6-ci

Conversation

@thewtex
Copy link
Member

@thewtex thewtex commented Dec 9, 2024

No description provided.

The minimum Python version is not 3.9 because Python 3.8 is end-of-life.
@thewtex
Copy link
Member Author

thewtex commented Dec 9, 2024

@N-Dekker we are getting:

src/Common/itkScaledSingleValuedNonLinearOptimizer.h:21,
398
                 from /work/build/cp39-cp39-linux_x86_64/_deps/elx-src/Components/Optimizers/ConjugateGradient/itkGenericConjugateGradientOptimizer.h:22,
399
                 from /work/build/cp39-cp39-linux_x86_64/_deps/elx-src/Components/Optimizers/ConjugateGradient/itkGenericConjugateGradientOptimizer.cxx:19:
400
/work/ITK-source/ITK/Modules/Core/Common/include/itkMacro.h:1008:3: error: expected ‘;’ before ‘virtual’
401
 1008 |   virtual type Get##name() const { return this->m_##name; } \
402
      |   ^~~~~~~
403
/work/build/cp39-cp39-linux_x86_64/_deps/elx-src/Components/Optimizers/ConjugateGradient/itkGenericConjugateGradientOptimizer.h:123:5: note: in expansion of macro ‘itkGetConstMacro’
404
  123 |     itkGetConstMacro(ValueTolerance, double);

Does that ring a bell?

@N-Dekker
Copy link
Collaborator

/work/ITK-source/ITK/Modules/Core/Common/include/itkMacro.h:1008:3: error: expected ‘;’ before ‘virtual’
Does that ring a bell?

Yes it does! ITK now requires a semicolon at the end of a itkSetMacro call. It does so from ITK pull request InsightSoftwareConsortium/ITK#4706 commit InsightSoftwareConsortium/ITK@55e2339 (which is after ITK 5.4.0)

SuperElastix/elastix did not always have a semicolon with each such macro call. This was fixed by the following 3 commits:

I would suggest to just upgrade ITKElastix to the latest main revision of SuperElastix/elastix, SuperElastix/elastix@f928159

@thewtex
Copy link
Member Author

thewtex commented Dec 10, 2024

@N-Dekker excellent, thank you for the information!

I pushed a bump to the latest elastix main.

Current `main` + wasm patches. For compatibility with ITK 6.
@thewtex
Copy link
Member Author

thewtex commented Dec 16, 2024

Superceded by #310

@thewtex thewtex closed this Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants