Fix drm include for OpenSUSE (#767)

* Fix drm include for OpenSUSE - uses libdrm/drm.h instead of drm/drm.h * Fix "List Files" step in CI workflows * Fix "List Files" step in CI workflows
ROCm · Apr 16, 2024 · eebf813 · eebf813
1 parent d766034
commit eebf813
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -59,9 +59,8 @@ jobs:
       shell: bash
       run: |
         which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
-        for i in python python3 git cmake ctest; do which-realpath $i; done
+        for i in python3 git cmake ctest; do which-realpath $i; done
         ls -la
-        cat /sys/class/kfd/kfd/topology/nodes/*/gpu_id || true; /opt/rocm/bin/rocminfo | grep gfx
 
     - name: Configure, Build, and Test
       timeout-minutes: 30
@@ -161,7 +160,6 @@ jobs:
         add-apt-repository -y ppa:git-core/ppa
         apt-get update
         apt-get install -y git
-        cat /sys/class/kfd/kfd/topology/nodes/*/gpu_id || true; /opt/rocm/bin/rocminfo | grep gfx
 
     - uses: actions/checkout@v4
 
@@ -185,15 +183,6 @@ jobs:
         echo "${PATH}:/usr/local/bin:${HOME}/.local/bin" >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib:${HOME}/.local/lib" >> $GITHUB_ENV
 
-    - name: List Files
-      shell: bash
-      run: |
-        echo "PATH: ${PATH}"
-        echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
-        which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
-        for i in python python3 git cmake ctest; do which-realpath $i; done
-        ls -la
-
     - name: Install requirements
       shell: bash
       run: |
@@ -202,6 +191,15 @@ jobs:
         apt-get install -y cmake python3-pip gcovr wkhtmltopdf xvfb xfonts-base xfonts-75dpi xfonts-100dpi xfonts-utils xfonts-encodings libfontconfig libdw-dev
         python3 -m pip install -r requirements.txt
 
+    - name: List Files
+      shell: bash
+      run: |
+        echo "PATH: ${PATH}"
+        echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
+        which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
+        for i in python3 git cmake ctest; do which-realpath $i; done
+        ls -la
+
     - name: Configure, Build, and Test (Total Code Coverage)
       timeout-minutes: 30
       shell: bash
@@ -371,14 +369,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: List Files
-      shell: bash
-      run: |
-        which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
-        for i in python python3 git cmake ctest; do which-realpath $i; done
-        ls -la
-        cat /sys/class/kfd/kfd/topology/nodes/*/gpu_id || true; /opt/rocm/bin/rocminfo | grep gfx
-
     - name: Install requirements
       shell: bash
       run: |
@@ -395,6 +385,13 @@ jobs:
         gcc --version
         g++ --version
 
+    - name: List Files
+      shell: bash
+      run: |
+        which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
+        for i in python3 git cmake ctest; do which-realpath $i; done
+        ls -la
+
     - name: Configure, Build, and Test
       timeout-minutes: 45
       shell: bash

diff --git a/source/lib/rocprofiler-sdk/page_migration/details/kfd_ioctl.h b/source/lib/rocprofiler-sdk/page_migration/details/kfd_ioctl.h
@@ -24,7 +24,7 @@
 #ifndef KFD_IOCTL_H_INCLUDED
 #define KFD_IOCTL_H_INCLUDED
 
-#include <drm/drm.h>
+#include <drm.h>
 #include <linux/ioctl.h>
 
 /*

diff --git a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries(
     PRIVATE rocprofiler::rocprofiler-shared-library
             rocprofiler::rocprofiler-common-library
             rocprofiler::rocprofiler-hsa-runtime
+            rocprofiler::rocprofiler-drm
             rocprofiler::rocprofiler-sdk-roctx-shared-library
             GTest::gtest
             GTest::gtest_main)