hic: Add hicDataType and fixup missing deallocation of buffer in test…

…_hicsparse (#237)
ecmwf · Dec 3, 2024 · 7d3d2fc · 7d3d2fc
1 parent fa9523e
commit 7d3d2fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/hic/src/hic/hic_library_types.h b/hic/src/hic/hic_library_types.h
@@ -29,12 +29,15 @@ HIC_NAMESPACE_BEGIN
 #if HIC_BACKEND_CUDA
   constexpr decltype(CUDA_R_32F) HIC_R_32F = CUDA_R_32F;
   constexpr decltype(CUDA_R_64F) HIC_R_64F = CUDA_R_64F;
+  using hicDataType = cudaDataType;
 #elif HIC_BACKEND_HIP
   constexpr decltype(HIP_R_32F) HIC_R_32F = HIP_R_32F;
   constexpr decltype(HIP_R_64F) HIC_R_64F = HIP_R_64F;
+  using hicDataType = hipDataType;
 #elif HIC_BACKEND_DUMMY
   constexpr int HIC_R_32F = 0;
   constexpr int HIC_R_64F = 0;
+  using hicDataType = int;
 #else
   #error Unsupported hic backend. Please define HIC_BACKEND_CUDA or HIC_BACKEND_HIP or HIC_BACKEND_DUMMY
 #endif

diff --git a/hic/tests/test_hicsparse.cc b/hic/tests/test_hicsparse.cc
@@ -120,6 +120,7 @@ int test_hicsparseSpMV() {
     HIC_CALL( hicMalloc(&buffer, bufferSize) );
 
     // Perform SpMV
+    // y = alpha * A * x + beta * y
     HICSPARSE_CALL( hicsparseSpMV(
         handle,
         HICSPARSE_OPERATION_NON_TRANSPOSE,
@@ -283,6 +284,7 @@ int test_hicsparseSpMM() {
     }
 
     // Clean up
+    HIC_CALL(hicFree(buffer));
     HIC_CALL(hicFree(dC));
     HIC_CALL(hicFree(dB));
     HIC_CALL(hicFree(dcolumn_indices));