use minimal hip includes (#68)

* https://rocm.docs.amd.com/projects/HIP/en/docs-6.0.0/user_guide/hip_porting_guide.html#hip-headers-hip-runtime-h-hip-runtime-api-h
ROCm · Jul 26, 2024 · 59a1305 · 59a1305
1 parent 109fc1a
commit 59a1305
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 22 deletions.
diff --git a/BuildTools/CMake/src/main.cpp b/BuildTools/CMake/src/main.cpp
@@ -22,7 +22,7 @@
 
 #include "error_macros.h"
 #include <assert.h>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Extensions/gemm_ex_bf16_r/gemm_ex_bf16_r.cpp b/Extensions/gemm_ex_bf16_r/gemm_ex_bf16_r.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Extensions/gemm_ex_f16_r/gemm_ex_f16_r.cpp b/Extensions/gemm_ex_f16_r/gemm_ex_f16_r.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 #include "helpers.hpp"
 #include <cmath>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Extensions/gemm_ex_f32_r/gemm_ex_f32_r.cpp b/Extensions/gemm_ex_f32_r/gemm_ex_f32_r.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Extensions/gemm_ex_i8_i32_r/gemm_ex_i8_i32_r.cpp b/Extensions/gemm_ex_i8_i32_r/gemm_ex_i8_i32_r.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Languages/C/main.c b/Languages/C/main.c
@@ -22,7 +22,7 @@
 
 #include "error_macros.h"
 #include <assert.h>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Languages/HIP/main.cpp b/Languages/HIP/main.cpp
@@ -22,7 +22,7 @@
 
 #include "error_macros.h"
 #include <assert.h>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-1/axpy/axpy.cpp b/Level-1/axpy/axpy.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-1/dot/dot.cpp b/Level-1/dot/dot.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-1/nrm2/nrm2.cpp b/Level-1/nrm2/nrm2.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-1/scal/scal.cpp b/Level-1/scal/scal.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-1/swap/swap.cpp b/Level-1/swap/swap.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-2/gemv/gemv.cpp b/Level-2/gemv/gemv.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-2/her/her.cpp b/Level-2/her/her.cpp
@@ -23,7 +23,7 @@
 #include "helpers.hpp"
 #include <complex>
 #include <hip/hip_complex.h>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-3/gemm/gemm.cpp b/Level-3/gemm/gemm.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Level-3/gemm_strided_batched/gemm_strided_batched.cpp b/Level-3/gemm_strided_batched/gemm_strided_batched.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <rocblas/rocblas.h>
 #include <stdio.h>

diff --git a/Patterns/Multi-device/Multi-device.cpp b/Patterns/Multi-device/Multi-device.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <omp.h>
 #include <rocblas/rocblas.h>

diff --git a/Patterns/Multi-stream/Multi-stream.cpp b/Patterns/Multi-stream/Multi-stream.cpp
@@ -21,7 +21,7 @@
  * ************************************************************************ */
 
 #include "helpers.hpp"
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <math.h>
 #include <omp.h>
 #include <rocblas/rocblas.h>

diff --git a/common/ArgParser.hpp b/common/ArgParser.hpp
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <map>
 #include <math.h>
 #include <rocblas/rocblas.h>

diff --git a/common/error_macros.h b/common/error_macros.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <rocblas/rocblas.h>
 #include <stdlib.h>
 

diff --git a/common/memoryHelpers.hpp b/common/memoryHelpers.hpp
@@ -1,3 +1,4 @@
+
 /* ************************************************************************
  * Copyright (C) 2019-2022 Advanced Micro Devices, Inc. All rights reserved.
  *
@@ -22,9 +23,10 @@
 
 #pragma once
 #include "error_macros.h"
+#include <cassert>
 #include <cinttypes>
 #include <cstdio>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <locale.h>
 #include <random>
 #include <stdlib.h>

diff --git a/common/timers.hpp b/common/timers.hpp
@@ -1,3 +1,4 @@
+
 /* ************************************************************************
  * Copyright (C) 2019-2022 Advanced Micro Devices, Inc. All rights reserved.
  *
@@ -19,11 +20,12 @@
  * CTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * ************************************************************************ */
+
 #pragma once
 #include "error_macros.h"
 #include <chrono>
 #include <cstdio>
-#include <hip/hip_runtime.h>
+#include <hip/hip_runtime_api.h>
 #include <iostream>
 
 namespace helpers