Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable MLIR by default in migraphx builds #2037

Merged
merged 21 commits into from
Aug 11, 2023
Merged

Enable MLIR by default in migraphx builds #2037

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1ce3eeb
Enable MLIR by default in migraphx builds
pfultz2 Aug 3, 2023
be7e5e9
Move ignore
pfultz2 Aug 3, 2023
201f6f2
Show gcc version
pfultz2 Aug 4, 2023
450f33a
Add verbose makefile
pfultz2 Aug 4, 2023
52afe68
Use verbose env variable
pfultz2 Aug 4, 2023
cbbf8aa
Set verbose makefile
pfultz2 Aug 4, 2023
451e9f1
Add a tmate session
pfultz2 Aug 4, 2023
fe9efb7
Try to print the env
pfultz2 Aug 5, 2023
4395e08
Fix cache key
pfultz2 Aug 5, 2023
e2d178d
Add back missing stages
pfultz2 Aug 5, 2023
bf1718f
Update rocm-cmake version
pfultz2 Aug 8, 2023
374327c
Merge
pfultz2 Aug 8, 2023
d9cd2a4
Add tidy const
pfultz2 Aug 9, 2023
3a2d2ae
Some more tidy fixes
pfultz2 Aug 9, 2023
780e375
Add extra comma
pfultz2 Aug 9, 2023
b77205d
Format
pfultz2 Aug 9, 2023
03d99a5
Merge branch 'develop' into default-mlir
causten Aug 9, 2023
aa6ca2f
Skip sigmoid like before
pfultz2 Aug 9, 2023
0f52753
Move rocMLIR to requirements.txt
causten Aug 10, 2023
e33b8a9
Fix tidy issues
pfultz2 Aug 10, 2023
e9bd9ac
Fix var name
pfultz2 Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ ADD dev-requirements.txt /dev-requirements.txt
ADD requirements.txt /requirements.txt
ADD rbuild.ini /rbuild.ini

# Temporarily install a new cmake until switching to ubuntu 22.04
RUN pip3 install cmake==3.22.1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ORT needs 3.26.4 would it make sense to bump this to 3.26.4 too?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, we should make sure our stuff builds with the cmake in ubuntu 22.04.


COPY ./tools/install_prereqs.sh /
RUN /install_prereqs.sh /usr/local / && rm /install_prereqs.sh
RUN test -f /usr/local/hash || exit 1
Expand Down Expand Up @@ -113,9 +116,6 @@ RUN git clone --single-branch --branch ${ONNXRUNTIME_BRANCH} --recursive ${ONNXR

ADD tools/build_and_test_onnxrt.sh /onnxruntime/build_and_test_onnxrt.sh

# Use the /opt/cmake install because LLVM/MLIR need cmake >= 3.20
RUN env PATH=/opt/cmake/bin:$PATH cget -p /usr/local install ROCmSoftwarePlatform/rocMLIR@1ad9d6df32acc6d29d58e8ed6710e36746d0a4d6 -DBUILD_FAT_LIBROCKCOMPILER=On

ENV MIOPEN_FIND_DB_PATH=/tmp/miopen/find-db
ENV MIOPEN_USER_DB_PATH=/tmp/miopen/user-db
ENV LD_LIBRARY_PATH=$PREFIX/lib
Expand Down
3 changes: 3 additions & 0 deletions hip-clang.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@ ADD dev-requirements.txt /dev-requirements.txt
ADD requirements.txt /requirements.txt
ADD rbuild.ini /rbuild.ini

# Temporarily install a new cmake until switching to ubuntu 22.04
RUN pip3 install cmake==3.22.1

COPY ./tools/install_prereqs.sh /
RUN /install_prereqs.sh /usr/local / && rm /install_prereqs.sh
4 changes: 3 additions & 1 deletion rbuild.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ deps =
-f requirements.txt

[gh]
ignore = danmar/cppcheck
ignore =
danmar/cppcheck
ROCmSoftwarePlatform/rocMLIR
deps =
-f dev-requirements.txt
oneapi-src/[email protected]
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ pybind/pybind11@d159a563383d10c821ba7b2a71905d1207db6de4 --build
msgpack/[email protected] -DMSGPACK_BUILD_TESTS=Off
[email protected] -DCMAKE_POSITION_INDEPENDENT_CODE=On
ROCmSoftwarePlatform/composable_kernel@5172ec5280f14974beee2acf1af1db3b2670244c -DCK_BUILD_JIT_LIB=On -DCMAKE_POSITION_INDEPENDENT_CODE=On
ROCmSoftwarePlatform/rocMLIR@1ad9d6df32acc6d29d58e8ed6710e36746d0a4d6 -DBUILD_FAT_LIBROCKCOMPILER=On
2 changes: 1 addition & 1 deletion src/targets/gpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ register_op(migraphx_gpu HEADER migraphx/gpu/convolution.hpp
rocm_set_soversion(migraphx_gpu ${MIGRAPHX_SO_VERSION})
rocm_clang_tidy_check(migraphx_gpu)

set(MIGRAPHX_ENABLE_MLIR OFF CACHE BOOL "")
set(MIGRAPHX_ENABLE_MLIR ON CACHE BOOL "")

if(MIGRAPHX_ENABLE_MLIR)
# Find package rocMLIR
Expand Down
Loading