bump python version to get emscripten 4.0.9 (which dawn needs for emsdk/upstream/emscripten/tools/gen_struct_info.py)

Author: makslevental

.github/actions/setup_base/action.yml

@@ -31,7 +31,11 @@ inputs:
   python-version:
     required: false
     description: ''
-    default: '3.12'
+    default: '3.13'
+  emscripten-version:
+    required: false
+    description: ''
+    default: ''
 
 outputs:
   cache-dir:
@@ -244,8 +248,12 @@ runs:
       shell: bash
       run: |
         
-        pip install pyodide-build>=0.28.0
-        echo "EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)" >> $GITHUB_ENV
+        pip install pyodide-build==0.30.9
+        if [[ "${{ inputs.emscripten-version }}" == "" ]]; then
+          echo "EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)" >> $GITHUB_ENV
+        else
+          echo "EMSCRIPTEN_VERSION=${{ inputs.emscripten-version }}" >> $GITHUB_ENV
+        fi
 
     - name: Setup Emscripten
       if: inputs.target-arch == 'wasm32'

.github/workflows/build_mlir_python_bindings_wheel.yml

@@ -124,7 +124,7 @@ jobs:
         run: |
           
           if [[ "${{ matrix.target-arch }}" == "wasm32" ]]; then
-            pip download mlir-wheel --plat pyodide_2024_0_wasm32 --no-deps --python-version 3.12 -f https://llvm.github.io/eudsl
+            pip download mlir-wheel --plat pyodide_2025_0_wasm32 --no-deps --python-version 3.13 -f https://llvm.github.io/eudsl
           else
             pip download mlir-wheel -f https://llvm.github.io/eudsl
           fi

.github/workflows/deploy_pip_page.yml

@@ -49,11 +49,11 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Fetch latest WASM wheel
         run: |
-          pip download mlir-python-bindings --plat pyodide_2024_0_wasm32 --no-deps --python-version 3.12 -f https://llvm.github.io/eudsl
+          pip download mlir-python-bindings --plat pyodide_2025_0_wasm32 --no-deps --python-version 3.13 -f https://llvm.github.io/eudsl
           echo "MLIR_PYTHON_WHEEL_NAME=$(ls mlir_python_bindings*)" >> $GITHUB_ENV
           pip wheel eudsl-python-extras -f https://llvm.github.io/eudsl --no-deps -w .
           echo "EUDSL_PYTHON_EXTRAS_WHEEL_NAME=$(ls eudsl_python_extras*)" >> $GITHUB_ENV

scripts/llvm_wasm/Dockerfile

@@ -2,16 +2,19 @@ FROM ubuntu
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get -y install python-is-python3 cmake ninja-build python3.12-venv python3-pip vim git unzip
+RUN apt-get update && apt-get -y install python-is-python3 cmake ninja-build python3-pip vim git unzip software-properties-common
+
+RUN add-apt-repository -y ppa:deadsnakes/ppa && apt update && apt -y install python3.13 python3.13-venv
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.13 99
 
 RUN python -m venv venv
-RUN /venv/bin/python -m pip install pip-tools pyodide-build
+RUN /venv/bin/python -m pip install pip-tools pyodide-build==0.30.9
 RUN echo 'source "/venv/bin/activate"' >> $HOME/.bashrc
 
 RUN git clone https://github.com/emscripten-core/emsdk.git
 # EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
 RUN cd emsdk && \
-    ./emsdk install 3.1.58 ccache-git-emscripten-64bit && \
-    ./emsdk activate 3.1.58 ccache-git-emscripten-64bit && \
+    ./emsdk install 4.0.9 ccache-git-emscripten-64bit && \
+    ./emsdk activate 4.0.9 ccache-git-emscripten-64bit && \
     cd ..
 RUN echo 'source "/emsdk/emsdk_env.sh"' >> $HOME/.bashrc

scripts/llvm_wasm/llvm_wasm_cache.cmake

@@ -13,7 +13,7 @@ set(LLVM_DEFAULT_TARGET_TRIPLE "wasm32-unknown-emscripten" CACHE STRING "")
 set(LLVM_HOST_TRIPLE "wasm32-unknown-emscripten" CACHE STRING "")
 set(LLVM_BUILD_STATIC ON CACHE BOOL "")
 set(LLVM_ENABLE_RTTI ON CACHE BOOL "")
