Merge branch 'develop' into migraphx_onnxrt_env_docker

ROCm · Feb 6, 2024 · 3ca051a · 3ca051a
2 parents efe35d9 + bad7a52
commit 3ca051a
Show file tree

Hide file tree

Showing 232 changed files with 7,735 additions and 1,528 deletions.
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -17,7 +17,7 @@ This workflow adds pull requests and issues to a specific GitHub project board w
     The workflow has a single job named `add-to-project`. The following step is executed in this job:
      - The `add-to-project` job uses the `actions/[email protected]` action to add pull requests and issues to a specific project board. The `with` parameters are `project-url` and `github-token`, which specify the URL of the project board and the GitHub token used to authenticate the action.
 
-    For more details, please refer to the [add-to-project.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/add-to-project.yaml) file in the repository.
+    For more details, please refer to the [add-to-project.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/add-to-project.yaml) file in the repository.
 
 ---
 ## `benchmark.yaml`
@@ -41,7 +41,7 @@ This workflow runs the `MiGraphX performance benchmarks` and generates reports b
 
      - `result_repo`: the repository where the benchmark results will be pushed for comparison.
 
-    For more details, please refer to the [benchmark.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/benchmark.yaml) file in the repository.
+    For more details, please refer to the [benchmark.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/benchmark.yaml) file in the repository.
 
 ---
 
@@ -80,7 +80,7 @@ Overall, this workflow automates the process of building and testing the AMDMIGr
 
      - `linux-fpga`: this job builds and tests AMDMIGraphX on a Linux operating system with support for FPGA acceleration. It includes additional steps to verify FPGA functionality and performance.
 
-    For more details, please refer to the [ci.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/ci.yaml) file in the repository.
+    For more details, please refer to the [ci.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/ci.yaml) file in the repository.
 
 ---
 ## `clean-closed-pr-caches.yaml`
@@ -100,7 +100,7 @@ This workflow has purpose to clean up any cached data related to the pull reques
 
      - `Cleanup`: step performs the actual cache cleanup using a series of commands.
 
-    For more details, please refer to the [clean-closed-pr-caches.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/clean-closed-pr-caches.yaml) file in the repository.
+    For more details, please refer to the [clean-closed-pr-caches.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/clean-closed-pr-caches.yaml) file in the repository.
 
 ---
 
@@ -111,7 +111,7 @@ This workflow generates a report of the MiGraphX benchmark results between two d
 </p>
 
 - ## Trigger
