Fix issues according to comments.

ginkgo-project · Oct 28, 2019 · fa7c51c · fa7c51c
1 parent f6e05fd
commit fa7c51c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/cmake/CTestCustom.cmake.in b/cmake/CTestCustom.cmake.in
@@ -5,15 +5,15 @@ list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
  # Exclude try_compile sources from coverage results:
  "/CMakeFiles/CMakeTmp/"
 
- "third_party"
+ ".*/third_party/.*"
 
- "test"
+ ".*/test/.*"
 
- "benchmark"
+ ".*/benchmark/.*"
 
- "examples"
+ ".*/examples/.*"
 
- "c\\+\\+"
+ ".*/c\\+\\+/.*"
 )
 
 set(CTEST_SOURCE_DIRECTORY "@Ginkgo_SOURCE_DIR@" CACHE STRING "" FORCE)

diff --git a/cuda/matrix/sellp_kernels.cu b/cuda/matrix/sellp_kernels.cu
@@ -62,6 +62,7 @@ namespace {
 
 constexpr auto default_block_size = 512;
 
+
 template <typename ValueType, typename IndexType>
 __global__ __launch_bounds__(matrix::default_slice_size) void spmv_kernel(
  size_type num_rows, size_type num_right_hand_sides, size_type b_stride,

diff --git a/doc/examples/examples.hpp.in b/doc/examples/examples.hpp.in
@@ -129,8 +129,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * <tr valign="top">
  * <td>@ref twentyseven_pt_stencil_solver</td>
  * <td> Using a twentyseven point 3D stencil to solve the poisson equation
-with
- * array views.
+ * with array views.
  * </td></tr>
  *
  * <tr valign="top">

diff --git a/hip/base/exception.hip.cpp b/hip/base/exception.hip.cpp
@@ -32,10 +32,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <ginkgo/core/base/exception.hpp>
 
+
 #include <hip/hip_runtime.h>
 #include <hipblas.h>
 #include <hipsparse.h>
 
+
 namespace gko {
 
 
@@ -64,6 +66,8 @@ std::string HipblasError::get_error(int64 error_code)
  GKO_REGISTER_HIPBLAS_ERROR(HIPBLAS_STATUS_INTERNAL_ERROR);
  GKO_REGISTER_HIPBLAS_ERROR(HIPBLAS_STATUS_NOT_SUPPORTED);
  return "Unknown error";
+
+#undef GKO_REGISTER_HIPBLAS_ERROR
 }
 
 
@@ -83,6 +87,8 @@ std::string HipsparseError::get_error(int64 error_code)
  GKO_REGISTER_HIPSPARSE_ERROR(HIPSPARSE_STATUS_INTERNAL_ERROR);
  GKO_REGISTER_HIPSPARSE_ERROR(HIPSPARSE_STATUS_MATRIX_TYPE_NOT_SUPPORTED);
  return "Unknown error";
+
+#undef GKO_REGISTER_HIPSPARSE_ERROR
 }
 
 

diff --git a/hip/base/math.hip.hpp b/hip/base/math.hip.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.
 ******************************<GINKGO LICENSE>*******************************/
 
-#ifndef GKO_CUDA_BASE_MATH_HPP_
-#define GKO_CUDA_BASE_MATH_HPP_
+#ifndef GKO_HIP_BASE_MATH_HPP_
+#define GKO_HIP_BASE_MATH_HPP_
 
 
 #include <ginkgo/core/base/math.hpp>
@@ -98,4 +98,4 @@ __device__ GKO_INLINE std::complex<double> one<std::complex<double>>()
 } // namespace gko
 
 
-#endif // GKO_CUDA_BASE_MATH_HPP_
+#endif // GKO_HIP_BASE_MATH_HPP_
diff --git a/hip/base/types.hip.hpp b/hip/base/types.hip.hpp
@@ -46,8 +46,6 @@ namespace gko {
 
 namespace kernels {
 namespace hip {
-
-
 namespace detail {
 
 
@@ -131,7 +129,6 @@ struct hip_type_impl<hipComplex> {
  using type = thrust::complex<float>;
 };
 
-
 template <typename T>
 constexpr hipblasDatatype_t hip_data_type_impl()
 {