Use mlir-python-extras as a dependency (#1828)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: hunhoffe

.github/workflows/buildAndTest.yml

@@ -52,6 +52,7 @@ jobs:
       - name: Install Python packages
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
 
       - name: Install packages
         run: |

.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 -r python/requirements_extras.txt
 
             VERSION=$(utils/clone-llvm.sh --get-wheel-version)
             pip -q download mlir==$VERSION \

.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 -r python/requirements_extras.txt
 
             VERSION=$(utils/clone-llvm.sh --get-wheel-version)
             pip -q download mlir==$VERSION \

.github/workflows/buildAndTestMulti.yml

@@ -94,6 +94,7 @@ jobs:
       - name: Install Python packages
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
 
       - name: Setup Cpp
         uses: aminya/setup-cpp@v1

.github/workflows/buildAndTestPythons.yml

@@ -53,6 +53,7 @@ jobs:
       - name: Install Python packages
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
 
       - name: Install packages
         run: |

.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 -r python/requirements_extras.txt
           pip install -r python/requirements_ml.txt
           pip install jupyter
           sed -i.bak 's/OUTPUT_TIMEOUT = 10/OUTPUT_TIMEOUT = 100/g' \
@@ -136,6 +137,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 -r python/requirements_extras.txt
           pip install -r python/requirements_ml.txt
           pip install jupyter
           sed -i.bak 's/OUTPUT_TIMEOUT = 10/OUTPUT_TIMEOUT = 100/g' \

.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 -r python/requirements_extras.txt
 
           VERSION=$(utils/clone-llvm.sh --get-wheel-version)
           pip -q download mlir==$VERSION \
@@ -158,6 +159,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 -r python/requirements_extras.txt
           source aie-venv/bin/activate
           
           export MLIR_INSTALL_ABS_PATH=$PWD/mlir

.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 -r python/requirements_extras.txt
 
       - name: Get MLIR
         id: mlir-wheels
@@ -204,6 +205,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 -r python/requirements_extras.txt
 
       - name: Install packages
         run: sudo apt-get install -y ninja-build clang lld llvm libelf-dev
@@ -236,6 +238,7 @@ jobs:
         if: steps.changed-files.outputs.changed-files != ''
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
 
       - name: Build and generate coverage (Release)
         if: steps.changed-files.outputs.changed-files != ''

.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 -r python/requirements_extras.txt
         pip install importlib-metadata
         CIBW_ARCHS=${{ matrix.ARCH }} MATRIX_OS=${{ matrix.OS }} ./scripts/download_mlir.sh
         
@@ -360,6 +361,7 @@ jobs:
         with:
           sparse-checkout: |
             python/requirements.txt
+            python/requirements_extras.txt
 
       - uses: actions/download-artifact@v3
         with:
@@ -374,6 +376,7 @@ jobs:
         shell: bash
         run: |
           pip install -r python/requirements.txt
+          HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie pip install -r python/requirements_extras.txt
           unzip -o -q dist/mlir_aie\*.whl
           
           if [ x"${{ matrix.ENABLE_RTTI }}" == x"ON" ]; then
@@ -383,6 +386,8 @@ jobs:
           fi
           
           python -c 'import aie.ir'
+          python -c 'import aie.extras'
+          python -c 'import aie.helpers'
 
   upload_wheels:
 

programming_examples/basic/dma_transpose/aie2.py

@@ -11,7 +11,7 @@
 from aie.dialects.aie import *
 from aie.dialects.aiex import *
 from aie.extras.context import mlir_mod_ctx
-from aie.extras.dialects.ext.scf import _for as range_
+from aie.helpers.dialects.ext.scf import _for as range_
 
 N = 4096
 M = 64