Skip to content

COMP: Resolve build failures in itk-stub-files - #202

Merged
dzenanz merged 3 commits into
KitwareMedical:masterfrom
tbirdso:stub-file-fixes
May 30, 2022
Merged

COMP: Resolve build failures in itk-stub-files#202
dzenanz merged 3 commits into
KitwareMedical:masterfrom
tbirdso:stub-file-fixes

Conversation

@tbirdso

@tbirdso tbirdso commented May 27, 2022

Copy link
Copy Markdown
Contributor

Resolves a few small, cascading wrapping failures:

  • Resolves itk-stub-files build failures #201 where ITK wraps itk::ImageToImageFilter as POINTER but ITKUltrasound was wrapping itk::ImageToImageFilter as POINTER_WITH_SUPERCLASS
  • Resolves failure where itk::ImageSource was not wrapped for itk::CurvilinearArraySpecialCoordinatesImage despite being part of itk::ImageToImageFilter hierarchy
  • Resolves failure where itk::FrequencyDomain1DImageFilter was wrapped as POINTER_WITH_2_SUPERCLASSES despite itk::ImageToImageFilter superclass now being wrapped as POINTER

Build against ITK master branch passes locally on Windows.

tbirdso added 2 commits May 27, 2022 10:52
@tbirdso
COMP: Resolve build failures in itk-stub-files
6a91997 
Cleans up wrapping files to match underlying ITK wrappings. Resolves
build failures in KitwareMedical#201.
@tbirdso
ENH: Bump ITK version in CI
645b956 
Bump so that new `itk-stub-files` target is included in CI build for
Python type hint generation
@tbirdso
tbirdso requested a review from dzenanz May 27, 2022 14:58
tbirdso added a commit to tbirdso/ITKUltrasound that referenced this pull request May 27, 2022
@tbirdso
BUG: Resolve curvilinear image template method wrapping conflicts
e3cbd59 
Changes:
- Updated wrapping for `itk::CurvilinearArraySpecialCoordinatesImage`
  with explicit overrides for template methods for transforming between
  physical and image space.
- Moved image filters wrapped for
  `itk::CurvilinearArraySpecialCoordinatesImage` into a separate wrap
  file so that template method generation no longer conficts with
  explict override generated from curvilinear image wrap file.
- Re-enabled `itk::ResampleImageFilter` wrapping for curvilinear image
  input.
- Added Python test to verify output from fixed
  `itk::CurvilinearArraySpecialCoordinatesImage` template methods
  matches in both C++ and Python

Resolves KitwareMedical#171. Depends on KitwareMedical#202.
tbirdso added a commit to tbirdso/ITKUltrasound that referenced this pull request May 27, 2022
@tbirdso
BUG: Resolve curvilinear image template method wrapping conflicts
f5483d8 
Changes:
- Updated wrapping for `itk::CurvilinearArraySpecialCoordinatesImage`
  with explicit overrides for template methods for transforming between
  physical and image space.
- Moved image filters wrapped for
  `itk::CurvilinearArraySpecialCoordinatesImage` into a separate wrap
  file so that template method generation no longer conficts with
  explict override generated from curvilinear image wrap file.
- Re-enabled `itk::ResampleImageFilter` wrapping for curvilinear image
  input.
- Added Python test to verify output from fixed
  `itk::CurvilinearArraySpecialCoordinatesImage` template methods
  matches in both C++ and Python

Resolves KitwareMedical#171. Depends on KitwareMedical#202.
@tbirdso tbirdso mentioned this pull request May 27, 2022
Merged
@dzenanz
dzenanz merged commit 58e4bcc into KitwareMedical:master May 30, 2022
dzenanz pushed a commit to tbirdso/ITKUltrasound that referenced this pull request May 30, 2022
@tbirdso @dzenanz
BUG: Resolve curvilinear image template method wrapping conflicts
629076d 
Changes:
- Updated wrapping for `itk::CurvilinearArraySpecialCoordinatesImage`
  with explicit overrides for template methods for transforming between
  physical and image space.
- Moved image filters wrapped for
  `itk::CurvilinearArraySpecialCoordinatesImage` into a separate wrap
  file so that template method generation no longer conficts with
  explict override generated from curvilinear image wrap file.
- Re-enabled `itk::ResampleImageFilter` wrapping for curvilinear image
  input.
- Added Python test to verify output from fixed
  `itk::CurvilinearArraySpecialCoordinatesImage` template methods
  matches in both C++ and Python

Resolves KitwareMedical#171. Depends on KitwareMedical#202.
hjmjohnson pushed a commit to hjmjohnson/ITKUltrasound that referenced this pull request Jan 26, 2025
@tbirdso @hjmjohnson
BUG: Resolve curvilinear image template method wrapping conflicts
6124c71 
Changes:
- Updated wrapping for `itk::CurvilinearArraySpecialCoordinatesImage`
  with explicit overrides for template methods for transforming between
  physical and image space.
- Moved image filters wrapped for
  `itk::CurvilinearArraySpecialCoordinatesImage` into a separate wrap
  file so that template method generation no longer conficts with
  explict override generated from curvilinear image wrap file.
- Re-enabled `itk::ResampleImageFilter` wrapping for curvilinear image
  input.
- Added Python test to verify output from fixed
  `itk::CurvilinearArraySpecialCoordinatesImage` template methods
  matches in both C++ and Python

Resolves KitwareMedical#171. Depends on KitwareMedical#202.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dzenanz dzenanz dzenanz approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

itk-stub-files build failures

2 participants

@tbirdso @dzenanz