Skip to content

Commit

Permalink
Merge branch 'develop' into layout-nchw-default
Browse files Browse the repository at this point in the history
  • Loading branch information
lakhinderwalia authored Feb 18, 2025
2 parents b62c7a8 + 27a90b5 commit 6bb8fa0
Show file tree
Hide file tree
Showing 383 changed files with 9,970 additions and 990 deletions.
4 changes: 4 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,7 @@ CheckOptions:
value: MIGRAPHX_
- key: readability-identifier-naming.ConstexprMethodIgnoredRegexp
value: 'quiet_NaN|signaling_NaN'
- key: readability-operators-representation.BinaryOperators
value: 'and;or;not'
- key: readability-operators-representation.OverloadedOperators
value: 'and;or;not'
54 changes: 28 additions & 26 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}

Expand All @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2

- name: Create Image Tag
id: image_hash
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
needs: check_image
if: ${{ needs.check_image.outputs.imageexists != 'true' }}
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2

- name: Build and publish
env:
Expand All @@ -94,7 +94,7 @@ jobs:
needs: check_image
if: ${{ needs.check_image.outputs.imageexists_sles != 'true' }}
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
- name: Build and publish SLES
env:
DOCKER_TAG_SLES: ${{ needs.check_image.outputs.imagetag_sles }}
Expand All @@ -118,10 +118,10 @@ jobs:

if: ${{ !cancelled() && (needs.build_image.result == 'success' || needs.build_image.result == 'skipped') }}
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2

- name: Restore cache files for tidy
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4.2.0
id: tidy_restore
with:
path: tidy-cache
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
gh actions-cache delete ${{ steps.tidy_restore.outputs.cache-matched-key }} --confirm
- name: Save cache files for tidy
uses: actions/cache/save@v3
uses: actions/cache/save@v4.2.0
if: always()
with:
path: tidy-cache
Expand All @@ -172,11 +172,11 @@ jobs:

if: ${{ !cancelled() && (needs.build_image.result == 'success' || needs.build_image.result == 'skipped') }}
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2

- name: Restore cache files for cppcheck
id: cppcheck_restore
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4.2.0
with:
path: cppcheck-cache
key: cppcheck-cache-1-${{ hashFiles('tools/cppcheck/rules.xml', 'tools/cppcheck/migraphx.py', 'CMakeLists.txt') }}-${{ github.ref }}
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
gh actions-cache delete ${{ steps.cppcheck_restore.outputs.cache-matched-key }} --confirm
- name: Save cache files for cppcheck
uses: actions/cache/save@v3
uses: actions/cache/save@v4.2.0
if: always()
with:
path: cppcheck-cache
Expand All @@ -222,7 +222,7 @@ jobs:

if: ${{ !cancelled() && (needs.build_image.result == 'success' || needs.build_image.result == 'skipped') }}
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
fetch-depth: 0

Expand Down Expand Up @@ -253,12 +253,12 @@ jobs:

if: ${{ !cancelled() && (needs.build_SLES_image.result == 'success' || needs.build_SLES_image.result == 'skipped') }}
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
fetch-depth: 0

- name: Restore cache files for ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4.2.0
id: ccache_restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
gh actions-cache delete ${{ steps.ccache_restore.outputs.cache-matched-key }} --confirm
- name: Save cache files for ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4.2.0
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand All @@ -319,7 +319,7 @@ jobs:
swap-storage: true
docker-images: true

- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -350,13 +350,15 @@ jobs:
swap-storage: true
docker-images: true

- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
fetch-depth: 0 # Fetch the entire repository history and all branches
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
- name: run License Check
run: python3 tools/check_stamped.py ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
- name: Run License Check
run: python3 tools/check_stamped.py origin/${{ github.event_name == 'pull_request' && github.base_ref || 'develop' }}

linux:

Expand Down Expand Up @@ -397,15 +399,15 @@ jobs:
python -m pip install --upgrade pip
pip install https://github.com/RadeonOpenCompute/rbuild/archive/master.tar.gz
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Cache dependencies
# Ignore the failure of a step and avoid terminating the job.
continue-on-error: true
uses: actions/cache@v3
uses: actions/cache@v4.2.0
id: deps_cache
with:
# This path is specific to Ubuntu
Expand All @@ -418,7 +420,7 @@ jobs:
run: rbuild prepare -d cget -s gh

- name: Restore cache files for ccache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4.2.0
id: ccache_restore
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -456,7 +458,7 @@ jobs:
gh actions-cache delete ${{ steps.ccache_restore.outputs.cache-matched-key }} --confirm
- name: Save cache files for ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4.2.0
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand Down Expand Up @@ -510,7 +512,7 @@ jobs:
swap-storage: true
docker-images: true

- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -519,7 +521,7 @@ jobs:
- name: Cache dependencies
# Ignore the failure of a step and avoid terminating the job.
continue-on-error: true
uses: actions/cache@v3
uses: actions/cache@v4.2.0
with:
# This path is specific to Ubuntu
path: ${{ github.workspace }}/cget
Expand All @@ -537,7 +539,7 @@ jobs:
- name: Restore cache files for ccache
id: ccache_restore_fpga
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4.2.0
with:
path: ${{ github.workspace }}/ccache
key: ${{ matrix.os }}-${{ matrix.configuration }}-ccache-${{ github.ref }}
Expand Down Expand Up @@ -575,7 +577,7 @@ jobs:
gh actions-cache delete ${{ steps.ccache_restore_fpga.outputs.cache-matched-key }} --confirm
- name: Save cache files for ccache
uses: actions/cache/save@v3
uses: actions/cache/save@v4.2.0
if: always()
with:
path: ${{ github.workspace }}/ccache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean-closed-pr-caches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2

