Skip to content

Commit ce86499

Browse files
erwei-xilinxclaude
andauthored
[ci] bump pinned mlir-aie wheel to 1.3.2.dev82+geaa6248, drop cp310 (#1634)
* [ci] bump pinned mlir-aie wheel to 1.3.2.dev82+geaa6248, drop cp310 Bumps the pinned mlir-aie commit from 886d932 (2026-05-20) to eaa6248 (2026-05-29). Two upstream changes need follow-on edits: 1. Wheel version format switched from `0.0.1.<DATETIME>+<sha7>` to `1.3.2.dev<N>+g<sha7>` (git-describe style). Update WHEEL_VERSION in clone-mlir-aie.sh accordingly. 2. The no-RTTI wheel is now published under a renamed package, `mlir_aie_no_rtti`, instead of using a `.no.rtti` version-string suffix. Update buildAIRWheels.yml (both Linux and Windows wheel jobs) and utils/mlir_air_wheels/setup.py to install/depend on the renamed package. Also drop cp310 from the wheel build matrix and bump `python_requires` to `>=3.11`: mlir-aie has dropped Python 3.10 from its release pages (latest-wheels-3 and latest-wheels-no-rtti-2 do not contain cp310 wheels for dev82+geaa6248), so cp310 wheel builds cannot resolve the dependency. eudsl-python-extras shorthash and the pinned LLVM commit are unchanged (mlir-aie@eaa6248 still pins a736a7d and ea2f50817). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [ci] keep MLIR_AIE_INSTALL_PATH at mlir_aie/ for no-RTTI wheel The mlir_aie_no_rtti wheel keeps the package directory named `mlir_aie/` even though the wheel filename and PyPI distribution name use the `_no_rtti` suffix (verified by inspecting the wheel: top-level entries are `mlir_aie/`, `mlir_aie_no_rtti.libs/`, `mlir_aie_no_rtti-<ver>.dist-info/`). Reverts the MLIR_AIE_INSTALL_PATH extract-path change from the previous commit. The `pip install mlir_aie_no_rtti==...` lookup and package name still need `${NO_RTTI_UNDERSCORE}` (the PyPI dist name does include `_no_rtti`); only the on-disk directory differs. Without this, the no-RTTI wheel build's CMake configure fails with `Could not find a package configuration file provided by "AIE"` because `-DAIE_DIR` pointed at a non-existent `mlir_aie_no_rtti/lib/cmake/aie` path. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 7151ac0 commit ce86499

3 files changed

Lines changed: 18 additions & 28 deletions

File tree

.github/workflows/buildAIRWheels.yml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ jobs:
137137
fail-fast: false
138138
matrix:
139139
include:
140-
- python_version: "3.10"
141-
ENABLE_RTTI: ON
142-
143-
- python_version: "3.10"
144-
ENABLE_RTTI: OFF
145-
146140
- python_version: "3.11"
147141
ENABLE_RTTI: ON
148142

@@ -220,11 +214,9 @@ jobs:
220214
221215
NO_RTTI=""
222216
NO_RTTI_UNDERSCORE=""
223-
NO_RTTI_DOT=""
224217
if [ x"$ENABLE_RTTI" == x"OFF" ]; then
225218
NO_RTTI="-no-rtti"
226219
NO_RTTI_UNDERSCORE="_no_rtti"
227-
NO_RTTI_DOT=".no.rtti"
228220
MLIR_AIE_WHEELS_URL="https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels-no-rtti-2"
229221
else
230222
MLIR_AIE_WHEELS_URL="https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels-3/"
@@ -238,9 +230,11 @@ jobs:
238230
export MLIR_INSTALL_ABS_PATH=$PWD/mlir$NO_RTTI_UNDERSCORE
239231
240232
export MLIR_AIE_VERSION=$(utils/clone-mlir-aie.sh --get-wheel-version)
241-
pip -q download --no-deps --platform manylinux_2_35_x86_64 "mlir_aie==${MLIR_AIE_VERSION}${NO_RTTI_DOT}" \
233+
pip -q download --no-deps --platform manylinux_2_35_x86_64 "mlir_aie${NO_RTTI_UNDERSCORE}==${MLIR_AIE_VERSION}" \
242234
-f "$MLIR_AIE_WHEELS_URL"
243235
unzip -q mlir_aie*.whl
236+
# Both RTTI and no-RTTI wheels extract to a `mlir_aie/` package
237+
# directory (only the wheel filename differs).
244238
export MLIR_AIE_INSTALL_PATH=$PWD/mlir_aie
245239
246240
export MLIR_AIR_SOURCE_DIR=$PWD
@@ -288,8 +282,8 @@ jobs:
288282
## MLIR-AIR Wheels (${{ matrix.ENABLE_RTTI == 'ON' && 'RTTI' || 'no-RTTI' }})
289283
290284
**Latest commit:** `${{ needs.get-air-project-commit.outputs.AIR_PROJECT_COMMIT }}`
291-
**Pinned mlir_aie:** `${{ needs.get-air-project-commit.outputs.MLIR_AIE_VERSION }}${{ matrix.ENABLE_RTTI == 'ON' && '' || '.no.rtti' }}`
292-
**Platforms:** Linux x86_64 (Python 3.10–3.14), Windows AMD64 (Python 3.10–3.14)
285+
**Pinned mlir_aie:** `${{ matrix.ENABLE_RTTI == 'ON' && 'mlir_aie' || 'mlir_aie_no_rtti' }}==${{ needs.get-air-project-commit.outputs.MLIR_AIE_VERSION }}`
286+
**Platforms:** Linux x86_64 (Python 3.11–3.14), Windows AMD64 (Python 3.11–3.14)
293287
294288
### Installation
295289
@@ -331,12 +325,6 @@ jobs:
331325
fail-fast: false
332326
matrix:
333327
include:
334-
- python_version: "3.10"
335-
ENABLE_RTTI: ON
336-
337-
- python_version: "3.10"
338-
ENABLE_RTTI: OFF
339-
340328
- python_version: "3.11"
341329
ENABLE_RTTI: ON
342330

@@ -404,23 +392,25 @@ jobs:
404392
- name: Get mlir-aie
405393
shell: bash
406394
run: |
407-
NO_RTTI_DOT=""
395+
NO_RTTI_UNDERSCORE=""
408396
if [ x"${{ matrix.ENABLE_RTTI }}" == x"OFF" ]; then
409-
NO_RTTI_DOT=".no.rtti"
397+
NO_RTTI_UNDERSCORE="_no_rtti"
410398
MLIR_AIE_WHEELS_URL="https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels-no-rtti-2"
411399
else
412400
MLIR_AIE_WHEELS_URL="https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels-3/"
413401
fi
414402
415403
MLIR_AIE_VERSION=$(utils/clone-mlir-aie.sh --get-wheel-version)
416404
pip -q download --no-deps --platform win_amd64 \
417-
"mlir_aie==${MLIR_AIE_VERSION}${NO_RTTI_DOT}" \
405+
"mlir_aie${NO_RTTI_UNDERSCORE}==${MLIR_AIE_VERSION}" \
418406
-f "$MLIR_AIE_WHEELS_URL"
419407
# Extract to a short path alongside MLIR
420408
MLIR_AIE_EXTRACT=/c/tmp/airwhls/a
421409
rm -rf "$MLIR_AIE_EXTRACT"
422410
mkdir -p /c/tmp/airwhls
423411
python -m zipfile -e mlir_aie*.whl /c/tmp/airwhls
412+
# Both RTTI and no-RTTI wheels extract to a `mlir_aie/` package
413+
# directory (only the wheel filename differs).
424414
mv /c/tmp/airwhls/mlir_aie "$MLIR_AIE_EXTRACT"
425415
426416
- name: Build wheel
@@ -489,8 +479,8 @@ jobs:
489479
## MLIR-AIR Wheels (${{ matrix.ENABLE_RTTI == 'ON' && 'RTTI' || 'no-RTTI' }})
490480
491481
**Latest commit:** `${{ needs.get-air-project-commit.outputs.AIR_PROJECT_COMMIT }}`
492-
**Pinned mlir_aie:** `${{ needs.get-air-project-commit.outputs.MLIR_AIE_VERSION }}${{ matrix.ENABLE_RTTI == 'ON' && '' || '.no.rtti' }}`
493-
**Platforms:** Linux x86_64 (Python 3.10–3.14), Windows AMD64 (Python 3.10–3.14)
482+
**Pinned mlir_aie:** `${{ matrix.ENABLE_RTTI == 'ON' && 'mlir_aie' || 'mlir_aie_no_rtti' }}==${{ needs.get-air-project-commit.outputs.MLIR_AIE_VERSION }}`
483+
**Platforms:** Linux x86_64 (Python 3.11–3.14), Windows AMD64 (Python 3.11–3.14)
494484
495485
### Installation
496486

utils/clone-mlir-aie.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#
1515
##===----------------------------------------------------------------------===##
1616

17-
export HASH=886d9325f1b087d2c1180aece51d53384b698a46
18-
DATETIME=2026052005
19-
WHEEL_VERSION=0.0.1.$DATETIME+${HASH:0:7}
17+
export HASH=eaa62484f4381e20a44b0c16570c9ceedc56996e
18+
DEV_COUNT=82
19+
WHEEL_VERSION=1.3.2.dev$DEV_COUNT+g${HASH:0:7}
2020

2121
if [ x"$1" == x--get-wheel-version ]; then
2222
echo $WHEEL_VERSION

utils/mlir_air_wheels/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ def get_extras_require():
321321
# mlir_aie + Peano; users targeting other backends skip the extra.
322322
mlir_aie_version = os.getenv("MLIR_AIE_VERSION", "")
323323
if mlir_aie_version:
324-
no_rtti_dot = "" if check_env("ENABLE_RTTI", 1) else ".no.rtti"
324+
mlir_aie_pkg = "mlir_aie" if check_env("ENABLE_RTTI", 1) else "mlir_aie_no_rtti"
325325
# mlir_aie is pinned to the version this AIR wheel was built and
326326
# tested against. llvm-aie (Peano) tracks nightly — no pin.
327327
extras["aie"] = [
328-
f"mlir_aie=={mlir_aie_version}{no_rtti_dot}",
328+
f"{mlir_aie_pkg}=={mlir_aie_version}",
329329
"llvm-aie",
330330
]
331331
return extras
@@ -343,7 +343,7 @@ def get_extras_require():
343343
},
344344
zip_safe=False,
345345
packages=find_packages(exclude=["wheelhouse", "mlir-air"]),
346-
python_requires=">=3.10",
346+
python_requires=">=3.11",
347347
install_requires=parse_requirements(Path(__file__).parent / "requirements.txt"),
348348
extras_require=get_extras_require(),
349349
)

0 commit comments

Comments
 (0)