From 60f00e4e8a399d4a4881f6540e848c34aa057bd7 Mon Sep 17 00:00:00 2001
From: pensun <peng.sun@amd.com>
Date: Wed, 17 Feb 2016 09:24:39 -0600
Subject: [PATCH] 1. Bug fix 2. passed initial tests on different sets of
 HIP_VISIBLE_DEVICES: (0),(1),(0,1),(1,2),(2,3),(1,2,3),(2,3,4),(1,5,2,3) and
 achieved expected choice of GPU devices at the runtime. 3. Passed HIP test
 suite.

[ROCm/clr commit: c1da0f1e129d47762f114b37f4cadcfb63edb3cb]
---
 projects/clr/hipamd/src/hip_hcc.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_hcc.cpp b/projects/clr/hipamd/src/hip_hcc.cpp
index ae0f00320f..1f2f6f0b3b 100644
--- a/projects/clr/hipamd/src/hip_hcc.cpp
+++ b/projects/clr/hipamd/src/hip_hcc.cpp
@@ -33,6 +33,7 @@ THE SOFTWARE.
 #include <sys/types.h>
 #include <unistd.h>
 #include <vector>
+#include <algorithm>
 
 #include <hc.hpp>
 #include <hc_am.hpp>
@@ -580,15 +581,19 @@ void ihipInit()
     g_deviceCnt = 0;
     for (int i=0; i<accs.size(); i++) {
         // check if the device id is included in the HIP_VISIBLE_DEVICES env variable
-        if (std::find(g_hip_visible_devices.begin(), g_hip_visible_devices.end(),
-             i) != g_hip_visible_devices.end())
-        {
-            if (! accs[i].get_is_emulated()) {
-               g_devices[g_deviceCnt].init(g_deviceCnt, accs[i]);
-               g_deviceCnt++;
+        if (! accs[i].get_is_emulated()) {
+            if (std::find(g_hip_visible_devices.begin(), g_hip_visible_devices.end(), (i-1)) == g_hip_visible_devices.end())
+            {
+                //std::cout << "The device is not in visible devices list, ignore, index i = " << i << std::endl;
+                continue;
             }
+            //std::cout << "The visible GPU number is " << i << std::endl;
+            g_devices[g_deviceCnt].init(g_deviceCnt, accs[i]);
+            //std::cout << "index of g_devices = "<< g_deviceCnt << std::endl;
+            g_deviceCnt++;
         }
     }
+    //std::cout << "g_deviceCnt = " << g_deviceCnt << std::endl;
 
     // The following assert is not valid as we introduce the
     // env variable of HIP_VISIBLE_DEVICES