Try new method of installing mlir-python-extras

Xilinx · Oct 11, 2024 · f68d6e8 · f68d6e8
1 parent 2623961
commit f68d6e8
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
@@ -51,8 +51,8 @@ jobs:
 
       - name: Install Python packages
         run: |
-          
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
       - name: Install packages

diff --git a/.github/workflows/buildAndTestAieTools.yml b/.github/workflows/buildAndTestAieTools.yml
@@ -86,6 +86,7 @@ jobs:
             python -m venv aie-venv
             source aie-venv/bin/activate
             pip install -r python/requirements.txt
+            HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
             pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
             VERSION=$(utils/clone-llvm.sh --get-wheel-version)

diff --git a/.github/workflows/buildAndTestAieToolsHsaBuildOnly.yml b/.github/workflows/buildAndTestAieToolsHsaBuildOnly.yml
@@ -111,6 +111,7 @@ jobs:
             python -m venv aie-venv
             source aie-venv/bin/activate
             pip install -r python/requirements.txt
+            HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
             pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
             VERSION=$(utils/clone-llvm.sh --get-wheel-version)

diff --git a/.github/workflows/buildAndTestMulti.yml b/.github/workflows/buildAndTestMulti.yml
@@ -93,8 +93,8 @@ jobs:
 
       - name: Install Python packages
         run: |
-          
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
       - name: Setup Cpp

diff --git a/.github/workflows/buildAndTestPythons.yml b/.github/workflows/buildAndTestPythons.yml
@@ -54,6 +54,7 @@ jobs:
         run: |
           
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
       - name: Install packages

diff --git a/.github/workflows/buildAndTestRyzenAI.yml b/.github/workflows/buildAndTestRyzenAI.yml
@@ -79,6 +79,7 @@ jobs:
           python -m venv aie-venv
           source aie-venv/bin/activate
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_ml.txt
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
           pip install jupyter
@@ -137,6 +138,7 @@ jobs:
           python -m venv aie-venv
           source aie-venv/bin/activate
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_ml.txt
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
           pip install jupyter

diff --git a/.github/workflows/buildRyzenWheels.yml b/.github/workflows/buildRyzenWheels.yml
@@ -52,6 +52,7 @@ jobs:
           python -m venv aie-venv
           source aie-venv/bin/activate
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
           VERSION=$(utils/clone-llvm.sh --get-wheel-version)
@@ -159,6 +160,7 @@ jobs:
           python -m venv aie-venv
           source aie-venv/bin/activate
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
           source aie-venv/bin/activate
           

diff --git a/.github/workflows/lintAndFormat.yml b/.github/workflows/lintAndFormat.yml
@@ -43,6 +43,7 @@ jobs:
           
           pip install cmake==3.27.9 numpy psutil pybind11 rich pkginfo lit PyYAML requests
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
       - name: Get MLIR
@@ -205,6 +206,7 @@ jobs:
         run: |
           pip install cmake numpy psutil pybind11 rich lit
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
       - name: Install packages
@@ -238,6 +240,7 @@ jobs:
         if: steps.changed-files.outputs.changed-files != ''
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
 
       - name: Build and generate coverage (Release)

diff --git a/.github/workflows/mlirAIEDistro.yml b/.github/workflows/mlirAIEDistro.yml
@@ -228,6 +228,7 @@ jobs:
         export PIP_NO_BUILD_ISOLATION=false
         
         pip install -r requirements.txt
+        HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
         pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
         pip install importlib-metadata
         CIBW_ARCHS=${{ matrix.ARCH }} MATRIX_OS=${{ matrix.OS }} ./scripts/download_mlir.sh
@@ -361,7 +362,7 @@ jobs:
         with:
           sparse-checkout: |
             python/requirements.txt
-            pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
+            python/requirements_bfloat16.txt
 
       - uses: actions/download-artifact@v3
         with:
@@ -376,6 +377,7 @@ jobs:
         shell: bash
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
           pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"
           unzip -o -q dist/mlir_aie\*.whl
           

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -10,5 +10,4 @@ psutil
 pybind11>=2.9.0, <=2.10.3
 rich
 setuptools
-wheel
-git+https://github.com/hunhoffe/mlir-python-extras.git@4743810 # TODO(erika): temporary, until can upstream
+wheel
diff --git a/utils/mlir_aie_wheels/pyproject.toml b/utils/mlir_aie_wheels/pyproject.toml
@@ -10,6 +10,7 @@ environment = { PATH = "/usr/lib/ccache:/usr/lib64/ccache:/usr/lib/ccache/bin:$P
 before-build = [
     "{project}/scripts/docker_prepare_ccache.sh",
     "pip install -r requirements.txt",
+    "HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650",
     "{project}/scripts/download_mlir.sh",
 ]
 environment-pass = [
@@ -33,6 +34,7 @@ repair-wheel-command = [
 environment = { PATH = "/usr/local/opt/ccache/libexec:$PATH", PIP_NO_BUILD_ISOLATION = "false" }
 before-build = [
     "pip install -r requirements.txt",
+    "HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650",
     "{project}/scripts/download_mlir.sh",
 ]
 repair-wheel-command = [
@@ -44,5 +46,6 @@ environment = { PIP_NO_BUILD_ISOLATION = "false" }
 before-build = [
     "pip install delvewheel",
     "pip install -r requirements.txt",
+    "HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650",
     "bash {project}\\scripts\\download_mlir.sh",
 ]
diff --git a/utils/quick_setup.sh b/utils/quick_setup.sh
@@ -74,6 +74,7 @@ if test -f "$VPP"; then
   export PEANO_DIR=`realpath llvm-aie`
   popd
   python3 -m pip install --upgrade --force-reinstall --no-cache-dir -r python/requirements.txt
+  HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
   python3 -m pip install --upgrade --force-reinstall --no-cache-dir -r python/requirements_ml.txt
   python3 -m pip install --upgrade --force-reinstall --no-cache-dir -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16, that's ok!"
   pushd programming_examples

diff --git a/utils/setup_python_packages.sh b/utils/setup_python_packages.sh
@@ -22,4 +22,5 @@ else
 fi
 python3 -m pip install --upgrade pip
 python3 -m pip install -r python/requirements.txt
+HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install git+https://github.com/hunhoffe/mlir-python-extras@09f0650
 python3 -m pip install -r python/requirements_bfloat16.txt || echo "Failed to install bfloat16; this is ok!"