HIP: fix hipStreamWaitEvent define and nodiscard warnings

Author: IMbackK

ggml/src/ggml-cuda/common.cuh

@@ -25,6 +25,7 @@
 #include <cfloat>
 #include <cstdio>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #if defined(GGML_USE_HIP)
@@ -974,11 +975,11 @@ struct ggml_cuda_concurrent_event {
         per_stream_events.resize(n_streams);
 
         for (size_t i = 0; i < per_stream_events.size(); ++i) {
-            cudaEventCreateWithFlags(&per_stream_events[i], cudaEventDisableTiming);
+            CUDA_CHECK(cudaEventCreateWithFlags(&per_stream_events[i], cudaEventDisableTiming));
         }
 
-        cudaEventCreateWithFlags(&fork_event, cudaEventDisableTiming);
-        cudaEventCreateWithFlags(&join_event, cudaEventDisableTiming);
+        CUDA_CHECK(cudaEventCreateWithFlags(&fork_event, cudaEventDisableTiming));
+        CUDA_CHECK(cudaEventCreateWithFlags(&join_event, cudaEventDisableTiming));
     }
 };
 

ggml/src/ggml-cuda/vendors/hip.h

@@ -105,7 +105,7 @@
 #define cudaStreamNonBlocking hipStreamNonBlocking
 #define cudaStreamPerThread hipStreamPerThread
 #define cudaStreamSynchronize hipStreamSynchronize
-#define cudaStreamWaitEvent(stream, event, flags) hipStreamWaitEvent(stream, event, flags)
+#define cudaStreamWaitEvent hipStreamWaitEvent
 #define cudaGraphExec_t hipGraphExec_t
 #define cudaGraphNode_t hipGraphNode_t
 #define cudaKernelNodeParams hipKernelNodeParams