From ec43cc44a98f1434901b5bf0750ffef4d7bd1bb4 Mon Sep 17 00:00:00 2001 From: makslevental Date: Thu, 2 May 2024 08:10:35 -0500 Subject: [PATCH] change to llvm-aie-native-tools --- .github/workflows/amd-aie-distro.yml | 6 +++--- .github/workflows/amd_aie_releases/pyproject.toml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/amd-aie-distro.yml b/.github/workflows/amd-aie-distro.yml index 28f925c63d68..bc13d71aea1f 100644 --- a/.github/workflows/amd-aie-distro.yml +++ b/.github/workflows/amd-aie-distro.yml @@ -181,7 +181,7 @@ jobs: # Turning off cone mode ensures that files in the project root are not included during checkout sparse-checkout-cone-mode: false - - uses: makslevental/mlir-wheels/actions/setup_base@b3d5c60b3c6f51e9ce9015e5c3529efc07919f21 + - uses: makslevental/mlir-wheels/actions/setup_base@d77bf5dc69c46a8c2738b44528749768888eb361 id: setup_base with: # optional @@ -193,7 +193,7 @@ jobs: MATRIX_OS: ${{ matrix.OS }} MATRIX_ARCH: ${{ matrix.ARCH }} - - uses: makslevental/mlir-wheels/actions/setup_ccache@b3d5c60b3c6f51e9ce9015e5c3529efc07919f21 + - uses: makslevental/mlir-wheels/actions/setup_ccache@d77bf5dc69c46a8c2738b44528749768888eb361 id: setup_ccache with: MATRIX_OS: ${{ matrix.OS }} @@ -244,7 +244,7 @@ jobs: echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV echo "HOST_CCACHE_DIR="$(ccache --get-config cache_dir)"" >> $GITHUB_ENV echo "PARALLEL_LEVEL=2" >> $GITHUB_ENV - echo "PIP_FIND_LINKS=https://github.com/makslevental/mlir-wheels/releases/expanded_assets/latest" >> $GITHUB_ENV + echo "PIP_FIND_LINKS=https://${{ github.actor }}:${{ github.token }}@github.com/Xilinx/llvm-aie/releases/expanded_assets/nightly" >> $GITHUB_ENV # build diff --git a/.github/workflows/amd_aie_releases/pyproject.toml b/.github/workflows/amd_aie_releases/pyproject.toml index c00a16d4bd61..8b832b2f587a 100644 --- a/.github/workflows/amd_aie_releases/pyproject.toml +++ b/.github/workflows/amd_aie_releases/pyproject.toml @@ -7,7 +7,7 @@ requires = [ "pybind11[global]>=2.10.4", "numpy", "dataclasses", - "mlir-native-tools", + "llvm-aie-native-tools", "PyYAML", ] build-backend = "setuptools.build_meta" @@ -20,7 +20,7 @@ manylinux-aarch64-image = "manylinux_2_28" manylinux-x86_64-image = "manylinux_2_28" [tool.cibuildwheel.linux] -environment = { PATH = "/usr/lib/ccache:/usr/lib64/ccache:/usr/lib/ccache/bin:$PATH", PIP_FIND_LINKS = "https://github.com/makslevental/mlir-wheels/releases/expanded_assets/latest" } +environment = { PATH = "/usr/lib/ccache:/usr/lib64/ccache:/usr/lib/ccache/bin:$PATH" } before-build = [ "{project}/scripts/docker_prepare_ccache.sh", "{project}/scripts/apply_patches.sh", @@ -47,7 +47,7 @@ repair-wheel-command = [ ] [tool.cibuildwheel.macos] -environment = { PATH = "/usr/local/opt/ccache/libexec:$PATH", PIP_FIND_LINKS = "https://github.com/makslevental/mlir-wheels/releases/expanded_assets/latest" } +environment = { PATH = "/usr/local/opt/ccache/libexec:$PATH" } before-build = [ "{project}/scripts/apply_patches.sh", ] @@ -56,7 +56,6 @@ repair-wheel-command = [ ] [tool.cibuildwheel.windows] -environment = { PIP_FIND_LINKS = "https://github.com/makslevental/mlir-wheels/releases/expanded_assets/latest" } before-build = [ "pip install delvewheel", "bash {project}\\scripts\\apply_patches.sh",