AI/rocm-systems
2
0
Vork 0
Code Kwesties Pull-aanvragen Actions Paketten Projecten Publicaties Wiki Activiteit

SWDEV-361592 - allow nullptr for userdata in hiphostfunc

Bladeren bron 
Signed-off-by: sdashmiz <shadi.dashmiz@amd.com>
Change-Id: I91728d363846ac6417d4a59920509ffacd4c9a58


[ROCm/clr commit: 9c83b3e0b2]
This commit is contained in:
sdashmiz
2022-10-13 13:48:34 -04:00
gecommit door Shadi Dashmiz
bovenliggende af7db12908
commit 234dc08f7c
1 gewijzigde bestanden met toevoegingen van 3 en 4 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files
projects/clr/hipamd/src/hip_graph.cpp
+3 -4
Bestand weergeven
@@ -785,7 +785,7 @@ hipError_t capturehipStreamWaitEvent(hipEvent_t& event, hipStream_t& stream, uns
hipError_t capturehipLaunchHostFunc(hipStream_t& stream, hipHostFn_t& fn, void*& userData) {
ClPrint(amd::LOG_INFO, amd::LOG_API, "[hipGraph] current capture node Memset2D on stream : %p",
stream);
if (fn == nullptr || userData == nullptr || !hip::isValid(stream)) {
if (fn == nullptr || !hip::isValid(stream)) {
return hipErrorInvalidValue;
}
hipHostNodeParams hostParams = {0};
@@ -1942,7 +1942,7 @@ hipError_t hipGraphHostNodeGetParams(hipGraphNode_t node, hipHostNodeParams* pNo
hipError_t hipGraphHostNodeSetParams(hipGraphNode_t node, const hipHostNodeParams* pNodeParams) {
HIP_INIT_API(hipGraphHostNodeSetParams, node, pNodeParams);
if (pNodeParams == nullptr || pNodeParams->fn == nullptr || pNodeParams->userData == nullptr ||
if (pNodeParams == nullptr || pNodeParams->fn == nullptr ||
node == nullptr || !hipGraphNode::isNodeValid(node)) {
HIP_RETURN(hipErrorInvalidValue);
}
@@ -1952,8 +1952,7 @@ hipError_t hipGraphHostNodeSetParams(hipGraphNode_t node, const hipHostNodeParam
hipError_t hipGraphExecHostNodeSetParams(hipGraphExec_t hGraphExec, hipGraphNode_t node,
const hipHostNodeParams* pNodeParams) {
HIP_INIT_API(hipGraphExecHostNodeSetParams, hGraphExec, node, pNodeParams);
if (hGraphExec == nullptr || pNodeParams == nullptr || pNodeParams->fn == nullptr ||
pNodeParams->userData == nullptr || node == nullptr || !hipGraphNode::isNodeValid(node)) {
if (hGraphExec == nullptr || pNodeParams == nullptr || pNodeParams->fn == nullptr || node == nullptr || !hipGraphNode::isNodeValid(node)) {
HIP_RETURN(hipErrorInvalidValue);
}
hipGraphNode_t clonedNode = hGraphExec->GetClonedNode(node);