update

Xilinx · Oct 26, 2023 · 50b083e · 50b083e
1 parent 69300b0
commit 50b083e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 57 deletions.
diff --git a/.github/workflows/distro.yml b/.github/workflows/distro.yml
@@ -93,15 +93,15 @@ jobs:
       uses: microsoft/[email protected]
 
     - name: Free disk space
-      if: contains(matrix.OS, 'ubuntu')
-      uses: jlumbroso/free-disk-space@76866dbe54312617f00798d1762df7f43def6e5c # v1.2.0
+      if: contains(inputs.MATRIX_OS, 'ubuntu')
+      uses: descriptinc/free-disk-space@main
       with:
+        tool-cache: true
         android: true
         dotnet: true
         haskell: true
         large-packages: true
         swap-storage: false # This frees space on the wrong partition.
-        tool-cache: false # This includes Python, which we need.
 
     - uses: actions/setup-python@v4
       with:
@@ -172,14 +172,16 @@ jobs:
       run: |
         
         pip install cibuildwheel
-         
+        
+        export PIP_FIND_LINKS="https://makslevental.github.io/wheels https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels"
+        
         BOOST_ROOT="${{ steps.install-boost.outputs.BOOST_ROOT }}" \
         CIBW_ARCHS=${{ matrix.ARCH }} \
         CMAKE_GENERATOR="Ninja" \
         HOST_CCACHE_DIR=${{ steps.configure_ccache_dir_on_host.outputs.HOST_CCACHE_DIR }} \
         MATRIX_OS=${{ matrix.OS }} \
-        MLIR_WHEEL_VERSION="18.0.0.2023091015+780b046b" \
-        MLIR_AIE_WHEEL_VERSION="0.0.1.2023091105+a0cc3d0" \
+        MLIR_WHEEL_VERSION="17.0.0.2023092813+35ca6498" \
+        MLIR_AIE_WHEEL_VERSION="0.0.1.2023102602+bdd3c4be" \
         PARALLEL_LEVEL=${{ matrix.OS == 'windows-2019' && '2' || '4' }} \
         cibuildwheel --output-dir wheelhouse
 
@@ -190,10 +192,11 @@ jobs:
         
         sudo apt-get install -y python3-dev
         
+        export PIP_FIND_LINKS="https://makslevental.github.io/wheels https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels"
         export PIP_NO_BUILD_ISOLATION="false"
         export CIBW_ARCHS=${{ matrix.ARCH }}
-        export MLIR_WHEEL_VERSION="18.0.0.2023091015+780b046b"
-        export MLIR_AIE_WHEEL_VERSION="0.0.1.2023091105+a0cc3d0"
+        export MLIR_WHEEL_VERSION="17.0.0.2023092813+35ca6498"
+        export MLIR_AIE_WHEEL_VERSION="0.0.1.2023102602+bdd3c4be"
         export BOOST_ROOT="${{ steps.install-boost.outputs.BOOST_ROOT }}"
         export MATRIX_OS=${{ matrix.OS }}
         
@@ -202,10 +205,7 @@ jobs:
         ./scripts/pip_install_mlir_aie.sh
         
         CMAKE_GENERATOR=Ninja \
-        pip wheel . -v -w wheelhouse --no-build-isolation \
-          -f https://makslevental.github.io/wheels \
-          -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-          -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
+        pip wheel . -v -w wheelhouse --no-build-isolation
 
     - name: rename
       shell: bash

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -120,6 +120,8 @@ jobs:
       run: |
         pip install cibuildwheel
         
+        export PIP_FIND_LINKS="https://makslevental.github.io/wheels https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels"
+        
         cp -R scripts python_bindings/scripts
         cp requirements.txt python_bindings
         pushd python_bindings
@@ -129,8 +131,8 @@ jobs:
         CMAKE_GENERATOR="Ninja" \
         HOST_CCACHE_DIR=${{ steps.configure_ccache_dir_on_host.outputs.HOST_CCACHE_DIR }} \
         MATRIX_OS=${{ matrix.OS }} \
-        MLIR_WHEEL_VERSION="18.0.0.2023091015+780b046b" \
-        MLIR_AIE_WHEEL_VERSION="0.0.1.2023091105+a0cc3d0" \
+        MLIR_WHEEL_VERSION="17.0.0.2023092813+35ca6498" \
+        MLIR_AIE_WHEEL_VERSION="0.0.1.2023102602+bdd3c4be" \
         MLIR_AIR_WHEEL_VERSION=${{ inputs.MLIR_WHEEL_VERSION }} \
         PARALLEL_LEVEL=${{ matrix.OS == 'windows-2019' && '2' || '2' }} \
         cibuildwheel --output-dir ../wheelhouse

diff --git a/requirements.txt b/requirements.txt
@@ -10,8 +10,7 @@ wheel
 
 -f https://makslevental.github.io/wheels
 -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels
--f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
 
-mlir-native-tools==18.0.0.2023091015+780b046b
-mlir==18.0.0.2023091015+780b046b
-mlir-aie==0.0.1.2023091105+a0cc3d0
+mlir-native-tools==17.0.0.2023092813+35ca6498
+mlir==17.0.0.2023092813+35ca6498
+mlir-aie==0.0.1.2023102602+bdd3c4be
diff --git a/scripts/build_local.sh b/scripts/build_local.sh
@@ -13,8 +13,12 @@ case "${unameOut}" in
 esac
 echo "${machine}"
 