- name: Cleanup
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/config.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#=====ROCM INFO=====
ROCM_VERSION : '6.0.2'
ROCM_VERSION : '6.3.1'
#default ROCm version to be used
ROCM_BASE_IMAGE : 'rocm/dev-ubuntu-20.04'
ROCM_BASE_IMAGE : 'rocm/dev-ubuntu-22.04'
#base image from dockerhub to be used
ROCM_BUILT_IMAGE : 'rocm-migraphx'
#name of the docker image built upon ROCm base
Expand All @@ -26,4 +26,4 @@ PERFORMANCE_TEST_TIMEOUT : '30m'

#===== W A R N I N G =====
#VARIABLE NAMES NOT TO BE CHANGED, VALUES ONLY!
#VALUES MUST BE ENGLOSED IN SINGLE QUOTES!
#VALUES MUST BE ENGLOSED IN SINGLE QUOTES!
6 changes: 3 additions & 3 deletions .github/workflows/performance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
rocm_release:
description: ROCm Version
required: true
default: '6.0.2'
default: '6.3.1'
performance_reports_repo:
description: Repository where performance reports are stored
required: true
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
perf_timeout: ${{ steps.read_config.outputs.perf_timeout }}
steps:
- name: checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
- name: read_config
id: read_config
run: |
Expand Down Expand Up @@ -96,4 +96,4 @@ jobs:
secrets:
gh_token: ${{ secrets.MIGRAPHX_BOT_TOKEN }}
mail_user: ${{ secrets.MAIL_USERNAME }}
mail_pass: ${{ secrets.MAIL_PASSWORD }}
mail_pass: ${{ secrets.MAIL_PASSWORD }}
4 changes: 2 additions & 2 deletions .github/workflows/rocm-image-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
release:
uses: ROCm/migraphx-benchmark/.github/workflows/rocm-release.yml@main
with:
rocm_release: ${{ github.event.inputs.rocm_release || '5.1' }}
rocm_release: ${{ github.event.inputs.rocm_release || '6.3.1' }}
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' }}
base_image: ${{ github.event.inputs.base_image || 'rocm/dev-ubuntu-22.04' }}
docker_image: ${{ github.event.inputs.docker_image || 'rocm-migraphx' }}
branch_name: ${{ github.event.inputs.branch_name || 'develop' }}
build_navi: ${{ github.event.inputs.build_navi || '0' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-onnxrt-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: echo_sha1
run: echo ${{ env.onnxsha }}

- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
ref: develop

Expand Down Expand Up @@ -54,4 +54,4 @@ jobs:
TedThemistokleous
causten
draft: false
base: develop
base: develop
6 changes: 3 additions & 3 deletions .github/workflows/sync_rocMLIR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ on:
type: string
description: ROCm release version
required: true
default: '6.0.2'
default: '6.3.1'
base_image:
type: string
description: Base image for ROCm Docker build
required: true
default: 'rocm/dev-ubuntu-20.04'
default: 'rocm/dev-ubuntu-22.04'
docker_image:
type: string
description: Docker image name for rocm Docker build
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
repo_org: ${{ steps.read_config.outputs.repo_org }}
steps:
- name: checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
- name: read_config
id: read_config
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unreleased_rocm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
rocm_release:
description: Use tuned MIOpen database for ROCm release
required: true
default: '6.0.2'
default: '6.3.1'
performance_reports_repo:
description: Repository where performance reports are stored
required: true
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
perf_timeout: ${{ steps.read_config.outputs.perf_timeout }}
steps:
- name: checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.2.2
- name: read_config
id: read_config
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly_master_sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
ref: develop
fetch-depth: '0'
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#####################################################################################
# The MIT License (MIT)
#
# Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
# Copyright (c) 2015-2025 Advanced Micro Devices, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -208,7 +208,6 @@ rocm_enable_clang_tidy(
-clang-diagnostic-disabled-macro-expansion
-clang-diagnostic-extern-c-compat
-clang-diagnostic-unused-command-line-argument
-cppcoreguidelines-avoid-capture-default-when-capturing-this
-cppcoreguidelines-avoid-const-or-ref-data-members
-cppcoreguidelines-avoid-do-while
-cppcoreguidelines-explicit-virtual-functions
Expand All @@ -222,7 +221,6 @@ rocm_enable_clang_tidy(
-cppcoreguidelines-pro-type-reinterpret-cast
-cppcoreguidelines-pro-type-union-access
-cppcoreguidelines-pro-type-vararg
-cppcoreguidelines-rvalue-reference-param-not-moved
-cppcoreguidelines-special-member-functions
-cppcoreguidelines-use-default-member-init
-cppcoreguidelines-virtual-class-destructor
Expand Down Expand Up @@ -325,7 +323,6 @@ rocm_enable_cppcheck(
${CMAKE_CURRENT_SOURCE_DIR}/test/include
DEFINE
MIGRAPHX_MLIR=1
MIGRAPHX_ENABLE_HIPBLASLT_GEMM=1
MIGRAPHX_HAS_EXECUTORS=0
CPPCHECK=1
MIGRAPHX_USE_MIOPEN=1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ RUN pip3 install -r /doc-requirements.txt
# Install latest ccache version
RUN cget -p $PREFIX install facebook/zstd@v1.4.5 -X subdir -DCMAKE_DIR=build/cmake
RUN cget -p $PREFIX install ccache@v4.1 -DENABLE_TESTING=OFF
RUN cget -p /opt/cmake install kitware/cmake@v3.27.0
RUN cget -p /opt/cmake install kitware/cmake@v3.28.0
# Install a newer version of doxygen because the one that comes with ubuntu is broken
RUN cget -p $PREFIX install doxygen@Release_1_9_8

Expand Down
Loading

0 comments on commit 6bb8fa0

Please sign in to comment.