Fix conflicts.

.azuredevops/rocm-ci.yml

@@ -43,4 +43,4 @@ pr:
   drafts: false
 
 jobs:
-  - template: ${{ variables.CI_COMPONENT_PATH }}/rocprof-compute.yml@pipelines_repo
+  - template: ${{ variables.CI_COMPONENT_PATH }}/omniperf.yml@pipelines_repo

.github/CODEOWNERS

@@ -5,3 +5,9 @@ docs/ @ROCm/rocm-documentation
 *.md @ROCm/rocm-documentation
 *.rst @ROCm/rocm-documentation
 .readthedocs.yaml @ROCm/rocm-documentation
+
+# Packaging
+cmake/ @koomie
+tests/ @koomie
+CMakeLists.txt @koomie
+utils/ @koomie

.github/workflows/docs.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Build 1.x docs
         run: |
           cd docs/archive/docs-1.x
-          make html	
+          make html
       - name: Build 2.x docs
         run: |
           cd docs/archive/docs-2.x

.github/workflows/packaging.yml

@@ -5,7 +5,6 @@ on:
     tags:
       - "v[1-9].[0-9]+.[0-9]+*"
       - "rocm-[0-9]+.[0-9]+.[0-9]+*"
-      - "rocm-[0-9]+.[0-9]+.[0-9]+*"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

CONTRIBUTING.md

@@ -31,11 +31,7 @@ and apply your changes there.
 
 - Ensure the PR description clearly describes the problem and solution. If there is an existing GitHub issue open describing this bug, please include it in the description so we can close it.
 
-<<<<<<< HEAD
 - Ensure the PR is based on the `amd-staging` branch of the ROCm Compute Profiler GitHub repository.
-=======
-- Ensure the PR is based on the `dev` branch of the ROCm Compute Profiler GitHub repository.
->>>>>>> 1939361b (Rebranding of top level md files.)
 
 - ROCm Compute Profiler requires new commits to include a "Signed-off-by" token in the commit message (typically enabled via the `git commit -s` option), indicating your agreement to the projects's [Developer's Certificate of Origin](https://developercertificate.org/) and compatability with the project [LICENSE](https://github.com/ROCm/rocprofiler-compute/blob/main/LICENSE):
 

docs/install/grafana-setup.rst

@@ -79,6 +79,19 @@ directory to begin.
    $ sudo docker-compose build
    $ sudo docker-compose up -d
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+.. note::
+
+   To troubleshoot Docker container build failures related to certificate verification, try 
+   disabling any network proxy services on the host system. These proxy services can interfere 
+   with OpenSSL's ability to retrieve a correct certificate chain when the container accesses 
+   external websites.
+
+=======
+>>>>>>> 0e7085ccccbe27f9a804e1f5c9237026213d9da2
+>>>>>>> ad6f025f6ad34911d9d6eb9e685bacc9278c75f6
 The TCP ports for Grafana (``4000``) and MongoDB (``27017``) in the Docker
 container are mapped to ``14000`` and ``27018``, respectively, on the host side.
 

src/rocprof_compute_soc/soc_base.py

@@ -32,7 +32,6 @@
 from utils.utils import demarcate, console_debug, console_log, console_error
 from pathlib import Path
 from collections import OrderedDict
-from collections import OrderedDict
 
 from rocprof_compute_base import SUPPORTED_ARCHS
 from rocprof_compute_base import MI300_CHIP_IDS