From ec35793ffe9c12f15226ec7be7c23f51240c7dae Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 2 Dec 2020 11:49:42 +0100 Subject: [PATCH 1/3] format everything --- benchmark/solver/solver.cpp | 1 - benchmark/utils/preconditioners.hpp | 1 - core/base/allocator.hpp | 2 +- core/base/utils.hpp | 13 +++++++------ core/device_hooks/dpcpp_hooks.cpp | 1 - core/preconditioner/isai_kernels.hpp | 4 +++- core/test/utils/unsort_matrix.hpp | 1 + cuda/base/types.hpp | 6 +++--- cuda/factorization/factorization_kernels.cu | 1 + .../par_ilut_approx_filter_kernel.cu | 1 - cuda/factorization/par_ilut_filter_kernel.cu | 2 +- cuda/solver/idr_kernels.cu | 2 +- cuda/test/reorder/rcm_kernels.cpp | 1 - dev_tools/scripts/config | 16 ++++++++++++++++ dev_tools/scripts/regroup | 2 +- examples/ginkgo-overhead/ginkgo-overhead.cpp | 3 ++- hip/base/types.hip.hpp | 4 ++-- .../par_ilut_approx_filter_kernel.hip.cpp | 5 ++--- hip/factorization/par_ilut_filter_kernel.hip.cpp | 2 +- hip/factorization/par_ilut_select_kernel.hip.cpp | 4 ++-- hip/solver/idr_kernels.hip.cpp | 2 +- include/ginkgo/core/base/abstract_factory.hpp | 6 +++--- include/ginkgo/core/base/array.hpp | 6 +++--- include/ginkgo/core/base/combination.hpp | 6 +++--- include/ginkgo/core/base/composition.hpp | 6 +++--- include/ginkgo/core/base/dim.hpp | 6 +++--- include/ginkgo/core/base/exception.hpp | 6 +++--- include/ginkgo/core/base/exception_helpers.hpp | 6 +++--- include/ginkgo/core/base/executor.hpp | 6 +++--- include/ginkgo/core/base/lin_op.hpp | 6 +++--- include/ginkgo/core/base/math.hpp | 6 +++--- .../ginkgo/core/base/matrix_assembly_data.hpp | 6 +++--- include/ginkgo/core/base/matrix_data.hpp | 6 +++--- include/ginkgo/core/base/mtx_io.hpp | 6 +++--- include/ginkgo/core/base/name_demangling.hpp | 6 +++--- include/ginkgo/core/base/perturbation.hpp | 6 +++--- include/ginkgo/core/base/polymorphic_object.hpp | 6 +++--- include/ginkgo/core/base/range.hpp | 6 +++--- include/ginkgo/core/base/range_accessors.hpp | 6 +++--- include/ginkgo/core/base/std_extensions.hpp | 6 +++--- include/ginkgo/core/base/types.hpp | 6 +++--- include/ginkgo/core/base/utils.hpp | 6 +++--- include/ginkgo/core/base/version.hpp | 6 +++--- include/ginkgo/core/factorization/ilu.hpp | 6 +++--- include/ginkgo/core/factorization/par_ict.hpp | 6 +++--- include/ginkgo/core/factorization/par_ilu.hpp | 6 +++--- include/ginkgo/core/factorization/par_ilut.hpp | 6 +++--- include/ginkgo/core/log/convergence.hpp | 6 +++--- include/ginkgo/core/log/logger.hpp | 6 +++--- include/ginkgo/core/log/papi.hpp | 6 +++--- include/ginkgo/core/log/record.hpp | 6 +++--- include/ginkgo/core/log/stream.hpp | 6 +++--- include/ginkgo/core/matrix/coo.hpp | 6 +++--- include/ginkgo/core/matrix/csr.hpp | 6 +++--- include/ginkgo/core/matrix/dense.hpp | 6 +++--- include/ginkgo/core/matrix/diagonal.hpp | 6 +++--- include/ginkgo/core/matrix/ell.hpp | 6 +++--- include/ginkgo/core/matrix/hybrid.hpp | 6 +++--- include/ginkgo/core/matrix/identity.hpp | 6 +++--- include/ginkgo/core/matrix/permutation.hpp | 6 +++--- include/ginkgo/core/matrix/sellp.hpp | 6 +++--- include/ginkgo/core/matrix/sparsity_csr.hpp | 6 +++--- include/ginkgo/core/preconditioner/ilu.hpp | 6 +++--- include/ginkgo/core/preconditioner/isai.hpp | 6 +++--- include/ginkgo/core/preconditioner/jacobi.hpp | 14 +++++++------- include/ginkgo/core/reorder/rcm.hpp | 6 +++--- include/ginkgo/core/reorder/reordering_base.hpp | 6 +++--- include/ginkgo/core/solver/bicg.hpp | 11 ++++++----- include/ginkgo/core/solver/bicgstab.hpp | 6 +++--- include/ginkgo/core/solver/cg.hpp | 6 +++--- include/ginkgo/core/solver/cgs.hpp | 6 +++--- include/ginkgo/core/solver/fcg.hpp | 6 +++--- include/ginkgo/core/solver/gmres.hpp | 6 +++--- include/ginkgo/core/solver/idr.hpp | 6 +++--- include/ginkgo/core/solver/ir.hpp | 6 +++--- include/ginkgo/core/solver/lower_trs.hpp | 6 +++--- include/ginkgo/core/solver/upper_trs.hpp | 6 +++--- include/ginkgo/core/stop/combined.hpp | 6 +++--- include/ginkgo/core/stop/criterion.hpp | 6 +++--- include/ginkgo/core/stop/iteration.hpp | 6 +++--- include/ginkgo/core/stop/residual_norm.hpp | 6 +++--- .../ginkgo/core/stop/residual_norm_reduction.hpp | 6 +++--- include/ginkgo/core/stop/stopping_status.hpp | 6 +++--- include/ginkgo/core/stop/time.hpp | 6 +++--- include/ginkgo/core/synthesizer/containers.hpp | 6 +++--- omp/solver/idr_kernels.cpp | 2 +- omp/test/solver/idr_kernels.cpp | 4 ++-- reference/components/csr_spgeam.hpp | 6 +++--- reference/reorder/rcm_kernels.cpp | 1 - reference/solver/idr_kernels.cpp | 2 +- reference/test/preconditioner/isai_kernels.cpp | 4 ++-- reference/test/reorder/rcm_kernels.cpp | 2 +- test_install/test_install.cpp | 12 ++++++------ test_install/test_install_cuda.cu | 10 ++++------ 94 files changed, 264 insertions(+), 250 deletions(-) diff --git a/benchmark/solver/solver.cpp b/benchmark/solver/solver.cpp index 937244e4c2a..11169effae8 100644 --- a/benchmark/solver/solver.cpp +++ b/benchmark/solver/solver.cpp @@ -48,7 +48,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "benchmark/utils/loggers.hpp" #include "benchmark/utils/overhead_linop.hpp" #include "benchmark/utils/preconditioners.hpp" -#include "ginkgo/core/preconditioner/isai.hpp" // some Ginkgo shortcuts diff --git a/benchmark/utils/preconditioners.hpp b/benchmark/utils/preconditioners.hpp index 0542a72da4b..4ec84d9acd5 100644 --- a/benchmark/utils/preconditioners.hpp +++ b/benchmark/utils/preconditioners.hpp @@ -30,7 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ - #ifndef GKO_BENCHMARK_UTILS_PRECONDITIONERS_HPP_ #define GKO_BENCHMARK_UTILS_PRECONDITIONERS_HPP_ diff --git a/core/base/allocator.hpp b/core/base/allocator.hpp index 3f618974b46..6a654fc56d6 100644 --- a/core/base/allocator.hpp +++ b/core/base/allocator.hpp @@ -172,4 +172,4 @@ using unordered_map = } // namespace gko -#endif // GKO_CORE_BASE_ALLOCATOR_HPP_ \ No newline at end of file +#endif // GKO_CORE_BASE_ALLOCATOR_HPP_ diff --git a/core/base/utils.hpp b/core/base/utils.hpp index ace930bd116..9842917b19d 100644 --- a/core/base/utils.hpp +++ b/core/base/utils.hpp @@ -30,8 +30,11 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_INTERNAL_CORE_BASE_UTILS_HPP_ -#define GKO_INTERNAL_CORE_BASE_UTILS_HPP_ +#ifndef GKO_CORE_BASE_UTILS_HPP_ +#define GKO_CORE_BASE_UTILS_HPP_ + + +#include #include @@ -40,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include #include @@ -64,8 +66,7 @@ namespace detail { template -struct conversion_sort_helper { -}; +struct conversion_sort_helper {}; template struct conversion_sort_helper> { @@ -222,4 +223,4 @@ std::shared_ptr convert_to_with_sorting( } // namespace gko -#endif // GKO_INTERNAL_CORE_BASE_UTILS_HPP_ +#endif // GKO_CORE_BASE_UTILS_HPP_ diff --git a/core/device_hooks/dpcpp_hooks.cpp b/core/device_hooks/dpcpp_hooks.cpp index cce8fdec27e..9d6c57f11a4 100644 --- a/core/device_hooks/dpcpp_hooks.cpp +++ b/core/device_hooks/dpcpp_hooks.cpp @@ -30,7 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ - #include #include diff --git a/core/preconditioner/isai_kernels.hpp b/core/preconditioner/isai_kernels.hpp index 8093f454255..c8e1dcf4b91 100644 --- a/core/preconditioner/isai_kernels.hpp +++ b/core/preconditioner/isai_kernels.hpp @@ -34,10 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define GKO_CORE_PRECONDITIONER_ISAI_KERNELS_HPP_ -#include #include +#include + + namespace gko { namespace kernels { diff --git a/core/test/utils/unsort_matrix.hpp b/core/test/utils/unsort_matrix.hpp index 3a4b83b6b4e..8d1f7d7d498 100644 --- a/core/test/utils/unsort_matrix.hpp +++ b/core/test/utils/unsort_matrix.hpp @@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GKO_CORE_TEST_UTILS_UNSORT_MATRIX_HPP_ #define GKO_CORE_TEST_UTILS_UNSORT_MATRIX_HPP_ + #include #include diff --git a/cuda/base/types.hpp b/cuda/base/types.hpp index 580976b265f..43130c12246 100644 --- a/cuda/base/types.hpp +++ b/cuda/base/types.hpp @@ -34,6 +34,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define GKO_CUDA_BASE_TYPES_HPP_ +#include + + #include @@ -43,9 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include - - namespace gko { diff --git a/cuda/factorization/factorization_kernels.cu b/cuda/factorization/factorization_kernels.cu index bcf861a1acf..8bbd5ec3448 100644 --- a/cuda/factorization/factorization_kernels.cu +++ b/cuda/factorization/factorization_kernels.cu @@ -35,6 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include + #include "core/components/prefix_sum.hpp" #include "core/matrix/csr_builder.hpp" #include "cuda/base/config.hpp" diff --git a/cuda/factorization/par_ilut_approx_filter_kernel.cu b/cuda/factorization/par_ilut_approx_filter_kernel.cu index 1a17572d9bd..6ad16f99b5b 100644 --- a/cuda/factorization/par_ilut_approx_filter_kernel.cu +++ b/cuda/factorization/par_ilut_approx_filter_kernel.cu @@ -44,7 +44,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/components/prefix_sum.hpp" -#include "core/factorization/par_ilut_kernels.hpp" #include "core/matrix/coo_builder.hpp" #include "core/matrix/csr_builder.hpp" #include "core/matrix/csr_kernels.hpp" diff --git a/cuda/factorization/par_ilut_filter_kernel.cu b/cuda/factorization/par_ilut_filter_kernel.cu index 1b2e6e921f8..e1f0afd4ad4 100644 --- a/cuda/factorization/par_ilut_filter_kernel.cu +++ b/cuda/factorization/par_ilut_filter_kernel.cu @@ -159,4 +159,4 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE( } // namespace par_ilut_factorization } // namespace cuda } // namespace kernels -} // namespace gko \ No newline at end of file +} // namespace gko diff --git a/cuda/solver/idr_kernels.cu b/cuda/solver/idr_kernels.cu index 83f018c4330..be430bac4e4 100644 --- a/cuda/solver/idr_kernels.cu +++ b/cuda/solver/idr_kernels.cu @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/solver/idr_kernels.hpp" -#include #include +#include #include diff --git a/cuda/test/reorder/rcm_kernels.cpp b/cuda/test/reorder/rcm_kernels.cpp index d4822b36859..9e72e604cf2 100644 --- a/cuda/test/reorder/rcm_kernels.cpp +++ b/cuda/test/reorder/rcm_kernels.cpp @@ -30,7 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ - #include diff --git a/dev_tools/scripts/config b/dev_tools/scripts/config index ba29fed413b..49ced95b64d 100644 --- a/dev_tools/scripts/config +++ b/dev_tools/scripts/config @@ -6,10 +6,26 @@ - FixInclude: "hip/hip_runtime.h" - "(cuda|hip|omp|dpcpp)/test/factorization/par_ilu_kernels" - FixInclude: "core/factorization/par_ilu_kernels.hpp" +- "(cuda|hip|omp|dpcpp)/test/factorization/par_ilut_kernels" + - FixInclude: "core/factorization/par_ilut_kernels.hpp" +- "(cuda|hip|omp|dpcpp)/test/factorization/par_ict_kernels" + - FixInclude: "core/factorization/par_ict_kernels.hpp" +- "cuda/factorization/par_ilut_select_common" + - FixInclude: "cuda/factorization/par_ilut_select_common.cuh" +- "hip/factorization/par_ilut_select_common" + - FixInclude: "hip/factorization/par_ilut_select_common.hip.hpp" +- "(cuda|hip|dpcpp)/factorization/par_ilut_" + - FixInclude: "core/factorization/par_ilut_kernels.hpp" +- "(cuda|hip|dpcpp)/factorization/par_ict_" + - FixInclude: "core/factorization/par_ict_kernels.hpp" - "(cuda|hip|dpcpp)/preconditioner/jacobi_" - FixInclude: "core/preconditioner/jacobi_kernels.hpp" - "core/test/base/(extended_float|iterator_factory)" - RemoveTest: "true" +- "core/test/base/allocator" + - FixInclude: "core/base/allocator.hpp" +- "reference/test/base/utils" + - FixInclude: "core/base/utils.hpp" - "_builder\.cpp" - RemoveTest: "true" - "_builder\.hpp" diff --git a/dev_tools/scripts/regroup b/dev_tools/scripts/regroup index 5351dc7009e..9e8a5172d05 100644 --- a/dev_tools/scripts/regroup +++ b/dev_tools/scripts/regroup @@ -2,7 +2,7 @@ IncludeBlocks: Regroup IncludeCategories: - Regex: '^<(rapidjson|gflags|gtest|papi).*' Priority: 3 - - Regex: '^<(omp|cu|hip|thrust|CL).*' + - Regex: '^<(omp|cu|hip|thrust|CL/|cooperative).*' Priority: 2 - Regex: '^ -[[noreturn]] void print_usage_and_exit(const char *name) { +[[noreturn]] void print_usage_and_exit(const char *name) +{ std::cerr << "Usage: " << name << " [NUM_ITERS]" << std::endl; std::exit(-1); } diff --git a/hip/base/types.hip.hpp b/hip/base/types.hip.hpp index 2a7395fac72..4db75f4024e 100644 --- a/hip/base/types.hip.hpp +++ b/hip/base/types.hip.hpp @@ -34,10 +34,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define GKO_HIP_BASE_TYPES_HIP_HPP_ -#include +#include -#include +#include #include diff --git a/hip/factorization/par_ilut_approx_filter_kernel.hip.cpp b/hip/factorization/par_ilut_approx_filter_kernel.hip.cpp index 1d3e1eba6f7..7955898a291 100644 --- a/hip/factorization/par_ilut_approx_filter_kernel.hip.cpp +++ b/hip/factorization/par_ilut_approx_filter_kernel.hip.cpp @@ -33,10 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/factorization/par_ilut_kernels.hpp" -#include +#include -#include +#include #include @@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/components/prefix_sum.hpp" -#include "core/factorization/par_ilut_kernels.hpp" #include "core/matrix/coo_builder.hpp" #include "core/matrix/csr_builder.hpp" #include "core/matrix/csr_kernels.hpp" diff --git a/hip/factorization/par_ilut_filter_kernel.hip.cpp b/hip/factorization/par_ilut_filter_kernel.hip.cpp index f1b57bd9f32..c08b7ef767e 100644 --- a/hip/factorization/par_ilut_filter_kernel.hip.cpp +++ b/hip/factorization/par_ilut_filter_kernel.hip.cpp @@ -163,4 +163,4 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE( } // namespace par_ilut_factorization } // namespace hip } // namespace kernels -} // namespace gko \ No newline at end of file +} // namespace gko diff --git a/hip/factorization/par_ilut_select_kernel.hip.cpp b/hip/factorization/par_ilut_select_kernel.hip.cpp index 9d8c73562e9..3f92051989b 100644 --- a/hip/factorization/par_ilut_select_kernel.hip.cpp +++ b/hip/factorization/par_ilut_select_kernel.hip.cpp @@ -33,10 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/factorization/par_ilut_kernels.hpp" -#include +#include -#include +#include #include diff --git a/hip/solver/idr_kernels.hip.cpp b/hip/solver/idr_kernels.hip.cpp index a2c3025a136..5bb26f25399 100644 --- a/hip/solver/idr_kernels.hip.cpp +++ b/hip/solver/idr_kernels.hip.cpp @@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/solver/idr_kernels.hpp" -#include #include +#include #include diff --git a/include/ginkgo/core/base/abstract_factory.hpp b/include/ginkgo/core/base/abstract_factory.hpp index 2db193027a1..ff185509224 100644 --- a/include/ginkgo/core/base/abstract_factory.hpp +++ b/include/ginkgo/core/base/abstract_factory.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_ABSTRACT_FACTORY_HPP_ -#define GKO_CORE_BASE_ABSTRACT_FACTORY_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_ABSTRACT_FACTORY_HPP_ +#define GKO_PUBLIC_CORE_BASE_ABSTRACT_FACTORY_HPP_ #include @@ -289,4 +289,4 @@ struct enable_parameters_type { } // namespace gko -#endif // GKO_CORE_BASE_ABSTRACT_FACTORY_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_ABSTRACT_FACTORY_HPP_ diff --git a/include/ginkgo/core/base/array.hpp b/include/ginkgo/core/base/array.hpp index 59960520edf..7c04ff0bfb2 100644 --- a/include/ginkgo/core/base/array.hpp +++ b/include/ginkgo/core/base/array.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_ARRAY_HPP_ -#define GKO_CORE_BASE_ARRAY_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_ARRAY_HPP_ +#define GKO_PUBLIC_CORE_BASE_ARRAY_HPP_ #include @@ -619,4 +619,4 @@ class copy_back_deleter> { } // namespace gko -#endif // GKO_CORE_BASE_ARRAY_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_ARRAY_HPP_ diff --git a/include/ginkgo/core/base/combination.hpp b/include/ginkgo/core/base/combination.hpp index 908013a3e57..5ca773bbc3e 100644 --- a/include/ginkgo/core/base/combination.hpp +++ b/include/ginkgo/core/base/combination.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_COMBINATION_HPP_ -#define GKO_CORE_BASE_COMBINATION_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_COMBINATION_HPP_ +#define GKO_PUBLIC_CORE_BASE_COMBINATION_HPP_ #include @@ -207,4 +207,4 @@ class Combination : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_BASE_COMBINATION_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_COMBINATION_HPP_ diff --git a/include/ginkgo/core/base/composition.hpp b/include/ginkgo/core/base/composition.hpp index 4a7ecc7874f..dfcfb13c5ad 100644 --- a/include/ginkgo/core/base/composition.hpp +++ b/include/ginkgo/core/base/composition.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_COMPOSITION_HPP_ -#define GKO_CORE_BASE_COMPOSITION_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_COMPOSITION_HPP_ +#define GKO_PUBLIC_CORE_BASE_COMPOSITION_HPP_ #include @@ -170,4 +170,4 @@ class Composition : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_BASE_COMPOSITION_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_COMPOSITION_HPP_ diff --git a/include/ginkgo/core/base/dim.hpp b/include/ginkgo/core/base/dim.hpp index e0aaf25666c..3030f0d1442 100644 --- a/include/ginkgo/core/base/dim.hpp +++ b/include/ginkgo/core/base/dim.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_DIM_HPP_ -#define GKO_CORE_BASE_DIM_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_DIM_HPP_ +#define GKO_PUBLIC_CORE_BASE_DIM_HPP_ #include @@ -246,4 +246,4 @@ constexpr GKO_ATTRIBUTES GKO_INLINE dim<2, DimensionType> transpose( } // namespace gko -#endif // GKO_CORE_BASE_DIM_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_DIM_HPP_ diff --git a/include/ginkgo/core/base/exception.hpp b/include/ginkgo/core/base/exception.hpp index 20ac5ba8958..6ede978ffc3 100644 --- a/include/ginkgo/core/base/exception.hpp +++ b/include/ginkgo/core/base/exception.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_EXCEPTION_HPP_ -#define GKO_CORE_BASE_EXCEPTION_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_EXCEPTION_HPP_ +#define GKO_PUBLIC_CORE_BASE_EXCEPTION_HPP_ #include @@ -534,4 +534,4 @@ class KernelNotFound : public Error { } // namespace gko -#endif // GKO_CORE_BASE_EXCEPTION_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_EXCEPTION_HPP_ diff --git a/include/ginkgo/core/base/exception_helpers.hpp b/include/ginkgo/core/base/exception_helpers.hpp index 10df01005ab..e14bb1c0c61 100644 --- a/include/ginkgo/core/base/exception_helpers.hpp +++ b/include/ginkgo/core/base/exception_helpers.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_EXCEPTION_HELPERS_HPP_ -#define GKO_CORE_BASE_EXCEPTION_HELPERS_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_EXCEPTION_HELPERS_HPP_ +#define GKO_PUBLIC_CORE_BASE_EXCEPTION_HELPERS_HPP_ #include @@ -569,4 +569,4 @@ inline T ensure_allocated_impl(T ptr, const std::string &file, int line, } // namespace gko -#endif // GKO_CORE_BASE_EXCEPTION_HELPERS_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_EXCEPTION_HELPERS_HPP_ diff --git a/include/ginkgo/core/base/executor.hpp b/include/ginkgo/core/base/executor.hpp index 950e7e1b2ed..2cc18bf3502 100644 --- a/include/ginkgo/core/base/executor.hpp +++ b/include/ginkgo/core/base/executor.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_EXECUTOR_HPP_ -#define GKO_CORE_BASE_EXECUTOR_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_EXECUTOR_HPP_ +#define GKO_PUBLIC_CORE_BASE_EXECUTOR_HPP_ #include @@ -1421,4 +1421,4 @@ using DefaultExecutor = DpcppExecutor; } // namespace gko -#endif // GKO_CORE_BASE_EXECUTOR_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_EXECUTOR_HPP_ diff --git a/include/ginkgo/core/base/lin_op.hpp b/include/ginkgo/core/base/lin_op.hpp index a1530ff2880..1512802edb6 100644 --- a/include/ginkgo/core/base/lin_op.hpp +++ b/include/ginkgo/core/base/lin_op.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_LIN_OP_HPP_ -#define GKO_CORE_BASE_LIN_OP_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_LIN_OP_HPP_ +#define GKO_PUBLIC_CORE_BASE_LIN_OP_HPP_ #include @@ -1074,4 +1074,4 @@ public: \ } // namespace gko -#endif // GKO_CORE_BASE_LIN_OP_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_LIN_OP_HPP_ diff --git a/include/ginkgo/core/base/math.hpp b/include/ginkgo/core/base/math.hpp index 077830602a3..1cf729e2d2e 100644 --- a/include/ginkgo/core/base/math.hpp +++ b/include/ginkgo/core/base/math.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_MATH_HPP_ -#define GKO_CORE_BASE_MATH_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_MATH_HPP_ +#define GKO_PUBLIC_CORE_BASE_MATH_HPP_ #include @@ -1026,4 +1026,4 @@ using cl::sycl::sqrt; } // namespace gko -#endif // GKO_CORE_BASE_MATH_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_MATH_HPP_ diff --git a/include/ginkgo/core/base/matrix_assembly_data.hpp b/include/ginkgo/core/base/matrix_assembly_data.hpp index b54d10f4db1..5456a75e6e9 100644 --- a/include/ginkgo/core/base/matrix_assembly_data.hpp +++ b/include/ginkgo/core/base/matrix_assembly_data.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_MATRIX_ASSEMBLY_DATA_HPP_ -#define GKO_CORE_BASE_MATRIX_ASSEMBLY_DATA_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_MATRIX_ASSEMBLY_DATA_HPP_ +#define GKO_PUBLIC_CORE_BASE_MATRIX_ASSEMBLY_DATA_HPP_ #include @@ -204,4 +204,4 @@ class matrix_assembly_data { } // namespace gko -#endif // GKO_CORE_BASE_MATRIX_ASSEMBLY_DATA_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_MATRIX_ASSEMBLY_DATA_HPP_ diff --git a/include/ginkgo/core/base/matrix_data.hpp b/include/ginkgo/core/base/matrix_data.hpp index 94c01461079..8597b31df68 100644 --- a/include/ginkgo/core/base/matrix_data.hpp +++ b/include/ginkgo/core/base/matrix_data.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_MATRIX_DATA_HPP_ -#define GKO_CORE_BASE_MATRIX_DATA_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_MATRIX_DATA_HPP_ +#define GKO_PUBLIC_CORE_BASE_MATRIX_DATA_HPP_ #include @@ -532,4 +532,4 @@ struct matrix_data { } // namespace gko -#endif // GKO_CORE_BASE_MATRIX_DATA_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_MATRIX_DATA_HPP_ diff --git a/include/ginkgo/core/base/mtx_io.hpp b/include/ginkgo/core/base/mtx_io.hpp index 8ebe65e973a..38977fe04c0 100644 --- a/include/ginkgo/core/base/mtx_io.hpp +++ b/include/ginkgo/core/base/mtx_io.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_MTX_IO_HPP_ -#define GKO_CORE_BASE_MTX_IO_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_MTX_IO_HPP_ +#define GKO_PUBLIC_CORE_BASE_MTX_IO_HPP_ #include @@ -145,4 +145,4 @@ inline void write(StreamType &&os, MatrixType *matrix, } // namespace gko -#endif // GKO_CORE_BASE_MTX_IO_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_MTX_IO_HPP_ diff --git a/include/ginkgo/core/base/name_demangling.hpp b/include/ginkgo/core/base/name_demangling.hpp index adfb7392412..fb41561fa9f 100644 --- a/include/ginkgo/core/base/name_demangling.hpp +++ b/include/ginkgo/core/base/name_demangling.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_NAME_DEMANGLING_HPP_ -#define GKO_CORE_BASE_NAME_DEMANGLING_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_NAME_DEMANGLING_HPP_ +#define GKO_PUBLIC_CORE_BASE_NAME_DEMANGLING_HPP_ #include @@ -141,4 +141,4 @@ std::string get_enclosing_scope(const T &) } // namespace gko -#endif // GKO_CORE_BASE_NAME_DEMANGLING_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_NAME_DEMANGLING_HPP_ diff --git a/include/ginkgo/core/base/perturbation.hpp b/include/ginkgo/core/base/perturbation.hpp index 16e4406605b..d410856b00b 100644 --- a/include/ginkgo/core/base/perturbation.hpp +++ b/include/ginkgo/core/base/perturbation.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_PERTURBATION_HPP_ -#define GKO_CORE_BASE_PERTURBATION_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_PERTURBATION_HPP_ +#define GKO_PUBLIC_CORE_BASE_PERTURBATION_HPP_ #include @@ -205,4 +205,4 @@ class Perturbation : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_BASE_PERTURBATION_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_PERTURBATION_HPP_ diff --git a/include/ginkgo/core/base/polymorphic_object.hpp b/include/ginkgo/core/base/polymorphic_object.hpp index c3554ea2455..ad712c2cd08 100644 --- a/include/ginkgo/core/base/polymorphic_object.hpp +++ b/include/ginkgo/core/base/polymorphic_object.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_POLYMORPHIC_OBJECT_HPP_ -#define GKO_CORE_BASE_POLYMORPHIC_OBJECT_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_POLYMORPHIC_OBJECT_HPP_ +#define GKO_PUBLIC_CORE_BASE_POLYMORPHIC_OBJECT_HPP_ #include @@ -652,4 +652,4 @@ class EnableCreateMethod { } // namespace gko -#endif // GKO_CORE_BASE_POLYMORPHIC_OBJECT_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_POLYMORPHIC_OBJECT_HPP_ diff --git a/include/ginkgo/core/base/range.hpp b/include/ginkgo/core/base/range.hpp index 10b77ad8a29..6e59ee3c637 100644 --- a/include/ginkgo/core/base/range.hpp +++ b/include/ginkgo/core/base/range.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_RANGE_HPP_ -#define GKO_CORE_BASE_RANGE_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_RANGE_HPP_ +#define GKO_PUBLIC_CORE_BASE_RANGE_HPP_ #include @@ -1007,4 +1007,4 @@ GKO_BIND_RANGE_OPERATION_TO_OPERATOR(mmul_operation, mmul); } // namespace gko -#endif // GKO_CORE_BASE_RANGE_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_RANGE_HPP_ diff --git a/include/ginkgo/core/base/range_accessors.hpp b/include/ginkgo/core/base/range_accessors.hpp index 4040301f287..28b9ac6b51f 100644 --- a/include/ginkgo/core/base/range_accessors.hpp +++ b/include/ginkgo/core/base/range_accessors.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_RANGE_ACCESSORS_HPP_ -#define GKO_CORE_BASE_RANGE_ACCESSORS_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_RANGE_ACCESSORS_HPP_ +#define GKO_PUBLIC_CORE_BASE_RANGE_ACCESSORS_HPP_ #include @@ -190,4 +190,4 @@ class row_major { } // namespace gko -#endif // GKO_CORE_BASE_RANGE_ACCESSORS_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_RANGE_ACCESSORS_HPP_ diff --git a/include/ginkgo/core/base/std_extensions.hpp b/include/ginkgo/core/base/std_extensions.hpp index af52f8b33d7..c1cec39b6e4 100644 --- a/include/ginkgo/core/base/std_extensions.hpp +++ b/include/ginkgo/core/base/std_extensions.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_STD_EXTENSIONS_HPP_ -#define GKO_CORE_BASE_STD_EXTENSIONS_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_STD_EXTENSIONS_HPP_ +#define GKO_PUBLIC_CORE_BASE_STD_EXTENSIONS_HPP_ #include @@ -120,4 +120,4 @@ constexpr bool less_equal(const T &&lhs, const T &&rhs) } // namespace gko -#endif // GKO_CORE_BASE_STD_EXTENSIONS_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_STD_EXTENSIONS_HPP_ diff --git a/include/ginkgo/core/base/types.hpp b/include/ginkgo/core/base/types.hpp index d63623fea40..3cca7cbfd8a 100644 --- a/include/ginkgo/core/base/types.hpp +++ b/include/ginkgo/core/base/types.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_TYPES_HPP_ -#define GKO_CORE_BASE_TYPES_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_TYPES_HPP_ +#define GKO_PUBLIC_CORE_BASE_TYPES_HPP_ #include @@ -474,4 +474,4 @@ GKO_ATTRIBUTES constexpr bool operator!=(precision_reduction x, } // namespace gko -#endif // GKO_CORE_BASE_TYPES_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_TYPES_HPP_ diff --git a/include/ginkgo/core/base/utils.hpp b/include/ginkgo/core/base/utils.hpp index 12a2d0ef3e3..5270d619445 100644 --- a/include/ginkgo/core/base/utils.hpp +++ b/include/ginkgo/core/base/utils.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_UTILS_HPP_ -#define GKO_CORE_BASE_UTILS_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_UTILS_HPP_ +#define GKO_PUBLIC_CORE_BASE_UTILS_HPP_ #include @@ -587,4 +587,4 @@ detail::temporary_clone make_temporary_clone( } // namespace gko -#endif // GKO_CORE_BASE_UTILS_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_UTILS_HPP_ diff --git a/include/ginkgo/core/base/version.hpp b/include/ginkgo/core/base/version.hpp index 33ed03a8872..d56526a8613 100644 --- a/include/ginkgo/core/base/version.hpp +++ b/include/ginkgo/core/base/version.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_BASE_VERSION_HPP_ -#define GKO_CORE_BASE_VERSION_HPP_ +#ifndef GKO_PUBLIC_CORE_BASE_VERSION_HPP_ +#define GKO_PUBLIC_CORE_BASE_VERSION_HPP_ #include @@ -264,4 +264,4 @@ std::ostream &operator<<(std::ostream &os, const version_info &ver_info); } // namespace gko -#endif // GKO_CORE_BASE_VERSION_HPP_ +#endif // GKO_PUBLIC_CORE_BASE_VERSION_HPP_ diff --git a/include/ginkgo/core/factorization/ilu.hpp b/include/ginkgo/core/factorization/ilu.hpp index ece4e2aeb87..a1322116250 100644 --- a/include/ginkgo/core/factorization/ilu.hpp +++ b/include/ginkgo/core/factorization/ilu.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_FACTORIZATION_ILU_HPP_ -#define GKO_CORE_FACTORIZATION_ILU_HPP_ +#ifndef GKO_PUBLIC_CORE_FACTORIZATION_ILU_HPP_ +#define GKO_PUBLIC_CORE_FACTORIZATION_ILU_HPP_ #include @@ -173,4 +173,4 @@ class Ilu : public Composition { } // namespace gko -#endif // GKO_CORE_FACTORIZATION_ILU_HPP_ +#endif // GKO_PUBLIC_CORE_FACTORIZATION_ILU_HPP_ diff --git a/include/ginkgo/core/factorization/par_ict.hpp b/include/ginkgo/core/factorization/par_ict.hpp index 0686093686d..fd89af6aa47 100644 --- a/include/ginkgo/core/factorization/par_ict.hpp +++ b/include/ginkgo/core/factorization/par_ict.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_FACTORIZATION_PAR_ICT_HPP_ -#define GKO_CORE_FACTORIZATION_PAR_ICT_HPP_ +#ifndef GKO_PUBLIC_CORE_FACTORIZATION_PAR_ICT_HPP_ +#define GKO_PUBLIC_CORE_FACTORIZATION_PAR_ICT_HPP_ #include @@ -250,4 +250,4 @@ class ParIct : public Composition { } // namespace gko -#endif // GKO_CORE_FACTORIZATION_PAR_ICT_HPP_ +#endif // GKO_PUBLIC_CORE_FACTORIZATION_PAR_ICT_HPP_ diff --git a/include/ginkgo/core/factorization/par_ilu.hpp b/include/ginkgo/core/factorization/par_ilu.hpp index 63cf7468a60..c92abd88ba1 100644 --- a/include/ginkgo/core/factorization/par_ilu.hpp +++ b/include/ginkgo/core/factorization/par_ilu.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_FACTORIZATION_PAR_ILU_HPP_ -#define GKO_CORE_FACTORIZATION_PAR_ILU_HPP_ +#ifndef GKO_PUBLIC_CORE_FACTORIZATION_PAR_ILU_HPP_ +#define GKO_PUBLIC_CORE_FACTORIZATION_PAR_ILU_HPP_ #include @@ -213,4 +213,4 @@ class ParIlu : public Composition { } // namespace gko -#endif // GKO_CORE_FACTORIZATION_PAR_ILU_HPP_ +#endif // GKO_PUBLIC_CORE_FACTORIZATION_PAR_ILU_HPP_ diff --git a/include/ginkgo/core/factorization/par_ilut.hpp b/include/ginkgo/core/factorization/par_ilut.hpp index 87a8f866061..4ee0acf2612 100644 --- a/include/ginkgo/core/factorization/par_ilut.hpp +++ b/include/ginkgo/core/factorization/par_ilut.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_FACTORIZATION_PAR_ILUT_HPP_ -#define GKO_CORE_FACTORIZATION_PAR_ILUT_HPP_ +#ifndef GKO_PUBLIC_CORE_FACTORIZATION_PAR_ILUT_HPP_ +#define GKO_PUBLIC_CORE_FACTORIZATION_PAR_ILUT_HPP_ #include @@ -255,4 +255,4 @@ class ParIlut : public Composition { } // namespace gko -#endif // GKO_CORE_FACTORIZATION_PAR_ILUT_HPP_ +#endif // GKO_PUBLIC_CORE_FACTORIZATION_PAR_ILUT_HPP_ diff --git a/include/ginkgo/core/log/convergence.hpp b/include/ginkgo/core/log/convergence.hpp index 64cd16ea1aa..e8a5da27eb7 100644 --- a/include/ginkgo/core/log/convergence.hpp +++ b/include/ginkgo/core/log/convergence.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_LOG_CONVERGENCE_HPP_ -#define GKO_CORE_LOG_CONVERGENCE_HPP_ +#ifndef GKO_PUBLIC_CORE_LOG_CONVERGENCE_HPP_ +#define GKO_PUBLIC_CORE_LOG_CONVERGENCE_HPP_ #include @@ -146,4 +146,4 @@ class Convergence : public Logger { } // namespace gko -#endif // GKO_CORE_LOG_CONVERGENCE_HPP_ +#endif // GKO_PUBLIC_CORE_LOG_CONVERGENCE_HPP_ diff --git a/include/ginkgo/core/log/logger.hpp b/include/ginkgo/core/log/logger.hpp index 3d6ae9b4309..d84e51c8ed6 100644 --- a/include/ginkgo/core/log/logger.hpp +++ b/include/ginkgo/core/log/logger.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_LOG_LOGGER_HPP_ -#define GKO_CORE_LOG_LOGGER_HPP_ +#ifndef GKO_PUBLIC_CORE_LOG_LOGGER_HPP_ +#define GKO_PUBLIC_CORE_LOG_LOGGER_HPP_ #include @@ -556,4 +556,4 @@ class EnableLogging : public Loggable { } // namespace gko -#endif // GKO_CORE_LOG_LOGGER_HPP_ +#endif // GKO_PUBLIC_CORE_LOG_LOGGER_HPP_ diff --git a/include/ginkgo/core/log/papi.hpp b/include/ginkgo/core/log/papi.hpp index 7b54e478f6e..00687f88719 100644 --- a/include/ginkgo/core/log/papi.hpp +++ b/include/ginkgo/core/log/papi.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_LOG_PAPI_HPP_ -#define GKO_CORE_LOG_PAPI_HPP_ +#ifndef GKO_PUBLIC_CORE_LOG_PAPI_HPP_ +#define GKO_PUBLIC_CORE_LOG_PAPI_HPP_ #include @@ -318,4 +318,4 @@ class Papi : public Logger { #endif // GKO_HAVE_PAPI_SDE -#endif // GKO_CORE_LOG_PAPI_HPP_ +#endif // GKO_PUBLIC_CORE_LOG_PAPI_HPP_ diff --git a/include/ginkgo/core/log/record.hpp b/include/ginkgo/core/log/record.hpp index 0c791e5e278..1e30990cc1f 100644 --- a/include/ginkgo/core/log/record.hpp +++ b/include/ginkgo/core/log/record.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_LOG_RECORD_HPP_ -#define GKO_CORE_LOG_RECORD_HPP_ +#ifndef GKO_PUBLIC_CORE_LOG_RECORD_HPP_ +#define GKO_PUBLIC_CORE_LOG_RECORD_HPP_ #include @@ -454,4 +454,4 @@ class Record : public Logger { } // namespace gko -#endif // GKO_CORE_LOG_RECORD_HPP_ +#endif // GKO_PUBLIC_CORE_LOG_RECORD_HPP_ diff --git a/include/ginkgo/core/log/stream.hpp b/include/ginkgo/core/log/stream.hpp index d46a0d07be0..30b1beabf2b 100644 --- a/include/ginkgo/core/log/stream.hpp +++ b/include/ginkgo/core/log/stream.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_LOG_STREAM_HPP_ -#define GKO_CORE_LOG_STREAM_HPP_ +#ifndef GKO_PUBLIC_CORE_LOG_STREAM_HPP_ +#define GKO_PUBLIC_CORE_LOG_STREAM_HPP_ #include @@ -211,4 +211,4 @@ class Stream : public Logger { } // namespace gko -#endif // GKO_CORE_LOG_STREAM_HPP_ +#endif // GKO_PUBLIC_CORE_LOG_STREAM_HPP_ diff --git a/include/ginkgo/core/matrix/coo.hpp b/include/ginkgo/core/matrix/coo.hpp index 7fe9fe02533..ce8cf678eb1 100644 --- a/include/ginkgo/core/matrix/coo.hpp +++ b/include/ginkgo/core/matrix/coo.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_COO_HPP_ -#define GKO_CORE_MATRIX_COO_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_COO_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_COO_HPP_ #include @@ -327,4 +327,4 @@ class Coo : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_MATRIX_COO_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_COO_HPP_ diff --git a/include/ginkgo/core/matrix/csr.hpp b/include/ginkgo/core/matrix/csr.hpp index f6e486e9f5d..9ba5ed4d343 100644 --- a/include/ginkgo/core/matrix/csr.hpp +++ b/include/ginkgo/core/matrix/csr.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_CSR_HPP_ -#define GKO_CORE_MATRIX_CSR_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_CSR_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_CSR_HPP_ #include @@ -1057,4 +1057,4 @@ void strategy_rebuild_helper(Csr *result) } // namespace gko -#endif // GKO_CORE_MATRIX_CSR_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_CSR_HPP_ diff --git a/include/ginkgo/core/matrix/dense.hpp b/include/ginkgo/core/matrix/dense.hpp index c7ff335b89e..ad689c8ad1f 100644 --- a/include/ginkgo/core/matrix/dense.hpp +++ b/include/ginkgo/core/matrix/dense.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_DENSE_HPP_ -#define GKO_CORE_MATRIX_DENSE_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_DENSE_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_DENSE_HPP_ #include @@ -842,4 +842,4 @@ std::unique_ptr initialize( } // namespace gko -#endif // GKO_CORE_MATRIX_DENSE_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_DENSE_HPP_ diff --git a/include/ginkgo/core/matrix/diagonal.hpp b/include/ginkgo/core/matrix/diagonal.hpp index b268421c163..58463b8f838 100644 --- a/include/ginkgo/core/matrix/diagonal.hpp +++ b/include/ginkgo/core/matrix/diagonal.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_DIAGONAL_HPP_ -#define GKO_CORE_MATRIX_DIAGONAL_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_DIAGONAL_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_DIAGONAL_HPP_ #include @@ -211,4 +211,4 @@ class Diagonal } // namespace gko -#endif // GKO_CORE_MATRIX_DIAGONAL_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_DIAGONAL_HPP_ diff --git a/include/ginkgo/core/matrix/ell.hpp b/include/ginkgo/core/matrix/ell.hpp index d8970d2b1c3..932bfc7fda9 100644 --- a/include/ginkgo/core/matrix/ell.hpp +++ b/include/ginkgo/core/matrix/ell.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_ELL_HPP_ -#define GKO_CORE_MATRIX_ELL_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_ELL_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_ELL_HPP_ #include @@ -335,4 +335,4 @@ class Ell : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_MATRIX_ELL_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_ELL_HPP_ diff --git a/include/ginkgo/core/matrix/hybrid.hpp b/include/ginkgo/core/matrix/hybrid.hpp index babff97efbc..4641a0443ec 100644 --- a/include/ginkgo/core/matrix/hybrid.hpp +++ b/include/ginkgo/core/matrix/hybrid.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_HYBRID_HPP_ -#define GKO_CORE_MATRIX_HYBRID_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_HYBRID_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_HYBRID_HPP_ #include @@ -791,4 +791,4 @@ Hybrid::get_strategy() const } // namespace gko -#endif // GKO_CORE_MATRIX_HYBRID_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_HYBRID_HPP_ diff --git a/include/ginkgo/core/matrix/identity.hpp b/include/ginkgo/core/matrix/identity.hpp index 06682c46abb..d00ffec9b9e 100644 --- a/include/ginkgo/core/matrix/identity.hpp +++ b/include/ginkgo/core/matrix/identity.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_IDENTITY_HPP_ -#define GKO_CORE_MATRIX_IDENTITY_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_IDENTITY_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_IDENTITY_HPP_ #include @@ -163,4 +163,4 @@ class IdentityFactory } // namespace gko -#endif // GKO_CORE_MATRIX_IDENTITY_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_IDENTITY_HPP_ diff --git a/include/ginkgo/core/matrix/permutation.hpp b/include/ginkgo/core/matrix/permutation.hpp index 656cee4ae3d..cb81544c835 100644 --- a/include/ginkgo/core/matrix/permutation.hpp +++ b/include/ginkgo/core/matrix/permutation.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_PERMUTATION_HPP_ -#define GKO_CORE_MATRIX_PERMUTATION_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_PERMUTATION_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_PERMUTATION_HPP_ #include @@ -246,4 +246,4 @@ class Permutation : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_MATRIX_PERMUTATION_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_PERMUTATION_HPP_ diff --git a/include/ginkgo/core/matrix/sellp.hpp b/include/ginkgo/core/matrix/sellp.hpp index 8540b7f1c5d..b99746ec3b6 100644 --- a/include/ginkgo/core/matrix/sellp.hpp +++ b/include/ginkgo/core/matrix/sellp.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_SELLP_HPP_ -#define GKO_CORE_MATRIX_SELLP_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_SELLP_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_SELLP_HPP_ #include @@ -358,4 +358,4 @@ class Sellp : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_MATRIX_SELLP_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_SELLP_HPP_ diff --git a/include/ginkgo/core/matrix/sparsity_csr.hpp b/include/ginkgo/core/matrix/sparsity_csr.hpp index f55da0bfa83..f736d35f840 100644 --- a/include/ginkgo/core/matrix/sparsity_csr.hpp +++ b/include/ginkgo/core/matrix/sparsity_csr.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_MATRIX_SPARSITY_CSR_HPP_ -#define GKO_CORE_MATRIX_SPARSITY_CSR_HPP_ +#ifndef GKO_PUBLIC_CORE_MATRIX_SPARSITY_CSR_HPP_ +#define GKO_PUBLIC_CORE_MATRIX_SPARSITY_CSR_HPP_ #include @@ -265,4 +265,4 @@ class SparsityCsr } // namespace gko -#endif // GKO_CORE_MATRIX_SPARSITY_CSR_HPP_ +#endif // GKO_PUBLIC_CORE_MATRIX_SPARSITY_CSR_HPP_ diff --git a/include/ginkgo/core/preconditioner/ilu.hpp b/include/ginkgo/core/preconditioner/ilu.hpp index e312f6a5391..72a478ac405 100644 --- a/include/ginkgo/core/preconditioner/ilu.hpp +++ b/include/ginkgo/core/preconditioner/ilu.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_PRECONDITIONER_ILU_HPP_ -#define GKO_CORE_PRECONDITIONER_ILU_HPP_ +#ifndef GKO_PUBLIC_CORE_PRECONDITIONER_ILU_HPP_ +#define GKO_PUBLIC_CORE_PRECONDITIONER_ILU_HPP_ #include @@ -414,4 +414,4 @@ class Ilu : public EnableLinOp< } // namespace gko -#endif // GKO_CORE_PRECONDITIONER_ILU_HPP_ +#endif // GKO_PUBLIC_CORE_PRECONDITIONER_ILU_HPP_ diff --git a/include/ginkgo/core/preconditioner/isai.hpp b/include/ginkgo/core/preconditioner/isai.hpp index 7abb186b16b..420b376c0a0 100644 --- a/include/ginkgo/core/preconditioner/isai.hpp +++ b/include/ginkgo/core/preconditioner/isai.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_PRECONDITIONER_ISAI_HPP_ -#define GKO_CORE_PRECONDITIONER_ISAI_HPP_ +#ifndef GKO_PUBLIC_CORE_PRECONDITIONER_ISAI_HPP_ +#define GKO_PUBLIC_CORE_PRECONDITIONER_ISAI_HPP_ #include @@ -215,4 +215,4 @@ using UpperIsai = Isai; } // namespace gko -#endif // GKO_CORE_PRECONDITIONER_ISAI_HPP_ +#endif // GKO_PUBLIC_CORE_PRECONDITIONER_ISAI_HPP_ diff --git a/include/ginkgo/core/preconditioner/jacobi.hpp b/include/ginkgo/core/preconditioner/jacobi.hpp index 60433b2f2cc..4828609d077 100644 --- a/include/ginkgo/core/preconditioner/jacobi.hpp +++ b/include/ginkgo/core/preconditioner/jacobi.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_PRECONDITIONER_JACOBI_HPP_ -#define GKO_CORE_PRECONDITIONER_JACOBI_HPP_ +#ifndef GKO_PUBLIC_CORE_PRECONDITIONER_JACOBI_HPP_ +#define GKO_PUBLIC_CORE_PRECONDITIONER_JACOBI_HPP_ #include @@ -107,8 +107,8 @@ struct block_interleaved_storage_scheme { * blocks is not known, for a special input `size_type{} - 1` * the method returns `0` to avoid overallocation of memory. */ - GKO_ATTRIBUTES size_type - compute_storage_space(size_type num_blocks) const noexcept + GKO_ATTRIBUTES size_type compute_storage_space(size_type num_blocks) const + noexcept { return (num_blocks + 1 == size_type{0}) ? size_type{0} @@ -146,8 +146,8 @@ struct block_interleaved_storage_scheme { * * @return the offset of the block with ID `block_id` */ - GKO_ATTRIBUTES IndexType - get_global_block_offset(IndexType block_id) const noexcept + GKO_ATTRIBUTES IndexType get_global_block_offset(IndexType block_id) const + noexcept { return this->get_group_offset(block_id) + this->get_block_offset(block_id); @@ -610,4 +610,4 @@ class Jacobi : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_PRECONDITIONER_JACOBI_HPP_ +#endif // GKO_PUBLIC_CORE_PRECONDITIONER_JACOBI_HPP_ diff --git a/include/ginkgo/core/reorder/rcm.hpp b/include/ginkgo/core/reorder/rcm.hpp index 3a36eccf465..2f95a95c39a 100644 --- a/include/ginkgo/core/reorder/rcm.hpp +++ b/include/ginkgo/core/reorder/rcm.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_REORDER_RCM_HPP_ -#define GKO_CORE_REORDER_RCM_HPP_ +#ifndef GKO_PUBLIC_CORE_REORDER_RCM_HPP_ +#define GKO_PUBLIC_CORE_REORDER_RCM_HPP_ #include @@ -215,4 +215,4 @@ class Rcm } // namespace gko -#endif // GKO_CORE_REORDER_RCM_HPP_ +#endif // GKO_PUBLIC_CORE_REORDER_RCM_HPP_ diff --git a/include/ginkgo/core/reorder/reordering_base.hpp b/include/ginkgo/core/reorder/reordering_base.hpp index 7b93d575813..ea6a2d2e5b0 100644 --- a/include/ginkgo/core/reorder/reordering_base.hpp +++ b/include/ginkgo/core/reorder/reordering_base.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_REORDER_REORDERING_BASE_HPP_ -#define GKO_CORE_REORDER_REORDERING_BASE_HPP_ +#ifndef GKO_PUBLIC_CORE_REORDER_REORDERING_BASE_HPP_ +#define GKO_PUBLIC_CORE_REORDER_REORDERING_BASE_HPP_ #include @@ -172,4 +172,4 @@ public: \ } // namespace gko -#endif // GKO_CORE_REORDER_REORDERING_BASE_HPP_ +#endif // GKO_PUBLIC_CORE_REORDER_REORDERING_BASE_HPP_ diff --git a/include/ginkgo/core/solver/bicg.hpp b/include/ginkgo/core/solver/bicg.hpp index 19a92365050..570e968e468 100644 --- a/include/ginkgo/core/solver/bicg.hpp +++ b/include/ginkgo/core/solver/bicg.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_BICG_HPP_ -#define GKO_CORE_SOLVER_BICG_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_BICG_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_BICG_HPP_ #include @@ -62,8 +62,9 @@ namespace solver { * the capability to solve generic systems. * * BiCG is based on the bi-Lanczos tridiagonalization method and in exact - * arithmetic should terminate in at most N iterations (2N MV's, with A and A^H). - * It forms the basis of many of the cheaper methods such as BiCGSTAB and CGS. + * arithmetic should terminate in at most N iterations (2N MV's, with A and + * A^H). It forms the basis of many of the cheaper methods such as BiCGSTAB and + * CGS. * * Reference: R.Fletcher, Conjugate gradient methods for indefinite systems, * doi: 10.1007/BFb0080116 @@ -194,4 +195,4 @@ class Bicg : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_BICG_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_BICG_HPP_ diff --git a/include/ginkgo/core/solver/bicgstab.hpp b/include/ginkgo/core/solver/bicgstab.hpp index e6fce0d9f53..5a3aad0db06 100644 --- a/include/ginkgo/core/solver/bicgstab.hpp +++ b/include/ginkgo/core/solver/bicgstab.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_BICGSTAB_HPP_ -#define GKO_CORE_SOLVER_BICGSTAB_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_BICGSTAB_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_BICGSTAB_HPP_ #include @@ -193,4 +193,4 @@ class Bicgstab : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_BICGSTAB_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_BICGSTAB_HPP_ diff --git a/include/ginkgo/core/solver/cg.hpp b/include/ginkgo/core/solver/cg.hpp index fbe94677933..88aa379a972 100644 --- a/include/ginkgo/core/solver/cg.hpp +++ b/include/ginkgo/core/solver/cg.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_CG_HPP_ -#define GKO_CORE_SOLVER_CG_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_CG_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_CG_HPP_ #include @@ -189,4 +189,4 @@ class Cg : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_CG_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_CG_HPP_ diff --git a/include/ginkgo/core/solver/cgs.hpp b/include/ginkgo/core/solver/cgs.hpp index 3d7c8c0a854..ab3d8bee0bb 100644 --- a/include/ginkgo/core/solver/cgs.hpp +++ b/include/ginkgo/core/solver/cgs.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_CGS_HPP_ -#define GKO_CORE_SOLVER_CGS_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_CGS_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_CGS_HPP_ #include @@ -186,4 +186,4 @@ class Cgs : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_CGS_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_CGS_HPP_ diff --git a/include/ginkgo/core/solver/fcg.hpp b/include/ginkgo/core/solver/fcg.hpp index 3d25ff057bf..b1c1eaf1329 100644 --- a/include/ginkgo/core/solver/fcg.hpp +++ b/include/ginkgo/core/solver/fcg.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_FCG_HPP_ -#define GKO_CORE_SOLVER_FCG_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_FCG_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_FCG_HPP_ #include @@ -194,4 +194,4 @@ class Fcg : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_FCG_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_FCG_HPP_ diff --git a/include/ginkgo/core/solver/gmres.hpp b/include/ginkgo/core/solver/gmres.hpp index 36142219a7f..327dc196d94 100644 --- a/include/ginkgo/core/solver/gmres.hpp +++ b/include/ginkgo/core/solver/gmres.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_GMRES_HPP_ -#define GKO_CORE_SOLVER_GMRES_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_GMRES_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_GMRES_HPP_ #include @@ -214,4 +214,4 @@ class Gmres : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_GMRES_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_GMRES_HPP_ diff --git a/include/ginkgo/core/solver/idr.hpp b/include/ginkgo/core/solver/idr.hpp index fb3d6a860a2..1d1e0b120f1 100644 --- a/include/ginkgo/core/solver/idr.hpp +++ b/include/ginkgo/core/solver/idr.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_IDR_HPP_ -#define GKO_CORE_SOLVER_IDR_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_IDR_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_IDR_HPP_ #include @@ -298,4 +298,4 @@ class Idr : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_IDR_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_IDR_HPP_ diff --git a/include/ginkgo/core/solver/ir.hpp b/include/ginkgo/core/solver/ir.hpp index 1059c733614..a34d6ea6d41 100644 --- a/include/ginkgo/core/solver/ir.hpp +++ b/include/ginkgo/core/solver/ir.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_IR_HPP_ -#define GKO_CORE_SOLVER_IR_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_IR_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_IR_HPP_ #include @@ -251,4 +251,4 @@ using Richardson = Ir; } // namespace gko -#endif // GKO_CORE_SOLVER_IR_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_IR_HPP_ diff --git a/include/ginkgo/core/solver/lower_trs.hpp b/include/ginkgo/core/solver/lower_trs.hpp index 8681870ab16..b87c6528d00 100644 --- a/include/ginkgo/core/solver/lower_trs.hpp +++ b/include/ginkgo/core/solver/lower_trs.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_LOWER_TRS_HPP_ -#define GKO_CORE_SOLVER_LOWER_TRS_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_LOWER_TRS_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_LOWER_TRS_HPP_ #include @@ -173,4 +173,4 @@ class LowerTrs : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_LOWER_TRS_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_LOWER_TRS_HPP_ diff --git a/include/ginkgo/core/solver/upper_trs.hpp b/include/ginkgo/core/solver/upper_trs.hpp index b3c3a12d8fa..5d41637dc2c 100644 --- a/include/ginkgo/core/solver/upper_trs.hpp +++ b/include/ginkgo/core/solver/upper_trs.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SOLVER_UPPER_TRS_HPP_ -#define GKO_CORE_SOLVER_UPPER_TRS_HPP_ +#ifndef GKO_PUBLIC_CORE_SOLVER_UPPER_TRS_HPP_ +#define GKO_PUBLIC_CORE_SOLVER_UPPER_TRS_HPP_ #include @@ -173,4 +173,4 @@ class UpperTrs : public EnableLinOp>, } // namespace gko -#endif // GKO_CORE_SOLVER_UPPER_TRS_HPP_ +#endif // GKO_PUBLIC_CORE_SOLVER_UPPER_TRS_HPP_ diff --git a/include/ginkgo/core/stop/combined.hpp b/include/ginkgo/core/stop/combined.hpp index 647c919af19..33bad75df69 100644 --- a/include/ginkgo/core/stop/combined.hpp +++ b/include/ginkgo/core/stop/combined.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_COMBINED_HPP_ -#define GKO_CORE_STOP_COMBINED_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_COMBINED_HPP_ +#define GKO_PUBLIC_CORE_STOP_COMBINED_HPP_ #include @@ -150,4 +150,4 @@ std::shared_ptr combine(FactoryContainer &&factories) } // namespace gko -#endif // GKO_CORE_STOP_COMBINED_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_COMBINED_HPP_ diff --git a/include/ginkgo/core/stop/criterion.hpp b/include/ginkgo/core/stop/criterion.hpp index 41d48b2d9ae..e309df9bc42 100644 --- a/include/ginkgo/core/stop/criterion.hpp +++ b/include/ginkgo/core/stop/criterion.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_CRITERION_HPP_ -#define GKO_CORE_STOP_CRITERION_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_CRITERION_HPP_ +#define GKO_PUBLIC_CORE_STOP_CRITERION_HPP_ #include @@ -327,4 +327,4 @@ public: \ } // namespace gko -#endif // GKO_CORE_STOP_CRITERION_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_CRITERION_HPP_ diff --git a/include/ginkgo/core/stop/iteration.hpp b/include/ginkgo/core/stop/iteration.hpp index 8bab8724291..55100a4c121 100644 --- a/include/ginkgo/core/stop/iteration.hpp +++ b/include/ginkgo/core/stop/iteration.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_ITERATION_HPP_ -#define GKO_CORE_STOP_ITERATION_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_ITERATION_HPP_ +#define GKO_PUBLIC_CORE_STOP_ITERATION_HPP_ #include @@ -84,4 +84,4 @@ class Iteration : public EnablePolymorphicObject { } // namespace gko -#endif // GKO_CORE_STOP_ITERATION_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_ITERATION_HPP_ diff --git a/include/ginkgo/core/stop/residual_norm.hpp b/include/ginkgo/core/stop/residual_norm.hpp index c1aa45525e3..f786a84056b 100644 --- a/include/ginkgo/core/stop/residual_norm.hpp +++ b/include/ginkgo/core/stop/residual_norm.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_RESIDUAL_NORM_HPP_ -#define GKO_CORE_STOP_RESIDUAL_NORM_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_RESIDUAL_NORM_HPP_ +#define GKO_PUBLIC_CORE_STOP_RESIDUAL_NORM_HPP_ #include @@ -290,4 +290,4 @@ class AbsoluteResidualNorm : public ResidualNorm { } // namespace gko -#endif // GKO_CORE_STOP_RESIDUAL_NORM_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_RESIDUAL_NORM_HPP_ diff --git a/include/ginkgo/core/stop/residual_norm_reduction.hpp b/include/ginkgo/core/stop/residual_norm_reduction.hpp index 6872b7be5c2..f9c9ff7c61f 100644 --- a/include/ginkgo/core/stop/residual_norm_reduction.hpp +++ b/include/ginkgo/core/stop/residual_norm_reduction.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_RESIDUAL_NORM_REDUCTION_HPP_ -#define GKO_CORE_STOP_RESIDUAL_NORM_REDUCTION_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_RESIDUAL_NORM_REDUCTION_HPP_ +#define GKO_PUBLIC_CORE_STOP_RESIDUAL_NORM_REDUCTION_HPP_ #ifdef __GNUC__ @@ -44,4 +44,4 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#endif // GKO_CORE_STOP_RESIDUAL_NORM_REDUCTION_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_RESIDUAL_NORM_REDUCTION_HPP_ diff --git a/include/ginkgo/core/stop/stopping_status.hpp b/include/ginkgo/core/stop/stopping_status.hpp index 679d78be4de..415c6e3cffe 100644 --- a/include/ginkgo/core/stop/stopping_status.hpp +++ b/include/ginkgo/core/stop/stopping_status.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_STOPPING_STATUS_HPP_ -#define GKO_CORE_STOP_STOPPING_STATUS_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_STOPPING_STATUS_HPP_ +#define GKO_PUBLIC_CORE_STOP_STOPPING_STATUS_HPP_ #include @@ -184,4 +184,4 @@ GKO_ATTRIBUTES GKO_INLINE bool operator!=(const stopping_status &x, } // namespace gko -#endif // GKO_CORE_STOP_STOPPING_STATUS_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_STOPPING_STATUS_HPP_ diff --git a/include/ginkgo/core/stop/time.hpp b/include/ginkgo/core/stop/time.hpp index 0b4e90baf7a..e7cf7621d30 100644 --- a/include/ginkgo/core/stop/time.hpp +++ b/include/ginkgo/core/stop/time.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_STOP_TIME_HPP_ -#define GKO_CORE_STOP_TIME_HPP_ +#ifndef GKO_PUBLIC_CORE_STOP_TIME_HPP_ +#define GKO_PUBLIC_CORE_STOP_TIME_HPP_ #include @@ -100,4 +100,4 @@ class Time : public EnablePolymorphicObject { } // namespace gko -#endif // GKO_CORE_STOP_TIME_HPP_ +#endif // GKO_PUBLIC_CORE_STOP_TIME_HPP_ diff --git a/include/ginkgo/core/synthesizer/containers.hpp b/include/ginkgo/core/synthesizer/containers.hpp index b75936a9adc..1f3901c22c1 100644 --- a/include/ginkgo/core/synthesizer/containers.hpp +++ b/include/ginkgo/core/synthesizer/containers.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_CORE_SYNTHESIZER_CONTAINERS_HPP_ -#define GKO_CORE_SYNTHESIZER_CONTAINERS_HPP_ +#ifndef GKO_PUBLIC_CORE_SYNTHESIZER_CONTAINERS_HPP_ +#define GKO_PUBLIC_CORE_SYNTHESIZER_CONTAINERS_HPP_ #include @@ -117,4 +117,4 @@ using as_list = typename detail::as_list_impl::type; } // namespace gko -#endif // GKO_CORE_SYNTHESIZER_CONTAINERS_HPP_ +#endif // GKO_PUBLIC_CORE_SYNTHESIZER_CONTAINERS_HPP_ diff --git a/omp/solver/idr_kernels.cpp b/omp/solver/idr_kernels.cpp index d6aaeddee3b..ce91497b1ee 100644 --- a/omp/solver/idr_kernels.cpp +++ b/omp/solver/idr_kernels.cpp @@ -33,10 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/solver/idr_kernels.hpp" -#include #include #include #include +#include #include diff --git a/omp/test/solver/idr_kernels.cpp b/omp/test/solver/idr_kernels.cpp index 6bc8e264997..70695b7762f 100644 --- a/omp/test/solver/idr_kernels.cpp +++ b/omp/test/solver/idr_kernels.cpp @@ -30,8 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#include -#include #include @@ -48,6 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include +#include #include #include #include diff --git a/reference/components/csr_spgeam.hpp b/reference/components/csr_spgeam.hpp index f09b34d5926..3f313df5756 100644 --- a/reference/components/csr_spgeam.hpp +++ b/reference/components/csr_spgeam.hpp @@ -30,8 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#ifndef GKO_OMP_COMPONENTS_CSR_SPGEAM_HPP_ -#define GKO_OMP_COMPONENTS_CSR_SPGEAM_HPP_ +#ifndef GKO_REFERENCE_COMPONENTS_CSR_SPGEAM_HPP_ +#define GKO_REFERENCE_COMPONENTS_CSR_SPGEAM_HPP_ #include @@ -109,4 +109,4 @@ void abstract_spgeam(const matrix::Csr *a, } // namespace gko -#endif // GKO_OMP_COMPONENTS_CSR_SPGEAM_HPP_ +#endif // GKO_REFERENCE_COMPONENTS_CSR_SPGEAM_HPP_ diff --git a/reference/reorder/rcm_kernels.cpp b/reference/reorder/rcm_kernels.cpp index 452b8c877ac..74b02fff26b 100644 --- a/reference/reorder/rcm_kernels.cpp +++ b/reference/reorder/rcm_kernels.cpp @@ -30,7 +30,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ - #include "core/reorder/rcm_kernels.hpp" diff --git a/reference/solver/idr_kernels.cpp b/reference/solver/idr_kernels.cpp index f9d743a9077..eff6751fc85 100644 --- a/reference/solver/idr_kernels.cpp +++ b/reference/solver/idr_kernels.cpp @@ -33,10 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "core/solver/idr_kernels.hpp" -#include #include #include #include +#include #include diff --git a/reference/test/preconditioner/isai_kernels.cpp b/reference/test/preconditioner/isai_kernels.cpp index 6fc099189df..ff578096391 100644 --- a/reference/test/preconditioner/isai_kernels.cpp +++ b/reference/test/preconditioner/isai_kernels.cpp @@ -30,7 +30,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *************************************************************/ -#include "reference/preconditioner/isai_kernels.cpp" +#include #include @@ -47,11 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #include "core/test/utils.hpp" #include "matrices/config.hpp" +#include "reference/preconditioner/isai_kernels.cpp" namespace { diff --git a/reference/test/reorder/rcm_kernels.cpp b/reference/test/reorder/rcm_kernels.cpp index a12c94ec7ae..3905918e3d7 100644 --- a/reference/test/reorder/rcm_kernels.cpp +++ b/reference/test/reorder/rcm_kernels.cpp @@ -113,7 +113,7 @@ class Rcm : public ::testing::Test { TEST_F(Rcm, CreatesAPermutation) { auto p = reorder_op_0->get_permutation(); - + ASSERT_PRED1(is_permutation, p.get()); } diff --git a/test_install/test_install.cpp b/test_install/test_install.cpp index 5ea59794440..c80b0976b34 100644 --- a/test_install/test_install.cpp +++ b/test_install/test_install.cpp @@ -357,13 +357,13 @@ int main(int, char **) .with_reduction_factor(1e-10) .on(refExec); - auto rel_res = gko::stop::RelativeResidualNorm<>::build() - .with_tolerance(1e-10) - .on(refExec); + auto rel_res = + gko::stop::RelativeResidualNorm<>::build().with_tolerance(1e-10).on( + refExec); - auto abs_res = gko::stop::AbsoluteResidualNorm<>::build() - .with_tolerance(1e-10) - .on(refExec); + auto abs_res = + gko::stop::AbsoluteResidualNorm<>::build().with_tolerance(1e-10).on( + refExec); // stopping_status.hpp auto stop_status = gko::stopping_status{}; diff --git a/test_install/test_install_cuda.cu b/test_install/test_install_cuda.cu index ed2e18c307d..a4f46b371f8 100644 --- a/test_install/test_install_cuda.cu +++ b/test_install/test_install_cuda.cu @@ -349,13 +349,11 @@ int main(int, char **) .with_reduction_factor(1e-10) .on(cudaExec); - gko::stop::RelativeResidualNorm<>::build() - .with_tolerance(1e-10) - .on(cudaExec); + gko::stop::RelativeResidualNorm<>::build().with_tolerance(1e-10).on( + cudaExec); - gko::stop::AbsoluteResidualNorm<>::build() - .with_tolerance(1e-10) - .on(cudaExec); + gko::stop::AbsoluteResidualNorm<>::build().with_tolerance(1e-10).on( + cudaExec); // stopping_status.hpp gko::stopping_status{}; From 1b280baf4c4bd34a11bfc719f58b6d4429671123 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 2 Dec 2020 13:21:13 +0100 Subject: [PATCH 2/3] update bot to delete old comments --- .github/bot-pr-base.sh | 8 ++++++++ .github/check-format.sh | 4 ++-- .github/format.sh | 2 -- .github/rebase.sh | 2 ++ .github/workflows/bot-pr-comment.yml | 8 ++++---- .github/workflows/bot-pr-created.yml | 2 +- .github/workflows/bot-pr-updated.yml | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/bot-pr-base.sh b/.github/bot-pr-base.sh index 421ef773e2d..cdb0787c410 100644 --- a/.github/bot-pr-base.sh +++ b/.github/bot-pr-base.sh @@ -41,6 +41,14 @@ HEAD_URL="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/$HEAD_REPO" JOB_URL="https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" +bot_delete_comments_matching() { + local search_matching="$1" + COMMENTS=$(api_get "$ISSUE_URL/comments" | jq -r '.[] | select((.user.login == "ginkgo-bot") and (.body | startswith('"\"$search_matching\""'))) | .url') + for URL in $COMMENTS; do + api_delete "$URL" > /dev/null + done +} + bot_comment() { api_post "$ISSUE_URL/comments" "{\"body\":\"$1\"}" > /dev/null } diff --git a/.github/check-format.sh b/.github/check-format.sh index 704a78690b6..635b64c943f 100755 --- a/.github/check-format.sh +++ b/.github/check-format.sh @@ -9,11 +9,11 @@ LIST_FILES=$(git diff --name-only | sed '$!s/$/\\n/' | tr -d '\n') git diff > /tmp/format.patch mv /tmp/format.patch . +bot_delete_comments_matching "Error: The following files need to be formatted" + if [[ "$LIST_FILES" != "" ]]; then MESSAGE="The following files need to be formatted:\n"'```'"\n$LIST_FILES\n"'```' MESSAGE="$MESSAGE\nYou can find a formatting patch under **Artifacts** [here]" MESSAGE="$MESSAGE($JOB_URL) or run "'`format!` if you have write access to Ginkgo' bot_error "$MESSAGE" -else - bot_comment "No formatting necessary" fi diff --git a/.github/format.sh b/.github/format.sh index 581bd1bdb38..8829b719b8f 100755 --- a/.github/format.sh +++ b/.github/format.sh @@ -12,6 +12,4 @@ if [[ "$LIST_FILES" != "" ]]; then Co-authored-by: $USER_COMBINED" git push fork $LOCAL_BRANCH:$HEAD_BRANCH 2>&1 || bot_error "Cannot push formatted branch, are edits for maintainers allowed?" -else - bot_comment "No formatting necessary" fi diff --git a/.github/rebase.sh b/.github/rebase.sh index 6377ae4030e..7367ed04fb1 100755 --- a/.github/rebase.sh +++ b/.github/rebase.sh @@ -14,6 +14,8 @@ git config user.name "$USER_NAME" LOCAL_BRANCH=rebase-tmp-$HEAD_BRANCH git checkout -b $LOCAL_BRANCH fork/$HEAD_BRANCH +bot_delete_comments_matching "Error: Rebase failed" + # do the rebase git rebase base/$BASE_BRANCH 2>&1 || bot_error "Rebase failed, see the related [Action]($JOB_URL) for details" diff --git a/.github/workflows/bot-pr-comment.yml b/.github/workflows/bot-pr-comment.yml index da198121140..61952428f3e 100644 --- a/.github/workflows/bot-pr-comment.yml +++ b/.github/workflows/bot-pr-comment.yml @@ -14,7 +14,7 @@ jobs: fetch-depth: 0 - name: Add appropriate labels env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} run: cp .github/label.sh /tmp && /tmp/label.sh check_format: name: check-format @@ -28,7 +28,7 @@ jobs: fetch-depth: 0 - name: Check for formatting changes env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} run: cp .github/check-format.sh /tmp && /tmp/check-format.sh - name: Upload code formatting patch if: failure() @@ -48,7 +48,7 @@ jobs: fetch-depth: 0 - name: Commit formatting changes env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} run: cp .github/format.sh /tmp && /tmp/format.sh rebase: name: rebase @@ -62,5 +62,5 @@ jobs: fetch-depth: 0 - name: Automatic Rebase env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} run: cp .github/rebase.sh /tmp && /tmp/rebase.sh diff --git a/.github/workflows/bot-pr-created.yml b/.github/workflows/bot-pr-created.yml index 75a6a7e4564..d86d6f5c869 100644 --- a/.github/workflows/bot-pr-created.yml +++ b/.github/workflows/bot-pr-created.yml @@ -15,5 +15,5 @@ jobs: fetch-depth: 0 - name: Add appropriate labels env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} run: .github/label.sh diff --git a/.github/workflows/bot-pr-updated.yml b/.github/workflows/bot-pr-updated.yml index 44d78473179..b0f0c2e5570 100644 --- a/.github/workflows/bot-pr-updated.yml +++ b/.github/workflows/bot-pr-updated.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 0 - name: Check for formatting changes env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} run: cp .github/check-format.sh /tmp && /tmp/check-format.sh - name: Upload code formatting patch if: failure() From 562f290c2724595a27ed8c478154ce29b77f2eb9 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Wed, 2 Dec 2020 19:52:38 +0100 Subject: [PATCH 3/3] fix ISAI test include --- reference/test/preconditioner/isai_kernels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/test/preconditioner/isai_kernels.cpp b/reference/test/preconditioner/isai_kernels.cpp index ff578096391..5ed332f7e95 100644 --- a/reference/test/preconditioner/isai_kernels.cpp +++ b/reference/test/preconditioner/isai_kernels.cpp @@ -49,9 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#include "core/preconditioner/isai_kernels.hpp" #include "core/test/utils.hpp" #include "matrices/config.hpp" -#include "reference/preconditioner/isai_kernels.cpp" namespace {