-     - The workflow is triggered manually through the "Run workflow" button in the Actions tab of the repository and it will run reusable workflow [history.yml](https://github.com/ROCmSoftwarePlatform/migraphx-benchmark/blob/main/.github/workflows/history.yml)
+     - The workflow is triggered manually through the "Run workflow" button in the Actions tab of the repository and it will run reusable workflow [history.yml](https://github.com/ROCm/migraphx-benchmark/blob/main/.github/workflows/history.yml)
 
 - ## Input Parameters
     The workflow requires the following inputs:
@@ -126,7 +126,7 @@ This workflow generates a report of the MiGraphX benchmark results between two d
 
      - `organization`: Organization based on which location of files will be different.
 
-    For more details, please refer to the [history.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/history.yaml) file in the repository.
+    For more details, please refer to the [history.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/history.yaml) file in the repository.
 
 ---
 ## `performance.yaml`
@@ -136,7 +136,7 @@ This workflow runs performance tests on the MIGraphX repository and generates a
 </p>
 
 - ## Trigger
-    The workflow will run reusable workflow [perf-test.yml](https://github.com/ROCmSoftwarePlatform/migraphx-benchmark/blob/main/.github/workflows/perf-test.yml) by the following events:
+    The workflow will run reusable workflow [perf-test.yml](https://github.com/ROCm/migraphx-benchmark/blob/main/.github/workflows/perf-test.yml) by the following events:
 
      - Pull requests opened, synchronized or closed on the `develop` branch.
 
@@ -161,7 +161,7 @@ This workflow runs performance tests on the MIGraphX repository and generates a
 
      - `flags`: Command line arguments to be passed to the performance test script. Default is `-r`.
 
-    For more details, please refer to the [performance.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/performance.yaml) file in the repository.
+    For more details, please refer to the [performance.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/performance.yaml) file in the repository.
 
 ---
 ## `rocm-image-release.yaml`
@@ -171,7 +171,7 @@ This workflow builds a Docker image for a specified ROCm release version and pus
 </p>
 
 - ## Trigger
-     - The workflow is triggered manually through the "Run workflow" button in the Actions tab of the repository and it will run reusable workflow [rocm-release.yml](https://github.com/ROCmSoftwarePlatform/migraphx-benchmark/blob/main/.github/workflows/rocm-release.yml)
+     - The workflow is triggered manually through the "Run workflow" button in the Actions tab of the repository and it will run reusable workflow [rocm-release.yml](https://github.com/ROCm/migraphx-benchmark/blob/main/.github/workflows/rocm-release.yml)
 
 - ## Input Parameters
     The workflow requires the following inputs:
@@ -190,7 +190,7 @@ This workflow builds a Docker image for a specified ROCm release version and pus
 
      - `overwrite`: Specify whether to overwrite the Docker image if it already exists.
 
-    For more details, please refer to the [rocm-image-release.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/rocm-image-release.yaml) file in the repository.
+    For more details, please refer to the [rocm-image-release.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/rocm-image-release.yaml) file in the repository.
 
 ---
 
@@ -213,12 +213,12 @@ This workflow updates a file with the latest commit hash then creates a pull req
 
      - `echo_sha1`: step prints the SHA1 commit hash set in step `extract_sha1`.
 
-     - `actions/checkout@v3`: step checks out the codebase from the repository.
+     - `actions/checkout@v4.1.1`: step checks out the codebase from the repository.
 
      - `update_file`: step updates a file in the repository with the SHA1 commit hash fetched in step `extract_sha1`.
 
      - `Make changes to pull request`: step uses the `peter-evans/create-pull-request` action to create a pull request.
 
-    For more details, please refer to the [sync-onnxrt-main.yaml](https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/blob/develop/.github/workflows/sync-onnxrt-main.yaml) file in the repository.
+    For more details, please refer to the [sync-onnxrt-main.yaml](https://github.com/ROCm/AMDMIGraphX/blob/develop/.github/workflows/sync-onnxrt-main.yaml) file in the repository.
 
 ---
diff --git a/.github/workflows/add-to-project.yaml b/.github/workflows/add-to-project.yaml
@@ -15,5 +15,5 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          project-url: https://github.com/orgs/ROCmSoftwarePlatform/projects/26
+          project-url: https://github.com/orgs/ROCm/projects/3
           github-token: ${{ secrets.TEST_PR_WORKFLOW }}
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -10,6 +10,6 @@ jobs:
       rocm_version: 5.7
       script_repo: migraphx-benchmark/benchmark-utils
       result_path: /usr/share/migraphx/test-results
-      result_repo: ROCmSoftwarePlatform/comparison-results
+      result_repo: ROCm/comparison-results
     secrets:
       gh_token: ${{ secrets.MIGRAPHX_BOT_TOKEN }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -35,7 +35,7 @@ jobs:
 
     steps: 
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Create Image Tag
         id: image_hash
@@ -72,7 +72,7 @@ jobs:
     needs: check_image
     if: ${{ needs.check_image.outputs.imageexists != 'true' }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
 
     - name: Build and publish 
       env:            
@@ -94,7 +94,7 @@ jobs:
     needs: check_image
     if: ${{ needs.check_image.outputs.imageexists_sles != 'true' }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
     - name: Build and publish SLES
       env:            
         DOCKER_TAG_SLES: ${{ needs.check_image.outputs.imagetag_sles }}
@@ -118,7 +118,7 @@ jobs:
 
     if: ${{ !cancelled() && (needs.build_image.result == 'success' || needs.build_image.result == 'skipped') }}
     steps: 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
 
     - name: Restore cache files for tidy
       uses: actions/cache/restore@v3 
@@ -172,7 +172,7 @@ jobs:
 
     if: ${{ !cancelled() && (needs.build_image.result == 'success' || needs.build_image.result == 'skipped') }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
 
     - name: Restore cache files for cppcheck
       id: cppcheck_restore
@@ -222,7 +222,7 @@ jobs:
 
     if: ${{ !cancelled() && (needs.build_image.result == 'success' || needs.build_image.result == 'skipped') }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
 
@@ -253,7 +253,7 @@ jobs:
 
     if: ${{ !cancelled() && (needs.build_SLES_image.result == 'success' || needs.build_SLES_image.result == 'skipped') }}      
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
 
@@ -319,7 +319,7 @@ jobs:
         swap-storage: true
         docker-images: true
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -350,7 +350,7 @@ jobs:
         swap-storage: true
         docker-images: true
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -397,7 +397,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install https://github.com/RadeonOpenCompute/rbuild/archive/master.tar.gz
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -510,7 +510,7 @@ jobs:
         swap-storage: true
         docker-images: true
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.1.1
     - name: Set up Python
       uses: actions/setup-python@v4
       with:

diff --git a/.github/workflows/clean-closed-pr-caches.yaml b/.github/workflows/clean-closed-pr-caches.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Cleanup
         run: |

diff --git a/.github/workflows/history.yaml b/.github/workflows/history.yaml
@@ -15,24 +15,24 @@ on:
       history_repo:
         description: Repository for history results between dates
         required: true
-        default: 'ROCmSoftwarePlatform/migraphx-reports'
+        default: 'ROCm/migraphx-reports'
       benchmark_utils_repo:
         description: Repository where benchmark utils are stored
         required: true
-        default: "ROCmSoftwarePlatform/migraphx-benchmark-utils"
+        default: "ROCm/migraphx-benchmark-utils"
       organization:
         description: Organization based on which location of files will be different
         required: true
         default: "AMD"
 
 jobs:
   release:
-    uses: ROCmSoftwarePlatform/migraphx-benchmark/.github/workflows/history.yml@main
+    uses: ROCm/migraphx-benchmark/.github/workflows/history.yml@main
     with:
       start_date: ${{ github.event.inputs.start_date || 'yyyy-mm-dd' }}
       end_date: ${{ github.event.inputs.end_date || 'yyyy-mm-dd' }}
-      history_repo: ${{ github.event.inputs.history_repo || 'ROCmSoftwarePlatform/migraphx-reports' }}
-      benchmark_utils_repo: ${{ github.event.inputs.benchmark_utils_repo || 'ROCmSoftwarePlatform/migraphx-benchmark-utils' }}
+      history_repo: ${{ github.event.inputs.history_repo || 'ROCm/migraphx-reports' }}
+      benchmark_utils_repo: ${{ github.event.inputs.benchmark_utils_repo || 'ROCm/migraphx-benchmark-utils' }}
       organization: ${{ github.event.inputs.organization || 'AMD' }}
     secrets:
       gh_token: ${{ secrets.MIGRAPHX_BOT_TOKEN }}

diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
@@ -16,11 +16,11 @@ on:
       performance_reports_repo:
         description: Repository where performance reports are stored
         required: true
-        default: 'ROCmSoftwarePlatform/migraphx-reports'
+        default: 'ROCm/migraphx-reports'
       benchmark_utils_repo:
         description: Repository where benchmark utils are stored
         required: true
-        default: "ROCmSoftwarePlatform/migraphx-benchmark-utils"
+        default: "ROCm/migraphx-benchmark-utils"
       organization:
         description: Organization based on which location of files will be different
         required: true
@@ -48,14 +48,14 @@ concurrency:
 
 jobs:
   release:
-    uses: ROCmSoftwarePlatform/migraphx-benchmark/.github/workflows/perf-test.yml@main
+    uses: ROCm/migraphx-benchmark/.github/workflows/perf-test.yml@main
     with:
       rocm_release: ${{ github.event.inputs.rocm_release || '5.7' }}
       result_number: ${{ github.event.inputs.result_number || '10' }}
       flags: ${{ github.event.inputs.flags || '-r' }}
-      performance_reports_repo: ${{ github.event.inputs.performance_reports_repo || 'ROCmSoftwarePlatform/migraphx-reports' }}
+      performance_reports_repo: ${{ github.event.inputs.performance_reports_repo || 'ROCm/migraphx-reports' }}
       performance_backup_repo: ${{ github.event.inputs.performance_backup_repo || 'migraphx-benchmark/performance-backup' }}
-      benchmark_utils_repo: ${{ github.event.inputs.benchmark_utils_repo || 'ROCmSoftwarePlatform/migraphx-benchmark-utils' }}
+      benchmark_utils_repo: ${{ github.event.inputs.benchmark_utils_repo || 'ROCm/migraphx-benchmark-utils' }}
       organization: ${{ github.event.inputs.organization || 'AMD' }}
       model_timeout: ${{ github.event.inputs.model_timeout || '30m' }}
     secrets:

diff --git a/.github/workflows/rocm-image-release.yaml b/.github/workflows/rocm-image-release.yaml
@@ -9,7 +9,7 @@ on:
       benchmark-utils_repo:
         description: Repository for benchmark utils
         required: true
-        default: 'ROCmSoftwarePlatform/migraphx-benchmark-utils'
+        default: 'ROCm/migraphx-benchmark-utils'
       base_image:
         description: Base image for rocm Docker build
         required: true
@@ -29,10 +29,10 @@ on:
 
 jobs:
   release:
-    uses: ROCmSoftwarePlatform/migraphx-benchmark/.github/workflows/rocm-release.yml@main
+    uses: ROCm/migraphx-benchmark/.github/workflows/rocm-release.yml@main
     with:
       rocm_release: ${{ github.event.inputs.rocm_release || '5.1' }}
-      benchmark-utils_repo: ${{ github.event.inputs.benchmark-utils_repo || 'ROCmSoftwarePlatform/migraphx-benchmark-utils' }}
+      benchmark-utils_repo: ${{ github.event.inputs.benchmark-utils_repo || 'ROCm/migraphx-benchmark-utils' }}
       base_image: ${{ github.event.inputs.base_image || 'rocm/dev-ubuntu-20.04' }}
       docker_image: ${{ github.event.inputs.docker_image || 'rocm-migraphx' }}
       build_navi: ${{ github.event.inputs.build_navi || '0' }}

diff --git a/.github/workflows/sync-onnxrt-main.yaml b/.github/workflows/sync-onnxrt-main.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: echo_sha1
         run: echo ${{ env.onnxsha }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
         with: 
           ref: develop
 
@@ -45,10 +45,13 @@ jobs:
             [1]: https://github.com/peter-evans/create-pull-request
           labels: |
             onnxruntime
-            dependancies
+            dependencies
             automated 
             skip bot checks
-          assignees: TedThemistokleous
-          reviewers: TedThemistokleous causten
+          assignees: | 
+            TedThemistokleous
+          reviewers: |
+            TedThemistokleous
+            causten
           draft: false
           base: develop
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,9 +111,10 @@ set(MIGRAPHX_ENABLE_FPGA Off CACHE BOOL "")
 
 set(MIGRAPHX_HAS_EXECUTORS_DEFAULT Off)
 find_package(ParallelSTL)
-if(ParallelSTL_FOUND)
-    set(MIGRAPHX_HAS_EXECUTORS_DEFAULT On)
-endif()
+# TODO: resolve parallism issue
+# if(ParallelSTL_FOUND)
+# set(MIGRAPHX_HAS_EXECUTORS_DEFAULT On)
+# endif()
 option(MIGRAPHX_HAS_EXECUTORS "C++ supports parallel executors" ${MIGRAPHX_HAS_EXECUTORS_DEFAULT})
 if(MIGRAPHX_HAS_EXECUTORS AND ParallelSTL_USES_TBB)
     list(APPEND PACKAGE_DEPENDS libtbb2)

diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y gnupg2 --no-install-recommends curl &&
     curl -sL http://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -
 
 # Add rocm repository
-RUN sh -c 'echo deb [arch=amd64 trusted=yes] http://repo.radeon.com/rocm/apt/5.7/ focal main > /etc/apt/sources.list.d/rocm.list'
+RUN sh -c 'echo deb [arch=amd64 trusted=yes] http://repo.radeon.com/rocm/apt/6.0.1/ focal main > /etc/apt/sources.list.d/rocm.list'
 
 # From docs.amd.com for installing rocm. Needed to install properly
 RUN sh -c "echo 'Package: *\nPin: release o=repo.radeon.com\nPin-priority: 600' > /etc/apt/preferences.d/rocm-pin-600"
@@ -22,7 +22,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
     cmake \
     curl \
     doxygen \
-    g++-7 \
+    g++ \
     gdb \
     git \
     lcov \
@@ -50,6 +50,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
     hipcub  \
     hipblas  \
     hipify-clang \
+    hiprand-dev \
     half \
     libssl-dev \
     zlib1g-dev && \