use direct package injection

Author: makslevental

.github/workflows/wheels.yml renamed to .github/workflows/sdist.yml

@@ -1,4 +1,4 @@
-name: Wheels
+name: sdist
 
 on:
   workflow_dispatch:
@@ -7,36 +7,40 @@ on:
       - published
 
 jobs:
-  build_wheels:
+  build_sdist:
     runs-on: ubuntu-20.04
     outputs:
-      VERSION: ${{ steps.build_wheel.outputs.version }}
+      VERSION: ${{ steps.build_sdist.outputs.version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-22.04, macos-11, windows-2022 ]
     steps:
     - uses: actions/checkout@v3
 
     - uses: actions/setup-python@v4
       with:
         python-version: '3.11'
 
-    - name: Build wheel
-      id: build_wheel
+    - name: Build sdist
+      id: build_sdist
       run: |
-        pip wheel -w wheelhouse .
-        pip install toml
-        VERSION="$(python -c 'import toml; print(toml.load("pyproject.toml")["project"]["version"])')"
+        pip install build
+        python -m build -s
+        VERSION="$(python setup.py --version)"
         echo "version=${VERSION}" | tee -a $GITHUB_OUTPUT
 
-    - name: Upload wheels
+    - name: Upload sdist
       uses: actions/upload-artifact@v3
       with:
-        path: wheelhouse/mlir_python_utils*.whl
+        path: dist/mlir-python-utils-*.tar.gz
         name: build_artifact
 
-  upload_wheels:
+  upload_sdist:
 
-    name: Upload wheels
+    name: Upload sdist
 
-    needs: [build_wheels]
+    needs: [build_sdist]
 
     runs-on: ubuntu-latest
     permissions: write-all
@@ -51,15 +55,15 @@ jobs:
       - name: Set up a release page
         id: setup_release
         run: |
-          VERSION=${{ needs.build_wheels.outputs.version }}
+          VERSION=${{ needs.build_sdist.outputs.version }}
           echo "`mlir-python-utils` $VERSION distribution created at $(date)" > body.md
           echo "tag_name=${VERSION}" | tee -a $GITHUB_OUTPUT
           echo "release_title=mlir-python-utils-${VERSION}" | tee -a $GITHUB_OUTPUT
 
       - name: Release current commit
         uses: ncipollo/[email protected]
         with:
-          artifacts: "dist/*.whl"
+          artifacts: "dist/*.tar.gz,dist/*.zip"
           bodyFile: body.md
           token: "${{ secrets.GITHUB_TOKEN }}"
           tag: "${{ steps.setup_release.outputs.tag_name }}"
@@ -72,7 +76,7 @@ jobs:
       - name: Release current commit
         uses: ncipollo/[email protected]
         with:
-          artifacts: "dist/*.whl"
+          artifacts: "dist/*.tar.gz,dist/*.zip"
           bodyFile: body.md
           token: "${{ secrets.GITHUB_TOKEN }}"
           tag: "latest"
@@ -87,7 +91,7 @@ jobs:
         with:
           owner: makslevental
           repo: wheels
-          artifacts: "dist/*.whl"
+          artifacts: "dist/*.tar.gz,dist/*.zip"
           token: "${{ secrets.WHEELS_REPO }}"
           tag: "i"
           name: "i"

.github/workflows/test.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
 
-  mlir-bindings:
+  test-all:
 
     runs-on: ${{ matrix.os }}
 
@@ -35,23 +35,56 @@ jobs:
       - name: Install and configure
         shell: bash
         run: |
-          pip install .[test,mlir] -f https://makslevental.github.io/wheels
-          configure-mlir-python-utils -y mlir
+          pip install .[test,mlir] -v -f https://makslevental.github.io/wheels 
+          mlir-python-utils-generate-all-upstream-trampolines
+          
+          MLIR_PYTHON_PACKAGE_PREFIX=jaxlib.mlir pip install .[jax] -v
+          jaxlib-mlir-python-utils-generate-all-upstream-trampolines
+          
+          pip install aie -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels --no-index
+          MLIR_PYTHON_PACKAGE_PREFIX=aie.mlir pip install . -v
+          aie-mlir-python-utils-generate-all-upstream-trampolines
+          aie-mlir-python-utils-generate-trampolines aie.dialects.aie
 
       - name: Test
         shell: bash
         run: |
           if [ ${{ matrix.os }} == 'windows-2022' ]; then
-            pytest -s --ignore-glob=*test_smoke* tests
+            pytest -s tests
           else
-            pytest --capture=tee-sys --ignore-glob=*test_smoke* tests
+            pytest --capture=tee-sys tests
           fi
 
       - name: Test mwe
         shell: bash
         run: |
           python examples/mwe.py
 
+  test-jupyter:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-22.04 ]
+        py_version: [ "3.10", "3.11" ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.py_version }}
+
+      - name: Run notebook
+        shell: bash
+        run: |
+          pip install jupyter
+          BRANCH=${{ github.ref_name }} jupyter run examples/mlir_python_utils.ipynb
+
   mlir-bindings-aarch64:
 
     runs-on: ${{ matrix.os }}
@@ -91,76 +124,7 @@ jobs:
             cd /workspace
             
             pip install .[test,mlir] -f https://makslevental.github.io/wheels
