From c14ef9f4083fb8d2b3548c689c511e9071c97684 Mon Sep 17 00:00:00 2001
From: Michael LIAO <michael_liaocn@yahoo.com>
Date: Thu, 1 Aug 2019 14:50:03 -0400
Subject: [PATCH] Revise the previous fix to use the canonical path to HSA.

- This fix the build failures under certain environments.


[ROCm/rccl commit: 4f2aa06688740e2df2685d14518f5ffce46c0a9c]
---
 projects/rccl/CMakeLists.txt   | 2 +-
 projects/rccl/src/transport.cu | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/rccl/CMakeLists.txt b/projects/rccl/CMakeLists.txt
index 39a0cbcc94..237e9242b3 100644
--- a/projects/rccl/CMakeLists.txt
+++ b/projects/rccl/CMakeLists.txt
@@ -146,7 +146,7 @@ if("${HIP_COMPILER}" MATCHES "clang")
     PRIVATE --amdgpu-target=gfx908
     PRIVATE -fgpu-rdc)
   target_link_libraries(rccl PRIVATE -fgpu-rdc)
-  target_include_directories(rccl PRIVATE /opt/rocm/include)
+  target_include_directories(rccl PRIVATE /opt/rocm/hsa/include)
 endif()
 
 if("${HIP_COMPILER}" MATCHES "hcc")
diff --git a/projects/rccl/src/transport.cu b/projects/rccl/src/transport.cu
index 7d83ff4488..7d2003f267 100644
--- a/projects/rccl/src/transport.cu
+++ b/projects/rccl/src/transport.cu
@@ -7,7 +7,8 @@
 
 #include "core.h"
 #include "common_coll.h"
-#include <hsa.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 
 extern struct ncclTransport p2pTransport;
 extern struct ncclTransport shmTransport;