diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a55783ae0c1..5f42fd04e9b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,7 +55,6 @@ jobs: -DMIGRAPHX_ENABLE_GPU=On \ -DMIGRAPHX_ENABLE_CPU=On \ -DMIGRAPHX_ENABLE_FPGA=On \ - -DMIGRAPHX_ENABLE_MLIR=On \ -DBUILD_DEV=On \ -DROCM_ENABLE_GH_ANNOTATIONS=On \ -DCLANG_TIDY_DEPEND_ON_TARGET=Off \ diff --git a/Dockerfile b/Dockerfile index f7a9c953701..69b6971f3ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,10 +101,6 @@ RUN cget -p $PREFIX install facebook/zstd@v1.4.5 -X subdir -DCMAKE_DIR=build/cma RUN cget -p $PREFIX install ccache@v4.1 -DENABLE_TESTING=OFF RUN cget -p /opt/cmake install kitware/cmake@v3.26.4 -# Install MLIR -ADD mlir-requirements.txt /mlir-requirements.txt -RUN cget -p /usr/local install -f /mlir-requirements.txt - COPY ./test/onnx/.onnxrt-commit / ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime diff --git a/hip-clang.docker b/hip-clang.docker index c44e09fe73b..6f7b582576c 100755 --- a/hip-clang.docker +++ b/hip-clang.docker @@ -60,6 +60,3 @@ RUN pip3 install cmake==3.22.1 COPY ./tools/install_prereqs.sh / RUN /install_prereqs.sh /usr/local / && rm /install_prereqs.sh -# Install MLIR -ADD mlir-requirements.txt /mlir-requirements.txt -RUN cget -p /usr/local install -f /mlir-requirements.txt diff --git a/mlir-requirements.txt b/mlir-requirements.txt deleted file mode 100644 index 02af8d38df6..00000000000 --- a/mlir-requirements.txt +++ /dev/null @@ -1,24 +0,0 @@ -##################################################################################### -# The MIT License (MIT) -# -# Copyright (c) 2015-2022 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 -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -##################################################################################### -ROCmSoftwarePlatform/rocMLIR@2c519c48eaa278d13e6c40bc0941119826d71512 -DBUILD_FAT_LIBROCKCOMPILER=On diff --git a/requirements.txt b/requirements.txt index 623fb480ff7..c6fba4b6cc0 100755 --- a/requirements.txt +++ b/requirements.txt @@ -29,3 +29,4 @@ pybind/pybind11@d159a563383d10c821ba7b2a71905d1207db6de4 --build msgpack/msgpack-c@cpp-3.3.0 -DMSGPACK_BUILD_TESTS=Off sqlite3@3.17 -DCMAKE_POSITION_INDEPENDENT_CODE=On ROCmSoftwarePlatform/composable_kernel@5172ec5280f14974beee2acf1af1db3b2670244c -DCK_BUILD_JIT_LIB=On -DCMAKE_POSITION_INDEPENDENT_CODE=On +ROCmSoftwarePlatform/rocMLIR@2c519c48eaa278d13e6c40bc0941119826d71512 -DBUILD_FAT_LIBROCKCOMPILER=On diff --git a/src/targets/gpu/CMakeLists.txt b/src/targets/gpu/CMakeLists.txt index 0492f0680b2..4507a707f1e 100644 --- a/src/targets/gpu/CMakeLists.txt +++ b/src/targets/gpu/CMakeLists.txt @@ -192,7 +192,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