From 78fe0ef04c4c1a26dd45a9509a4eaf5594677551 Mon Sep 17 00:00:00 2001
From: Julia Jiang <julia.jiang@amd.com>
Date: Wed, 21 Jun 2023 18:33:35 -0400
Subject: [PATCH] SWDEV-390597 - NoGpuTst test of Catch2 fails with docker

Change-Id: Ibf65e0ec57d47357e0afd119200622e223850b1e


[ROCm/clr commit: a4cccd3b0e9c2e4d3fd2eeb15f9fa64ee173553b]
---
 projects/clr/hipamd/src/hip_device_runtime.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/src/hip_device_runtime.cpp b/projects/clr/hipamd/src/hip_device_runtime.cpp
index 7eb3f172e0..c024216a9b 100644
--- a/projects/clr/hipamd/src/hip_device_runtime.cpp
+++ b/projects/clr/hipamd/src/hip_device_runtime.cpp
@@ -558,7 +558,7 @@ hipError_t hipGetDeviceFlags ( unsigned int* flags ) {
 }
 
 hipError_t hipSetDevice ( int  device ) {
-  HIP_INIT_API(hipSetDevice, device);
+  HIP_INIT_API_NO_RETURN(hipSetDevice, device);
   if (static_cast<unsigned int>(device) < g_devices.size()) {
     hip::setCurrentDevice(device);