mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 20:32:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[itk] Add missing iostream include for CUDA classes (#29317)

Browse Source 
* [itk] Add missing iostream include for CUDA classes

* update version

* use New function

* vdb

* add end line

* overwrite version
This commit is contained in:
Frank 2023-02-03 08:28:09 +08:00 committed by GitHub
parent b79fa0ec38
commit c3f5491a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/itk/portfile.cmake
View File

@ -185,7 +185,7 @@ vcpkg_cmake_configure(
)
if(BUILD_RTK) # Remote Modules are only downloaded on configure.
# TODO: In the future try to download via vcpkg_from_github and move the files. That way patching does not need this workaround
vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}/Modules/Remote/RTK" QUIET PATCHES rtk/already_defined.patch rtk/unresolved.patch)
vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}/Modules/Remote/RTK" QUIET PATCHES rtk/already_defined.patch rtk/unresolved.patch rtk/Add-missing-include-for-Cuda.patch)
endif()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
@ -212,4 +212,4 @@ if("rtk" IN_LIST FEATURES)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/itk/Modules/RTK.cmake" "${SOURCE_PATH}/Modules/Remote/RTK/utilities/lp_solve" "\${ITK_INSTALL_PREFIX}/include/RTK/lpsolve")
endif()
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

26
ports/itk/rtk/Add-missing-include-for-Cuda.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/src/rtkCudaLagCorrectionImageFilter.cu b/src/rtkCudaLagCorrectionImageFilter.cu
index 8719ee48..5f8abb23 100644
--- a/src/rtkCudaLagCorrectionImageFilter.cu
+++ b/src/rtkCudaLagCorrectionImageFilter.cu
@@ -114,7 +114,7 @@ CUDA_lag_correction(int proj_idx_in[3], // overlapping input r
cudaMalloc((void **)&d_state, state_size);
if (cudaMemcpy(d_state, h_state, state_size, cudaMemcpyHostToDevice) != cudaSuccess)
{
- std::cout << "Error allocating state" << std::endl;
+ itkGenericExceptionMacro("Error allocating state");
}
if (coefficients[8] <= 0.0)
diff --git a/src/rtkCudaPolynomialGainCorrectionImageFilter.cu b/src/rtkCudaPolynomialGainCorrectionImageFilter.cu
index fb7939dd..d0aacc23 100644
--- a/src/rtkCudaPolynomialGainCorrectionImageFilter.cu
+++ b/src/rtkCudaPolynomialGainCorrectionImageFilter.cu
@@ -111,7 +111,7 @@ CUDA_gain_correction(int proj_idx_in[3], // overlapping input
cudaMalloc((void **)&d_powerlut, lut_size);
if (cudaMemcpy(d_powerlut, h_powerlut, lut_size, cudaMemcpyHostToDevice) != cudaSuccess)
{
- std::cout << "Error allocating state" << std::endl;
+ itkGenericExceptionMacro("Error allocating state");
}
cudaMemcpyToSymbol(cst_coef, coefficients, 2 * sizeof(float));

2
ports/itk/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "itk",
"version": "5.2.1",
"port-version": 4,
"port-version": 5,
"description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.",
"homepage": "https://github.com/InsightSoftwareConsortium/ITK",
"license": "Apache-2.0",

2
versions/baseline.json
View File

@ -3234,7 +3234,7 @@
},
"itk": {
"baseline": "5.2.1",
"port-version": 4
"port-version": 5
},
"itpp": {
"baseline": "4.3.1",

5
versions/i-/itk.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "33def29a955f79fae7497d8be276decf175a9881",
"version": "5.2.1",
"port-version": 5
},
{
"git-tree": "b28c11dddebdeb5084e068f2ad88e87b777f5edb",
"version": "5.2.1",