From c3f5491a3600eebe5cacf0fa16060610b73310b0 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 3 Feb 2023 08:28:09 +0800 Subject: [PATCH] [itk] Add missing iostream include for CUDA classes (#29317) * [itk] Add missing iostream include for CUDA classes * update version * use New function * vdb * add end line * overwrite version --- ports/itk/portfile.cmake | 4 +-- .../rtk/Add-missing-include-for-Cuda.patch | 26 +++++++++++++++++++ ports/itk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/itk.json | 5 ++++ 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 ports/itk/rtk/Add-missing-include-for-Cuda.patch diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 459e1af0ec..72d2313317 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -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") diff --git a/ports/itk/rtk/Add-missing-include-for-Cuda.patch b/ports/itk/rtk/Add-missing-include-for-Cuda.patch new file mode 100644 index 0000000000..df0610eef1 --- /dev/null +++ b/ports/itk/rtk/Add-missing-include-for-Cuda.patch @@ -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)); diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 14cc6f912d..e81f2229e0 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index f0307b5689..50ba8d4a8a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3234,7 +3234,7 @@ }, "itk": { "baseline": "5.2.1", - "port-version": 4 + "port-version": 5 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index 8526fd87bb..b848437c2c 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33def29a955f79fae7497d8be276decf175a9881", + "version": "5.2.1", + "port-version": 5 + }, { "git-tree": "b28c11dddebdeb5084e068f2ad88e87b777f5edb", "version": "5.2.1",