From 2ca83a172e14cc0c51fb6b46e1778ea02dcda877 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 6 Jan 2023 13:29:54 -0500 Subject: [PATCH] Address review comments --- include/deal.II/lac/affine_constraints.templates.h | 2 +- tests/base/kokkos_point.cc | 3 --- tests/base/kokkos_tensor_01.cc | 1 - tests/base/kokkos_tensor_02.cc | 2 +- tests/lac/affine_constraints_set_zero.cc | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/deal.II/lac/affine_constraints.templates.h b/include/deal.II/lac/affine_constraints.templates.h index c5d27717ff..8051db3ed7 100644 --- a/include/deal.II/lac/affine_constraints.templates.h +++ b/include/deal.II/lac/affine_constraints.templates.h @@ -2289,11 +2289,11 @@ namespace internal ExecutionSpace exec; auto local_values = vec.get_values(); Kokkos::parallel_for( + "set_zero_parallel", Kokkos::RangePolicy(exec, 0, n_constraints), KOKKOS_LAMBDA(int i) { local_values[constrained_local_dofs_device[i]] = 0; }); - exec.fence(); vec.zero_out_ghost_values(); } diff --git a/tests/base/kokkos_point.cc b/tests/base/kokkos_point.cc index 093069fc00..0ed4ba5bec 100644 --- a/tests/base/kokkos_point.cc +++ b/tests/base/kokkos_point.cc @@ -28,7 +28,6 @@ test_gpu() Kokkos::View check("check", n_tests); - // Miscellaneous using ExecutionSpace = MemorySpace::Default::kokkos_space::execution_space; ExecutionSpace exec; Kokkos::parallel_for( @@ -83,8 +82,6 @@ test_gpu() check[15] = s_4; }); - exec.fence(); - auto check_host = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace{}, check); diff --git a/tests/base/kokkos_tensor_01.cc b/tests/base/kokkos_tensor_01.cc index db135575ff..ac98facd07 100644 --- a/tests/base/kokkos_tensor_01.cc +++ b/tests/base/kokkos_tensor_01.cc @@ -65,7 +65,6 @@ test_gpu() norm_dev() = t_dev().norm(); norm_square_dev() = t_dev().norm_square(); }); - exec.fence(); // Copy the result to the host Kokkos::deep_copy(norm_host, norm_dev); diff --git a/tests/base/kokkos_tensor_02.cc b/tests/base/kokkos_tensor_02.cc index 7581ecb970..3c5310a92b 100644 --- a/tests/base/kokkos_tensor_02.cc +++ b/tests/base/kokkos_tensor_02.cc @@ -28,7 +28,7 @@ struct InitFunctor<0, dim, Number> Kokkos::View, MemorySpace::Default::kokkos_space> t; KOKKOS_FUNCTION void - operator()(int k) const + operator()(int) const { t() = 1.; } diff --git a/tests/lac/affine_constraints_set_zero.cc b/tests/lac/affine_constraints_set_zero.cc index e64475d284..1ee19d6919 100644 --- a/tests/lac/affine_constraints_set_zero.cc +++ b/tests/lac/affine_constraints_set_zero.cc @@ -63,7 +63,6 @@ test() int offset = myid * numproc; ghosted_values[i] = 1.0 + i + offset; }); - exec.fence(); ghosted.compress(VectorOperation::insert); deallog << "ghosted vector before:" << std::endl; -- 2.39.5