Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[itk] update to 5.4.0 #39757

Merged
merged 7 commits into from
Jul 10, 2024
Merged

[itk] update to 5.4.0 #39757

merged 7 commits into from
Jul 10, 2024

Conversation

bansan85
Copy link
Contributor

@bansan85 bansan85 commented Jul 8, 2024 •
edited
Loading

Fixes #34663

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.
@FrankXie05 FrankXie05 self-assigned this Jul 8, 2024
@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Jul 8, 2024
@bansan85 bansan85 marked this pull request as ready for review July 8, 2024 09:03
@bansan85 bansan85 mentioned this pull request Jul 8, 2024
Merged
16 tasks
FrankXie05
FrankXie05 previously approved these changes Jul 9, 2024
View reviewed changes
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Jul 9, 2024
@bansan85
Copy link
Contributor Author

bansan85 commented Jul 9, 2024

Should I add commit from #39778 ? and close the other PR ?
@FrankXie05
Copy link
Contributor

@bansan85 I recommend including PR #39778 content.
@FrankXie05
Copy link
Contributor

#39778 can duplicate to this PR.
@FrankXie05 FrankXie05 removed the info:reviewed Pull Request changes follow basic guidelines label Jul 9, 2024
@FrankXie05 FrankXie05 marked this pull request as draft July 9, 2024 07:48
@FrankXie05 FrankXie05 mentioned this pull request Jul 9, 2024
Closed
@FrankXie05
Copy link
Contributor

Note: I will be converting your PR to draft status. When you respond, please revert to "ready for review".
That way, I can be aware that you've responded since you can't modify the tags.
@bansan85 bansan85 marked this pull request as ready for review July 9, 2024 08:12
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Jul 9, 2024
JavierMatosD
JavierMatosD reviewed Jul 9, 2024
View reviewed changes
Copy link
Contributor

@JavierMatosD JavierMatosD left a comment

Choose a reason for hiding this comment

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

The rest looks good to me. Please mark ready for review when you've responded.
ports/itk/opencl.patch
Comment on lines -1 to -19
diff --git a/Modules/Core/GPUCommon/CMakeLists.txt b/Modules/Core/GPUCommon/CMakeLists.txt
index da2d66b63..6fb476680 100644
--- a/Modules/Core/GPUCommon/CMakeLists.txt
+++ b/Modules/Core/GPUCommon/CMakeLists.txt
@@ -24,9 +24,13 @@ if(ITK_USE_GPU AND APPLE AND NOT ITK_COMPILER_HAS_BLOCKS)
endif()

if(ITK_USE_GPU)
+ message(STATUS "OPENCL_LIBRARIES:${OPENCL_LIBRARIES}")
+ if(TARGET OpenCL::OpenCL)
+ message(STATUS "OPENCL_LIBRARIES:${OpenCL_LIBRARIES}")
+ endif()
set(ITKGPUCommon_LIBRARIES ITKGPUCommon)
- set(ITKGPUCommon_SYSTEM_INCLUDE_DIRS ${OPENCL_INCLUDE_DIRS})
- set(ITKGPUCommon_SYSTEM_LIBRARY_DIRS ${OPENCL_LIBRARIES})
+ set(ITKGPUCommon_SYSTEM_INCLUDE_DIRS ${OpenCL_INCLUDE_DIRS})
+ set(ITKGPUCommon_SYSTEM_LIBRARY_DIRS ${OpenCL_LIBRARIES})
endif()

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like you removed the meaningful content in this patch. The rest of the changes looks like its just removing a space between the if and the parenthesis. Is this patch still needed?
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes.

I removed this part because ITK replaced OPENCL_INCLUDE_DIRS by OpenCL_INCLUDE_DIRS in Modules/Core/GPUCommon/CMakeLists.txt. But it's the only place where they did it.

The change about the space is only in the context of the patch. ITK removed them in the source code. But it's still needed to replace OPENCL_INCLUDE_DIRS by OpenCL_INCLUDE_DIRS.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you read the patch (instead of the diff of the patch), the highlight syntax is really more readable.

https://github.com/microsoft/vcpkg/blob/7ed7dfb61ed35c24b111e2779a57a6672218ecd2/ports/itk/opencl.patch
ports/itk/double-conversion.patch
@@ -4,7 +4,7 @@ index 16c611fd3..13978724c 100644
+++ b/Modules/ThirdParty/DoubleConversion/CMakeLists.txt
@@ -9,7 +9,16 @@ mark_as_advanced(ITK_USE_SYSTEM_DOUBLECONVERSION)
if(ITK_USE_SYSTEM_DOUBLECONVERSION)
find_package(double-conversion REQUIRED)
find_package(double-conversion 3.1.6 REQUIRED)
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't typically add versions to the find_package calls. Is there a specific reason for this?
Copy link
Contributor Author

Choose a reason for hiding this comment

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

A diff in a patch is unfriendly to read. I didn't add 3.1.6. It's ITK. This line is part of the context of the patch. It's not one of the modified lines.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/microsoft/vcpkg/blob/7ed7dfb61ed35c24b111e2779a57a6672218ecd2/ports/itk/double-conversion.patch
@JavierMatosD JavierMatosD marked this pull request as draft July 9, 2024 17:16
@bansan85 bansan85 marked this pull request as ready for review July 10, 2024 08:23
@bansan85
Copy link
Contributor Author

Next time, I will add more explanation about modification of patches. For example, I removed the patch about C++17 because they already did it.
@JavierMatosD
Copy link
Contributor

Thank you @bansan85 and apologies for the confusion!
@JavierMatosD JavierMatosD merged commit 3fc777f into microsoft:master Jul 10, 2024
17 checks passed
cenit pushed a commit to cenit/vcpkg that referenced this pull request Jul 12, 2024
@bansan85 @cenit
[itk] update to 5.4.0 (microsoft#39757)
9de8153
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
3 participants
@bansan85 @FrankXie05 @JavierMatosD