Skip to content

Commit

Permalink
Merge branch 'develop' into update_rocmlir_reduce_types
Browse files Browse the repository at this point in the history
  • Loading branch information
richagadgil authored Jan 30, 2025
2 parents 80500ae + 879f306 commit 3e15a42
Show file tree
Hide file tree
Showing 59 changed files with 929 additions and 474 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'
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
2 changes: 1 addition & 1 deletion .github/workflows/performance.yaml
Original file line number Diff line number Diff line change
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
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
2 changes: 1 addition & 1 deletion docs/sphinx/requirements.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rocm-docs-core==1.13.0
rocm-docs-core==1.14.1
sphinx-collapse
141 changes: 136 additions & 5 deletions docs/sphinx/requirements.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 @@ -32,6 +32,13 @@ accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==0.7.16
# via sphinx
asttokens==3.0.0
# via stack-data
attrs==24.3.0
# via
# jsonschema
# jupyter-cache
# referencing
babel==2.15.0
# via
# pydata-sphinx-theme
Expand All @@ -49,9 +56,17 @@ cffi==1.16.0
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via sphinx-external-toc
# via
# jupyter-cache
# sphinx-external-toc
comm==0.2.2
# via ipykernel
cryptography==43.0.1
# via pyjwt
debugpy==1.8.12
# via ipykernel
decorator==5.1.1
# via ipython
deprecated==1.2.14
# via pygithub
docutils==0.21.2
Expand All @@ -60,36 +75,104 @@ docutils==0.21.2
# myst-parser
# pydata-sphinx-theme
# sphinx
exceptiongroup==1.2.2
# via ipython
executing==2.1.0
# via stack-data
fastjsonschema==2.20.0
# via rocm-docs-core
# via
# nbformat
# rocm-docs-core
gitdb==4.0.11
# via gitpython
gitpython==3.1.43
# via rocm-docs-core
greenlet==3.1.1
# via sqlalchemy
idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==8.6.1
# via
# jupyter-cache
# myst-nb
ipykernel==6.29.5
# via myst-nb
ipython==8.31.0
# via
# ipykernel
# myst-nb
jedi==0.19.2
# via ipython
jinja2==3.1.4
# via
# myst-parser
# sphinx
jsonschema==4.23.0
# via nbformat
jsonschema-specifications==2024.10.1
# via jsonschema
jupyter-cache==1.0.1
# via myst-nb
jupyter-client==8.6.3
# via
# ipykernel
# nbclient
jupyter-core==5.7.2
# via
# ipykernel
# jupyter-client
# nbclient
# nbformat
markdown-it-py==3.0.0
# via
# mdit-py-plugins
# myst-parser
markupsafe==2.1.5
# via jinja2
matplotlib-inline==0.1.7
# via
# ipykernel
# ipython
mdit-py-plugins==0.4.1
# via myst-parser
mdurl==0.1.2
# via markdown-it-py
myst-parser==3.0.1
myst-nb==1.1.2
# via rocm-docs-core
myst-parser==3.0.1
# via myst-nb
nbclient==0.10.2
# via
# jupyter-cache
# myst-nb
nbformat==5.10.4
# via
# jupyter-cache
# myst-nb
# nbclient
nest-asyncio==1.6.0
# via ipykernel
packaging==24.1
# via
# ipykernel
# pydata-sphinx-theme
# sphinx
parso==0.8.4
# via jedi
pexpect==4.9.0
# via ipython
platformdirs==4.3.6
# via jupyter-core
prompt-toolkit==3.0.50
# via ipython
psutil==6.1.1
# via ipykernel
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.3
# via stack-data
pycparser==2.22
# via cffi
pydata-sphinx-theme==0.15.4
Expand All @@ -101,23 +184,42 @@ pygithub==2.3.0
pygments==2.18.0
# via
# accessible-pygments
# ipython
# pydata-sphinx-theme
# sphinx
pyjwt[crypto]==2.8.0
# via pygithub
pynacl==1.5.0
# via pygithub
python-dateutil==2.9.0.post0
# via jupyter-client
pyyaml==6.0.1
# via
# jupyter-cache
# myst-nb
# myst-parser
# rocm-docs-core
# sphinx-external-toc
pyzmq==26.2.0
# via
# ipykernel
# jupyter-client
referencing==0.36.1
# via
# jsonschema
# jsonschema-specifications
requests==2.32.3
# via
# pygithub
# sphinx
rocm-docs-core==1.13.0
rocm-docs-core==1.14.1
# via -r requirements.in
rpds-py==0.22.3
# via
# jsonschema
# referencing
six==1.17.0
# via python-dateutil
smmap==5.0.1
# via gitdb
snowballstemmer==2.2.0
Expand All @@ -127,6 +229,7 @@ soupsieve==2.5
sphinx==7.4.7
# via
# breathe
# myst-nb
# myst-parser
# pydata-sphinx-theme
# rocm-docs-core
Expand Down Expand Up @@ -160,15 +263,43 @@ sphinxcontrib-qthelp==1.0.8
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
sqlalchemy==2.0.37
# via jupyter-cache
stack-data==0.6.3
# via ipython
tabulate==0.9.0
# via jupyter-cache
tomli==2.0.1
# via sphinx
tornado==6.4.2
# via
# ipykernel
# jupyter-client
traitlets==5.14.3
# via
# comm
# ipykernel
# ipython
# jupyter-client
# jupyter-core
# matplotlib-inline
# nbclient
# nbformat
typing-extensions==4.12.2
# via
# ipython
# myst-nb
# pydata-sphinx-theme
# pygithub
# referencing
# sqlalchemy
urllib3==2.2.2
# via
# pygithub
# requests
wcwidth==0.2.13
# via prompt-toolkit
wrapt==1.16.0
# via deprecated
zipp==3.21.0
# via importlib-metadata
5 changes: 3 additions & 2 deletions examples/nlp/python_bert_squad/requirements_bertsquad.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 All @@ -24,4 +24,5 @@
tensorflow
onnxruntime
tokenizers==0.11.1; python_version == "3.6"
tokenizers; python_version > "3.6"
tokenizers==0.20.3; python_version == "3.8"
tokenizers; python_version > "3.8"
4 changes: 2 additions & 2 deletions requirements.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 All @@ -28,4 +28,4 @@ pybind/pybind11@3e9dfa2866941655c56877882565e7577de6fc7b --build
msgpack/[email protected] -DMSGPACK_BUILD_TESTS=Off
sqlite3@3.43.2 -DCMAKE_POSITION_INDEPENDENT_CODE=On
ROCm/composable_kernel@b7775add2d28251674d81e220cd4a857b90b997a -DCK_BUILD_JIT_LIB=On -DCMAKE_POSITION_INDEPENDENT_CODE=On
ROCm/rocMLIR@a4e823033fa9ce016d24fd7df9133982634646e3 -DBUILD_FAT_LIBROCKCOMPILER=On
ROCm/rocMLIR@112f8f46b38e4356cea1e44c6be373dbd8804a6d -DBUILD_FAT_LIBROCKCOMPILER=On
Loading

0 comments on commit 3e15a42

Please sign in to comment.