-export MLIR_WHEEL_VERSION="18.0.0.2023091015+780b046b"
-export MLIR_AIE_WHEEL_VERSION="0.0.1.2023091105+a0cc3d0"
+if [ ! -d mlir-air ]; then
+  git clone --recursive https://github.com/Xilinx/mlir-air.git
+fi
+
+export MLIR_WHEEL_VERSION="17.0.0.2023092813+35ca6498"
+export MLIR_AIE_WHEEL_VERSION="0.0.1.2023102602+bdd3c4be"
 
 if [ "$machine" == "linux" ]; then
   export CIBW_ARCHS=${CIBW_ARCHS:-x86_64}
@@ -34,8 +38,10 @@ ccache --print-stats
 ccache --show-config
 
 export HOST_CCACHE_DIR="$(ccache --get-config cache_dir)"
+export PIP_FIND_LINKS="https://makslevental.github.io/wheels https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels"
 
-if [ x"$CIBW_ARCHS" == x"aarch64" ]; then
+if [ x"$CIBW_ARCHS" == x"aarch64" ] || [ x"$CIBW_ARCHS" == x"arm64" ]; then
+  pip install -r $HERE/../requirements.txt
   export PIP_NO_BUILD_ISOLATION="false"
   pip install -r $HERE/../requirements.txt
   $HERE/../scripts/pip_install_mlir.sh
@@ -46,8 +52,14 @@ else
   cibuildwheel "$HERE"/.. --platform "$machine"
 fi
 
-cp -R "$HERE/../scripts" "$HERE/../python_bindings"
+cp -a "$HERE/../scripts" "$HERE/../python_bindings"
+cp -a $HERE/../requirements.txt $HERE/../python_bindings/
 
 pushd "$HERE/../python_bindings"
 
-cibuildwheel --platform "$machine" --output-dir ../wheelhouse
+if [ x"$CIBW_ARCHS" == x"aarch64" ] || [ x"$CIBW_ARCHS" == x"arm64" ]; then
+  pip install mlir-air -f $HERE/../wheelhouse
+  pip wheel "$HERE/../python_bindings" -v -w $HERE/../wheelhouse
+else
+  cibuildwheel "$HERE/../python_bindings" --platform linux --output-dir $HERE/../wheelhouse
+fi
diff --git a/scripts/pip_install_mlir.sh b/scripts/pip_install_mlir.sh
@@ -13,16 +13,7 @@ if [ x"$CIBW_ARCHS" == x"arm64" ] || [ x"$CIBW_ARCHS" == x"aarch64" ]; then
   elif [ x"$MATRIX_OS" == x"ubuntu-20.04" ] && [ x"$CIBW_ARCHS" == x"aarch64" ]; then
     PLAT=linux_aarch64
   fi
-
-  pip install mlir$MLIR_WHEEL_VERSION --platform $PLAT --only-binary=:all: --target $SITE_PACKAGES  --no-deps --force -U \
-    -f https://makslevental.github.io/wheels \
-    -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-    -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
+  pip install mlir$MLIR_WHEEL_VERSION --platform $PLAT --only-binary=:all: --target $SITE_PACKAGES  --no-deps --force -U
 else
-
-  pip install mlir$MLIR_WHEEL_VERSION --force -U \
-    -f https://makslevental.github.io/wheels \
-    -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-    -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
-
+  pip install mlir$MLIR_WHEEL_VERSION --force -U
 fi
diff --git a/scripts/pip_install_mlir_aie.sh b/scripts/pip_install_mlir_aie.sh
@@ -13,17 +13,7 @@ if [ x"$CIBW_ARCHS" == x"arm64" ] || [ x"$CIBW_ARCHS" == x"aarch64" ]; then
   elif [ x"$MATRIX_OS" == x"ubuntu-20.04" ] && [ x"$CIBW_ARCHS" == x"aarch64" ]; then
     PLAT=linux_aarch64
   fi
-
-  pip install mlir-aie$MLIR_AIE_WHEEL_VERSION --platform $PLAT --only-binary=:all: --target $SITE_PACKAGES  --no-deps --force -U \
-    -f https://makslevental.github.io/wheels \
-    -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-    -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
-
+  pip install mlir-aie$MLIR_AIE_WHEEL_VERSION --platform $PLAT --only-binary=:all: --target $SITE_PACKAGES  --no-deps --force -U
 else
-
-  pip install mlir-aie$MLIR_AIE_WHEEL_VERSION --force -U \
-    -f https://makslevental.github.io/wheels \
-    -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-    -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
-
+  pip install mlir-aie$MLIR_AIE_WHEEL_VERSION --force -U
 fi
diff --git a/scripts/pip_install_mlir_air.sh b/scripts/pip_install_mlir_air.sh
@@ -14,16 +14,7 @@ if [ x"$CIBW_ARCHS" == x"arm64" ] || [ x"$CIBW_ARCHS" == x"aarch64" ]; then
     PLAT=linux_aarch64
   fi
 
-  pip install mlir-air$MLIR_AIR_WHEEL_VERSION --platform $PLAT --only-binary=:all: --target $SITE_PACKAGES  --no-deps --force -U \
-    -f https://makslevental.github.io/wheels \
-    -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-    -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
-
+  pip install mlir-air$MLIR_AIR_WHEEL_VERSION --platform $PLAT --only-binary=:all: --target $SITE_PACKAGES  --no-deps --force -U
 else
-
-  pip install mlir-air$MLIR_AIR_WHEEL_VERSION --force -U \
-    -f https://makslevental.github.io/wheels \
-    -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels \
-    -f https://github.com/Xilinx/mlir-air/releases/expanded_assets/latest-wheels
-
+  pip install mlir-air$MLIR_AIR_WHEEL_VERSION --force -U
 fi