From 1a9b00a7fd1031873e21e3e8288b82774ca46f25 Mon Sep 17 00:00:00 2001
From: gilbertlee-amd <44450918+gilbertlee-amd@users.noreply.github.com>
Date: Thu, 13 Aug 2020 12:25:28 -0600
Subject: [PATCH] Fixes to make TransferBench compile for hipclang (#254)

[ROCm/rccl commit: c985478133f964a876f913129c9b610b8b7bf728]
---
 projects/rccl/tools/TransferBench/TransferBench.cpp | 9 +--------
 projects/rccl/tools/TransferBench/TransferBench.hpp | 1 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/projects/rccl/tools/TransferBench/TransferBench.cpp b/projects/rccl/tools/TransferBench/TransferBench.cpp
index 9751e726a1..a5a3b0c91b 100644
--- a/projects/rccl/tools/TransferBench/TransferBench.cpp
+++ b/projects/rccl/tools/TransferBench/TransferBench.cpp
@@ -122,13 +122,6 @@ int main(int argc, char **argv)
   printf("Executing %d warmup iteration(s), and %d timed iteration(s) (Set via USE_ITERATIONS=#)\n",
          numWarmups, numIterations);
 
-  // Currently an environment variable is required in order to enable fine-grained VRAM allocations
-  if (!useCoarseMem && !getenv("HSA_FORCE_FINE_GRAIN_PCIE"))
-  {
-    printf("[ERROR] Currently you must set HSA_FORCE_FINE_GRAIN_PCIE=1 prior to execution\n");
-    exit(1);
-  }
-
   // Collect the number of available GPUs on this machine
   int numDevices;
   HIP_CALL(hipGetDeviceCount(&numDevices));
@@ -210,7 +203,7 @@ int main(int argc, char **argv)
       // Enable peer-to-peer access if this is the first time seeing this pair
       auto linkPair = std::make_pair(src, dst);
       linkMap[linkPair]++;
-      if (linkMap[linkPair] == 1)
+      if (linkMap[linkPair] == 1 && src != dst)
       {
         int canAccess;
         HIP_CALL(hipDeviceCanAccessPeer(&canAccess, src, dst));
diff --git a/projects/rccl/tools/TransferBench/TransferBench.hpp b/projects/rccl/tools/TransferBench/TransferBench.hpp
index ca09e34b3a..a6ce266ec3 100644
--- a/projects/rccl/tools/TransferBench/TransferBench.hpp
+++ b/projects/rccl/tools/TransferBench/TransferBench.hpp
@@ -20,6 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#include <vector>
 #include <sstream>
 
 // Helper macro for catching HIP errors