diff --git a/cuda/components/atomic.cuh b/cuda/components/atomic.cuh index 060b585cd51..84cb42ae096 100644 --- a/cuda/components/atomic.cuh +++ b/cuda/components/atomic.cuh @@ -45,7 +45,7 @@ namespace cuda { /** * @internal * - * @note It is not 'real' complex atomic add opeartion + * @note It is not 'real' complex atomic add operation */ __forceinline__ __device__ void atomic_add( thrust::complex *__restrict__ address, thrust::complex val) @@ -56,10 +56,11 @@ __forceinline__ __device__ void atomic_add( atomic_add(&(cuaddr->y), val.imag()); } + /** * @internal * - * @note It is not 'real' complex atomic add opeartion + * @note It is not 'real' complex atomic add operation */ __forceinline__ __device__ void atomic_add( thrust::complex *__restrict__ address, thrust::complex val) diff --git a/cuda/components/format_conversion.cuh b/cuda/components/format_conversion.cuh index b039c40b3a2..ae2601d6fcb 100644 --- a/cuda/components/format_conversion.cuh +++ b/cuda/components/format_conversion.cuh @@ -106,7 +106,7 @@ __host__ size_type calculate_nwarps(std::shared_ptr exec, multiple = 32; } return std::min(multiple * nwarps_in_cuda, - static_cast(ceildiv(nnz, config::warp_size))); + size_type(ceildiv(nnz, config::warp_size))); } diff --git a/cuda/components/uninitialized_array.hpp b/cuda/components/uninitialized_array.hpp index 65d0538047e..8e6c438ad36 100644 --- a/cuda/components/uninitialized_array.hpp +++ b/cuda/components/uninitialized_array.hpp @@ -50,4 +50,4 @@ namespace cuda { } // namespace gko -#endif // GKO_CUDA_BASE_COMPONENTS_ARRAY_HPP_ +#endif // GKO_CUDA_COMPONENTS_UNINITIALIZED_ARRAY_HPP_ diff --git a/hip/components/atomic.hip.hpp b/hip/components/atomic.hip.hpp index 701a9817966..4c2f33cdaed 100644 --- a/hip/components/atomic.hip.hpp +++ b/hip/components/atomic.hip.hpp @@ -48,7 +48,7 @@ namespace hip { /** * @internal * - * @note It is not 'real' complex atomic add opeartion + * @note It is not 'real' complex atomic add operation */ __forceinline__ __device__ void atomic_add( thrust::complex *__restrict__ address, thrust::complex val) @@ -63,7 +63,7 @@ __forceinline__ __device__ void atomic_add( /** * @internal * - * @note It is not 'real' complex atomic add opeartion + * @note It is not 'real' complex atomic add operation */ __forceinline__ __device__ void atomic_add( thrust::complex *__restrict__ address, thrust::complex val) diff --git a/hip/components/format_conversion.hip.hpp b/hip/components/format_conversion.hip.hpp index 718ce06a01f..c146eb19a90 100644 --- a/hip/components/format_conversion.hip.hpp +++ b/hip/components/format_conversion.hip.hpp @@ -76,7 +76,7 @@ __host__ size_type calculate_nwarps(std::shared_ptr exec, } #endif // GINKGO_HIP_PLATFORM_NVCC return std::min(multiple * nwarps_in_hip, - static_cast(ceildiv(nnz, config::warp_size))); + size_type(ceildiv(nnz, config::warp_size))); } diff --git a/hip/matrix/coo_kernels.hip.cpp b/hip/matrix/coo_kernels.hip.cpp index 9363877dd21..173abfd72de 100644 --- a/hip/matrix/coo_kernels.hip.cpp +++ b/hip/matrix/coo_kernels.hip.cpp @@ -258,4 +258,4 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE( } // namespace coo } // namespace hip } // namespace kernels -} // namespace gko \ No newline at end of file +} // namespace gko diff --git a/hip/test/matrix/coo_kernels.hip.cpp b/hip/test/matrix/coo_kernels.hip.cpp index 447159e6256..a8e192804a3 100644 --- a/hip/test/matrix/coo_kernels.hip.cpp +++ b/hip/test/matrix/coo_kernels.hip.cpp @@ -200,6 +200,17 @@ TEST_F(Coo, SimpleApplyAddToDenseMatrixIsEquivalentToRef) } +TEST_F(Coo, SimpleApplyAddToLargeDenseMatrixIsEquivalentToRef) +{ + set_up_apply_data(33); + + mtx->apply2(y.get(), expected.get()); + dmtx->apply2(dy.get(), dresult.get()); + + GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); +} + + TEST_F(Coo, AdvancedApplyAddToDenseMatrixIsEquivalentToRef) { set_up_apply_data(3); @@ -211,6 +222,17 @@ TEST_F(Coo, AdvancedApplyAddToDenseMatrixIsEquivalentToRef) } +TEST_F(Coo, AdvancedApplyAddToLargeDenseMatrixIsEquivalentToRef) +{ + set_up_apply_data(33); + + mtx->apply2(y.get(), expected.get()); + dmtx->apply2(dy.get(), dresult.get()); + + GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); +} + + TEST_F(Coo, ConvertToDenseIsEquivalentToRef) { set_up_apply_data(); diff --git a/include/ginkgo/core/preconditioner/ilu.hpp b/include/ginkgo/core/preconditioner/ilu.hpp index 6b41cc176da..c13e444ba5c 100644 --- a/include/ginkgo/core/preconditioner/ilu.hpp +++ b/include/ginkgo/core/preconditioner/ilu.hpp @@ -276,8 +276,7 @@ class Ilu : public EnableLinOp> { * */ template - struct has_with_criteria : std::false_type { - }; + struct has_with_criteria : std::false_type {}; /** * @copydoc has_with_criteria @@ -291,8 +290,7 @@ class Ilu : public EnableLinOp> { SolverType, xstd::void_t>() .with_criteria(with_criteria_param_type()))>> - : std::true_type { - }; + : std::true_type {}; /**