From 153aae798e95b31b14ce8f51bba40c9d80999fc6 Mon Sep 17 00:00:00 2001 From: "Author: Daniel Arndt" Date: Mon, 26 Nov 2018 14:09:20 +0000 Subject: [PATCH] Fix tests --- .../deal.II/matrix_free/cuda_matrix_free.h | 12 ++--- .../matrix_free/cuda_matrix_free.templates.h | 52 ++++++++++--------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/include/deal.II/matrix_free/cuda_matrix_free.h b/include/deal.II/matrix_free/cuda_matrix_free.h index 75af6c004e..a8932d9b32 100644 --- a/include/deal.II/matrix_free/cuda_matrix_free.h +++ b/include/deal.II/matrix_free/cuda_matrix_free.h @@ -252,12 +252,12 @@ namespace CUDAWrappers * Initializes the data structures. */ void - reinit(const Mapping & mapping, - const DoFHandler & dof_handler, - const AffineConstraints &constraints, - const Quadrature<1> & quad, - std::shared_ptr comm, - const AdditionalData additional_data); + internal_reinit(const Mapping & mapping, + const DoFHandler & dof_handler, + const AffineConstraints &constraints, + const Quadrature<1> & quad, + std::shared_ptr comm, + const AdditionalData additional_data); /** * Helper function. Loop over all the cells and apply the functor on each diff --git a/include/deal.II/matrix_free/cuda_matrix_free.templates.h b/include/deal.II/matrix_free/cuda_matrix_free.templates.h index 89625a885c..9e8c5e35f5 100644 --- a/include/deal.II/matrix_free/cuda_matrix_free.templates.h +++ b/include/deal.II/matrix_free/cuda_matrix_free.templates.h @@ -520,12 +520,12 @@ namespace CUDAWrappers const MPI_Comm & comm, const AdditionalData additional_data) { - reinit(mapping, - dof_handler, - constraints, - quad, - std::make_shared(comm), - additional_data); + internal_reinit(mapping, + dof_handler, + constraints, + quad, + std::make_shared(comm), + additional_data); } @@ -538,12 +538,12 @@ namespace CUDAWrappers const MPI_Comm & comm, const AdditionalData additional_data) { - reinit(StaticMappingQ1::mapping, - dof_handler, - constraints, - quad, - std::make_shared(comm), - additional_data); + internal_reinit(StaticMappingQ1::mapping, + dof_handler, + constraints, + quad, + std::make_shared(comm), + additional_data); } @@ -556,7 +556,8 @@ namespace CUDAWrappers const Quadrature<1> & quad, const AdditionalData additional_data) { - reinit(mapping, dof_handler, constraints, quad, nullptr, additional_data); + internal_reinit( + mapping, dof_handler, constraints, quad, nullptr, additional_data); } @@ -568,12 +569,12 @@ namespace CUDAWrappers const Quadrature<1> & quad, const AdditionalData additional_data) { - reinit(StaticMappingQ1::mapping, - dof_handler, - constraints, - quad, - nullptr, - additional_data); + internal_reinit(StaticMappingQ1::mapping, + dof_handler, + constraints, + quad, + nullptr, + additional_data); } @@ -753,12 +754,13 @@ namespace CUDAWrappers template void - MatrixFree::reinit(const Mapping & mapping, - const DoFHandler & dof_handler, - const AffineConstraints &constraints, - const Quadrature<1> & quad, - std::shared_ptr comm, - const AdditionalData additional_data) + MatrixFree::internal_reinit( + const Mapping & mapping, + const DoFHandler & dof_handler, + const AffineConstraints &constraints, + const Quadrature<1> & quad, + std::shared_ptr comm, + const AdditionalData additional_data) { if (typeid(Number) == typeid(double)) cudaDeviceSetSharedMemConfig(cudaSharedMemBankSizeEightByte); -- 2.39.5