Skip to content

Commit 84a87d4

Browse files
authored
Merge pull request #999 from I2PC/fili_agm_fix_CUDA12_6
fixing errors for CUDA 12.6
2 parents 7e6e032 + 4cda8db commit 84a87d4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/xmipp/libraries/reconstruction_cuda/cuda_volume_restoration_kernels.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ void VolumeRestorationKernels<T>::restorationSigmaCostError(T& error, const std:
172172
const vec2_type<T>* __restrict__ d_fV1 = (vec2_type<T>*)_d_fV1;
173173
const vec2_type<T>* __restrict__ d_fV2 = (vec2_type<T>*)_d_fV2;
174174

175-
auto error_func = [=] __device__ (int n) {
175+
auto error_func = [=] __device__ (int n) -> T {
176176
const T R2n = d_R2[n];
177177
if (R2n <= 0.25) {
178178
const T H1 = exp(K1 * R2n);
@@ -222,7 +222,7 @@ template< typename T >
222222
std::pair<T, T> VolumeRestorationKernels<T>::computeAvgStd(const T* __restrict__ d_N, size_t volume_size) {
223223
const T avg = thrust::reduce(thrust::device, d_N, d_N + volume_size);
224224

225-
auto square_kernel = [=] __device__ (T x) {
225+
auto square_kernel = [=] __device__ (T x) -> T {
226226
return x * x;
227227
};
228228

@@ -233,7 +233,7 @@ std::pair<T, T> VolumeRestorationKernels<T>::computeAvgStd(const T* __restrict__
233233

234234
template< typename T >
235235
std::pair<T, T> VolumeRestorationKernels<T>::computeAvgStdWithMask(const T* __restrict__ d_N, const int* __restrict__ d_mask, size_t mask_size, size_t volume_size) {
236-
auto masked_k = [=] __device__ (int n) {
236+
auto masked_k = [=] __device__ (int n) -> T {
237237
if (d_mask[n]) {
238238
return d_N[n];
239239
} else {
@@ -244,7 +244,7 @@ std::pair<T, T> VolumeRestorationKernels<T>::computeAvgStdWithMask(const T* __re
244244
const T avg = thrust::transform_reduce(thrust::device, thrust::counting_iterator<int>(0), thrust::counting_iterator<int>(volume_size), masked_k,
245245
static_cast<T>(0), thrust::plus<T>());
246246

247-
auto masked_square_k = [=] __device__ (int n) {
247+
auto masked_square_k = [=] __device__ (int n) -> T {
248248
if (d_mask[n]) {
249249
return d_N[n] * d_N[n];
250250
} else {

0 commit comments

Comments
 (0)