Skip to content

Commit

Permalink
SWDEV-496634: Revert deprecation of hipHostMalloc and hipHostFree fun…
Browse files Browse the repository at this point in the history
…ctions (#1186)
  • Loading branch information
itrowbri authored Nov 11, 2024
1 parent f7c87e4 commit 0356446
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
4 changes: 2 additions & 2 deletions samples/common/defines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
}

#if HIP_VERSION >= 60300000
# define HIP_HOST_ALLOC_FUNC hipExtHostAlloc
# define HIP_HOST_FREE_FUNC hipFreeHost
# define HIP_HOST_ALLOC_FUNC hipHostMalloc
# define HIP_HOST_FREE_FUNC hipHostFree
#else
# define HIP_HOST_ALLOC_FUNC hipHostMalloc
# define HIP_HOST_FREE_FUNC hipHostFree
Expand Down
4 changes: 2 additions & 2 deletions tests/common/defines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
}

#if HIP_VERSION >= 60300000
# define HIP_HOST_ALLOC_FUNC hipExtHostAlloc
# define HIP_HOST_FREE_FUNC hipFreeHost
# define HIP_HOST_ALLOC_FUNC hipHostMalloc
# define HIP_HOST_FREE_FUNC hipHostFree
#else
# define HIP_HOST_ALLOC_FUNC hipHostMalloc
# define HIP_HOST_FREE_FUNC hipHostFree
Expand Down
6 changes: 1 addition & 5 deletions tests/rocprofv3/aborted-app/validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,7 @@ def get_kind_name(kind_id):
"hipGetLastError",
]
)
updated_expected_functions = [
func if func != "hipHostMalloc" else "hipExtHostAlloc"
for func in expected_functions
]
assert functions == expected_functions or functions == updated_expected_functions
assert functions == expected_functions


if __name__ == "__main__":
Expand Down

0 comments on commit 0356446

Please sign in to comment.