From 879c99cad0e9ec646ac5a214f4e53189f6c71d12 Mon Sep 17 00:00:00 2001
From: Ranjith Ramakrishnan <Ranjith.Ramakrishnan@amd.com>
Date: Mon, 10 Oct 2022 09:55:45 -0700
Subject: [PATCH 1/2] Correct include path for new directory layout

SWDEV-345870 - Instead of finding the header path using header files use the install interface provided by the package
---
 src/runtime/core/CMakeLists.txt | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/runtime/core/CMakeLists.txt b/src/runtime/core/CMakeLists.txt
index 249a3e9e..c817f928 100644
--- a/src/runtime/core/CMakeLists.txt
+++ b/src/runtime/core/CMakeLists.txt
@@ -13,25 +13,9 @@ include_directories(${LIBELF_INCLUDE_DIRS})
 # libatmi_runtime_say("LIBELF: ${LIBELF_INCLUDE_DIRS} ${LIBELF_LIBRARIES} and ${LIBELF_FOUND}")
 
 # Find comgr
-find_package(amd_comgr REQUIRED CONFIG
-             HINTS ${ROC_DIR} ${ROC_COMGR_CONFIG_DIR})
-find_path (amd_comgr_INCLUDE_DIRS
-    NAMES
-    amd_comgr.h
-    PATHS
-    ${ROCM_INCLUDE_DIRS}
-    ${ROC_DIR}
-    ${ROC_COMGR_INCLUDE_DIR}
-    ${ROC_COMGR_INCLUDE_DIR}/include
-    /opt/rocm/include
-    /usr/include
-    /usr/local/include
-    ENV CPATH
-    PATH_SUFFIXES include)
+find_package(amd_comgr REQUIRED)
 
 set(amd_comgr_LIBRARIES amd_comgr)
-include_directories(${amd_comgr_INCLUDE_DIRS})
-# libatmi_runtime_say("amd_comgr: ${amd_comgr_INCLUDE_DIRS} ${amd_comgr_LIBRARIES} and ${amd_comgr_FOUND}")
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64le)|(aarch64)$")
    add_definitions(-DLITTLEENDIAN_CPU=1)

From 1b6276e9331e6437c01566df496e50e222498ab5 Mon Sep 17 00:00:00 2001
From: Ranjith Ramakrishnan <Ranjith.Ramakrishnan@amd.com>
Date: Tue, 1 Nov 2022 16:51:34 -0700
Subject: [PATCH 2/2] Correct include path for new directory layout

SWDEV-345870 : Use actual header file amd_comgr.h rather than using wrapper file
---
 src/runtime/core/system.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runtime/core/system.cpp b/src/runtime/core/system.cpp
index 96aa4af8..68113860 100644
--- a/src/runtime/core/system.cpp
+++ b/src/runtime/core/system.cpp
@@ -14,7 +14,7 @@
 #include <set>
 #include <string>
 
-#include "amd_comgr.h"
+#include "amd_comgr/amd_comgr.h"
 #include "device_rt_internal.h"
 #include "internal.h"
 #include "machine.h"