From 92a3c5eb30a821931839bbe9ef597b18a4658aef Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Wed, 22 Apr 2026 20:07:26 +0200 Subject: [PATCH] AzIntEngineGPU: Fixes --- image_analysis/azint/AzIntEngineGPU.cu | 24 ++++++------------------ image_analysis/azint/AzIntEngineGPU.h | 4 ++-- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/image_analysis/azint/AzIntEngineGPU.cu b/image_analysis/azint/AzIntEngineGPU.cu index 57653d1f..39aca31e 100644 --- a/image_analysis/azint/AzIntEngineGPU.cu +++ b/image_analysis/azint/AzIntEngineGPU.cu @@ -100,13 +100,13 @@ AzIntEngineGPU::AzIntEngineGPU(const AzimuthalIntegration &integration) cpu_count_reg(azint_count), gpu_image(npixel) { - cudaDeviceProp prop; + cudaDeviceProp prop{}; cudaGetDeviceProperties(&prop, 0); threads = 128; blocks = 4 * prop.multiProcessorCount; shared_size = prop.sharedMemPerBlock; - shared_needed = azint_bins * sizeof(float) + azint_bins * sizeof(float) + azint_bins * sizeof(uint32_t); + shared_needed = azint_bins * (2 * sizeof(float) + sizeof(uint32_t)); cudaMemcpy(gpu_azint_correction, integration.Corrections().data(), sizeof(float) * npixel, cudaMemcpyHostToDevice); @@ -124,25 +124,13 @@ void AzIntEngineGPU::Run(const std::vector &image, AzimuthalIntegration if (shared_needed < shared_size) { gpu_azim_shared<<>>( - gpu_pixel_to_bin, - gpu_azint_correction, - gpu_image, - gpu_sum, - gpu_sum2, - gpu_count, - npixel, - azint_bins + gpu_pixel_to_bin,gpu_azint_correction,gpu_image, gpu_sum, gpu_sum2, + gpu_count, npixel, azint_bins ); } else { gpu_azim<<>>( - gpu_pixel_to_bin, - gpu_azint_correction, - gpu_image, - gpu_sum, - gpu_sum2, - gpu_count, - npixel, - azint_bins + gpu_pixel_to_bin,gpu_azint_correction,gpu_image, gpu_sum, gpu_sum2, + gpu_count, npixel, azint_bins ); } diff --git a/image_analysis/azint/AzIntEngineGPU.h b/image_analysis/azint/AzIntEngineGPU.h index e0778d79..3ba5dad8 100644 --- a/image_analysis/azint/AzIntEngineGPU.h +++ b/image_analysis/azint/AzIntEngineGPU.h @@ -10,8 +10,8 @@ class AzIntEngineGPU : public AzIntEngine { CudaStream stream; int threads; int blocks; - int shared_needed; - int shared_size; + size_t shared_needed; + size_t shared_size; CudaDevicePtr gpu_azint_correction; CudaDevicePtr gpu_pixel_to_bin;