Skip to content

Temp fix ITK multi-threads issue#1324

Merged
wyli merged 10 commits into
Project-MONAI:masterfrom
Nic-Ma:fix-itk-multi-threads
Dec 7, 2020
Merged

Temp fix ITK multi-threads issue#1324
wyli merged 10 commits into
Project-MONAI:masterfrom
Nic-Ma:fix-itk-multi-threads

Conversation

@Nic-Ma

@Nic-Ma Nic-Ma commented Dec 7, 2020

Copy link
Copy Markdown
Contributor

Description

This PR added temp fix for the multi-threads issue of ITK, referring to @hjmjohnson 's suggestion:
InsightSoftwareConsortium/ITK#2003 (comment)

Status

Ready

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).
  • Breaking change (fix or new feature that would cause existing functionality to change).
  • New tests added to cover the changes.
  • Integration tests passed locally by running ./runtests.sh --codeformat --coverage.
  • Quick tests passed locally by running ./runtests.sh --quick.
  • In-line docstrings updated.
  • Documentation updated, tested make html command in the docs/ folder.

@Nic-Ma

Nic-Ma commented Dec 7, 2020

Copy link
Copy Markdown
Contributor Author

/black

Signed-off-by: Nic Ma <nma@nvidia.com>
@Nic-Ma

Nic-Ma commented Dec 7, 2020

Copy link
Copy Markdown
Contributor Author

/black

Comment thread monai/data/image_reader.py Outdated
Signed-off-by: Nic Ma <nma@nvidia.com>
@Nic-Ma

Nic-Ma commented Dec 7, 2020

Copy link
Copy Markdown
Contributor Author

/black

Comment thread monai/data/image_reader.py
monai-bot and others added 2 commits December 7, 2020 15:45
Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
Signed-off-by: Nic Ma <nma@nvidia.com>

@wyli wyli left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

Comment thread monai/data/image_reader.py Outdated
Comment thread monai/data/image_reader.py Outdated
if (
int(itk.Version.GetITKMajorVersion()) == 5
and int(itk.Version.GetITKMinorVersion()) <= 2
and int(itk.Version.GetITKBuildVersion()) <= 0

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so, we don't need this condition.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated in the latest commit, is it expected now?
Thanks.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now.

Signed-off-by: Nic Ma <nma@nvidia.com>
@Nic-Ma

Nic-Ma commented Dec 7, 2020

Copy link
Copy Markdown
Contributor Author

/black

Signed-off-by: monai-bot <monai.miccai2019@gmail.com>
@wyli wyli merged commit 395fa23 into Project-MONAI:master Dec 7, 2020
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.

5 participants