-set(LLVM_ENABLE_EH ON CACHE BOOL "")
+set(LLVM_ENABLE_PIC ON CACHE BOOL "")
 
 set(MLIR_ENABLE_BINDINGS_PYTHON ON CACHE BOOL "")
 set(MLIR_ENABLE_EXECUTION_ENGINE ON CACHE BOOL "")
@@ -27,7 +27,6 @@ set(LLVM_ENABLE_LIBEDIT OFF CACHE BOOL "")
 set(LLVM_ENABLE_LIBPFM OFF CACHE BOOL "")
 set(LLVM_ENABLE_LIBXML2 OFF CACHE BOOL "")
 set(LLVM_ENABLE_OCAMLDOC OFF CACHE BOOL "")
-set(LLVM_ENABLE_PIC OFF CACHE BOOL "")
 set(LLVM_ENABLE_THREADS OFF CACHE BOOL "")
 set(LLVM_ENABLE_UNWIND_TABLES OFF CACHE BOOL "")
 set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "")

scripts/llvm_wasm/pyproject.toml

@@ -45,34 +45,17 @@ cmake.args = ["-C", "llvm_wasm_cache.cmake"]
 CMAKE_BUILD_TYPE = { env = "CMAKE_BUILD_TYPE", default = "Release" }
 CMAKE_C_COMPILER_LAUNCHER = { env = "CMAKE_C_COMPILER_LAUNCHER", default = "" }
 CMAKE_CXX_COMPILER_LAUNCHER = { env = "CMAKE_CXX_COMPILER_LAUNCHER", default = "" }
-CMAKE_CXX_FLAGS = "-sNO_DISABLE_EXCEPTION_CATCHING"
-CMAKE_EXE_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sNO_DISABLE_EXCEPTION_CATCHING -sWASM_BIGINT"
-CMAKE_SHARED_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sNO_DISABLE_EXCEPTION_CATCHING -sWASM_BIGINT"
-CMAKE_MODULE_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sNO_DISABLE_EXCEPTION_CATCHING -sWASM_BIGINT"
+#CMAKE_CXX_FLAGS = "-sNO_DISABLE_EXCEPTION_CATCHING"
+#CMAKE_EXE_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sNO_DISABLE_EXCEPTION_CATCHING -sWASM_BIGINT"
+#CMAKE_SHARED_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sNO_DISABLE_EXCEPTION_CATCHING -sWASM_BIGINT"
+#CMAKE_MODULE_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sNO_DISABLE_EXCEPTION_CATCHING -sWASM_BIGINT"
+CMAKE_EXE_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sWASM_BIGINT"
+CMAKE_SHARED_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sWASM_BIGINT"
+CMAKE_MODULE_LINKER_FLAGS = "-sALLOW_TABLE_GROWTH -sASSERTIONS -sWASM_BIGINT"
 CMAKE_VERBOSE_MAKEFILE = "ON"
 
-LLVM_ENABLE_EH = "ON"
-LLVM_ENABLE_PROJECTS = "mlir;lld"
-LLVM_ENABLE_RTTI = "ON"
-LLVM_ENABLE_THREADS = "OFF"
-# requires threads
-LLVM_INCLUDE_BENCHMARKS = "OFF"
-LLVM_INCLUDE_TESTS = "OFF"
-
-# for ExecutionEngine
-LLVM_ENABLE_PIC = "ON"
-LLVM_TARGET_ARCH = "wasm32"
-LLVM_HOST_TRIPLE = "wasm32-unknown-emscripten"
-LLVM_TARGETS_TO_BUILD = "WebAssembly"
-LLVM_DEFAULT_TARGET_TRIPLE = "wasm32-unknown-emscripten"
-
 # so that NATIVE doesn't try to get built
 LLVM_NATIVE_TOOL_DIR = { env = "LLVM_NATIVE_TOOL_DIR", default = "" }
 LLVM_TABLEGEN = { env = "LLVM_TABLEGEN", default = "" }
 MLIR_LINALG_ODS_YAML_GEN = { env = "MLIR_LINALG_ODS_YAML_GEN", default = "" }
 MLIR_TABLEGEN = { env = "MLIR_TABLEGEN", default = "" }
-
-MLIR_BINDINGS_PYTHON_INSTALL_PREFIX = "mlir"
-MLIR_ENABLE_BINDINGS_PYTHON = "ON"
-MLIR_ENABLE_EXECUTION_ENGINE = "ON"
-MLIR_ENABLE_SPIRV_CPU_RUNNER = "ON"