From 13c875eaf06b18d3cd2bc78e06fd932c40a4ed0a Mon Sep 17 00:00:00 2001 From: sdashmiz Date: Fri, 29 Apr 2022 16:14:29 -0400 Subject: [PATCH] SWDEV-321698 - remove Memcpy1D type - Memcpy1D node type is not complying with cuda Signed-off-by: sdashmiz Change-Id: If8113f5e699de0c62d98effc4580a2e0fee9a950 --- hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h | 1 - hipamd/src/hip_graph_internal.cpp | 3 +-- hipamd/src/hip_graph_internal.hpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h index 20d73aec6c..b9e095a676 100644 --- a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h +++ b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h @@ -1100,7 +1100,6 @@ typedef enum cudaGraphNodeType hipGraphNodeType; #define hipGraphNodeTypeEmpty cudaGraphNodeTypeEmpty #define hipGraphNodeTypeWaitEvent cudaGraphNodeTypeWaitEvent #define hipGraphNodeTypeEventRecord cudaGraphNodeTypeEventRecord -#define hipGraphNodeTypeMemcpy1D cudaGraphNodeTypeMemcpy1D #define hipGraphNodeTypeMemcpyFromSymbol cudaGraphNodeTypeMemcpyFromSymbol #define hipGraphNodeTypeMemcpyToSymbol cudaGraphNodeTypeMemcpyToSymbol #define hipGraphNodeTypeCount cudaGraphNodeTypeCount diff --git a/hipamd/src/hip_graph_internal.cpp b/hipamd/src/hip_graph_internal.cpp index e6d2afc52e..dc753dcf72 100644 --- a/hipamd/src/hip_graph_internal.cpp +++ b/hipamd/src/hip_graph_internal.cpp @@ -29,14 +29,13 @@ const char* GetGraphNodeTypeString(uint32_t op) { const char* case_string; switch (static_cast(op)) { CASE_STRING(hipGraphNodeTypeKernel, KernelNode) - CASE_STRING(hipGraphNodeTypeMemcpy, Memcpy3DNode) + CASE_STRING(hipGraphNodeTypeMemcpy, MemcpyNode) CASE_STRING(hipGraphNodeTypeMemset, MemsetNode) CASE_STRING(hipGraphNodeTypeHost, HostNode) CASE_STRING(hipGraphNodeTypeGraph, GraphNode) CASE_STRING(hipGraphNodeTypeEmpty, EmptyNode) CASE_STRING(hipGraphNodeTypeWaitEvent, WaitEventNode) CASE_STRING(hipGraphNodeTypeEventRecord, EventRecordNode) - CASE_STRING(hipGraphNodeTypeMemcpy1D, Memcpy1DNode) CASE_STRING(hipGraphNodeTypeMemcpyFromSymbol, MemcpyFromSymbolNode) CASE_STRING(hipGraphNodeTypeMemcpyToSymbol, MemcpyToSymbolNode) default: diff --git a/hipamd/src/hip_graph_internal.hpp b/hipamd/src/hip_graph_internal.hpp index 55d53cb910..3e3f66165b 100644 --- a/hipamd/src/hip_graph_internal.hpp +++ b/hipamd/src/hip_graph_internal.hpp @@ -640,7 +640,7 @@ class hipGraphMemcpyNode1D : public hipGraphNode { public: hipGraphMemcpyNode1D(void* dst, const void* src, size_t count, hipMemcpyKind kind, - hipGraphNodeType type = hipGraphNodeTypeMemcpy1D) + hipGraphNodeType type = hipGraphNodeTypeMemcpy) : hipGraphNode(type), dst_(dst), src_(src), count_(count), kind_(kind) {} ~hipGraphMemcpyNode1D() {}