-            configure-mlir-python-utils -y mlir
+            mlir-python-utils-generate-all-upstream-trampolines
             
             pytest --capture=tee-sys --ignore-glob=*test_smoke* tests
             python examples/mwe.py
-
-  torch-mlir-bindings:
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-22.04, macos-11, windows-2022 ]
-        py_version: [ "3.11" ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.py_version }}
-
-      - name: Install and configure
-        shell: bash
-        run: |
-          pip install .[test,torch-mlir] -f https://llvm.github.io/torch-mlir/package-index -f https://makslevental.github.io/wheels
-          configure-mlir-python-utils -y torch_mlir
-
-      - name: Test
-        shell: bash
-        run: |
-          if [ ${{ matrix.os }} == 'windows-2022' ]; then
-            pytest --capture=tee-sys tests/test_smoke.py
-          else
-            pytest --capture=tee-sys tests/test_smoke.py
-          fi
-
-
-  jax-bindings:
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-22.04, macos-11, windows-2022 ]
-        py_version: [ "3.10", "3.11" ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.py_version }}
-
-      - name: Install and configure
-        shell: bash
-        run: |
-          pip install .[test,jax] -f https://makslevental.github.io/wheels
-          configure-mlir-python-utils -y jaxlib.mlir
-
-      - name: Test
-        shell: bash
-        run: |
-          if [ ${{ matrix.os }} == 'windows-2022' ]; then
-            pytest --capture=tee-sys tests/test_smoke.py
-          else
-            pytest --capture=tee-sys tests/test_smoke.py
-          fi

MANIFEST.in

@@ -0,0 +1,3 @@
+include requirements.txt
+recursive-include mlir *.py
+prune tests

README.md

@@ -74,15 +74,6 @@ This is **not a Python compiler**, but just a (hopefully) nice way to emit MLIR
 
 The few main features/affordances:
 
-1. Generated bindings wrappers (like `constant` above)
-   \
-    
-   1. During "configuration" of this package (see [Install](#install)), wrappers for all available host ops are generated. These wrappers don't do much except fetch the result `ir.Value` from the `ir.Operation`; so `constant` in the example above is actually the result of `arith.ConstantOp`.
-      \
-      \
-      See [mlir_utils._configuration.generate_trampolines](https://github.com/makslevental/mlir-python-utils/blob/a9885db18096a610d29a26293396d860d40ad213/mlir_utils/_configuration/generate_trampolines.py) for details.
-      \
-       
 1. `region_op`s (like `@func` above)
    \
     
@@ -151,34 +142,33 @@ But, open an issue if something isn't clear.
 First
 
 ```shell
-$ pip install mlir-python-utils -f https://makslevental.github.io/wheels/
+$ MLIR_PYTHON_PACKAGE_PREFIX=<YOUR_MLIR_PYTHON_PACKAGE_PREFIX> pip install git+https://github.com/makslevental/mlir-python-utils
 ```
 
 This package is meant to work in concert with host bindings.
-Practically speaking that means you need to have *some* package installed that includes mlir python bindings, **and you need to `configure-mlir-python-utils`**.
+Practically speaking that means you need to have *some* package installed that includes mlir python bindings, **and you need to `mlir-python-utils-generate-all-upstream-trampolines`**.
 So after pip-installing you need to
 ```shell
-$ configure-mlir-python-utils -y <YOUR_MLIR_PYTHON_PACKAGE_PREFIX>
+$ <YOUR_MLIR_PYTHON_PACKAGE_PREFIX>-mlir-python-utils-generate-all-upstream-trampolines
 ```
 where `YOUR_MLIR_PYTHON_PACKAGE_PREFIX` is (as it says) the package prefix for your chosen host bindings.
 **When in doubt about this prefix**, it is everything up until `ir` when you import your bindings, e.g., in `import torch_mlir.ir`, `torch_mlir` is the `MLIR_PYTHON_PACKAGE_PREFIX` for the torch-mlir bindings.
-Thus, for torch-mlir host bindings, you would execute `configure-mlir-python-utils -y torch_mlir`.
+Thus, for torch-mlir host bindings, you would execute `torch-mlir-mlir-python-utils-generate-all-upstream-trampolines`.
+Note, the underscore in `torch_mlir` becomes a dash in `torch-mlir-mlir-python-utils-generate-all-upstream-trampolines`.
 
-If you don't have any such package, but you want to experiment anyway, you can install this package with the "stock" upstream bindings:
+If you don't have any such package, but you want to experiment anyway, you can install the "stock" upstream bindings first:
 
 ```shell
-$ pip install mlir-python-utils[mlir] -f https://makslevental.github.io/wheels/
-$ configure-mlir-python-utils -y mlir
+$ pip install mlir-python-bindings -f https://makslevental.github.io/wheels/
 ```
 
-Note, on Windows, you need to do
+and then
 
 ```shell
-python -m mlir_utils._configuration -y mlir
+$ pip install git+https://github.com/makslevental/mlir-python-utils
+$ mlir-python-utils-generate-all-upstream-trampolines
 ```
 
-instead.
-
 ## Examples/Demo
 
 Check [tests](tests) for a plethora of example code.