move ENABLE_RTTI to env everywhere

Xilinx · Dec 14, 2023 · 7fdce42 · 7fdce42
1 parent 72c3268
commit 7fdce42
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/mlirAIEDistro.yml b/.github/workflows/mlirAIEDistro.yml
@@ -128,7 +128,7 @@ jobs:
 
     steps:
 
-    - name: set PIP_FIND_LINKS
+    - name: set ENV
       shell: bash
       run: |
         
@@ -137,6 +137,7 @@ jobs:
           PIP_FIND_LINKS_URL="$PIP_FIND_LINKS_URL https://github.com/Xilinx/mlir-aie/releases/expanded_assets/dev-wheels"
         fi
         echo "PIP_FIND_LINKS=$PIP_FIND_LINKS_URL" | tee -a $GITHUB_ENV
+        echo "ENABLE_RTTI=${{ matrix.ENABLE_RTTI }}" | tee -a $GITHUB_ENV
 
     - name: Checkout actions
       uses: actions/checkout@v3
@@ -203,7 +204,6 @@ jobs:
         
         export PIP_NO_BUILD_ISOLATION=false
         
-        ENABLE_RTTI=${{ matrix.ENABLE_RTTI }} \
         CIBW_ARCHS=${{ matrix.ARCH }} \
         CMAKE_GENERATOR=Ninja \
         DATETIME=${{ needs.get_aie_project_commit.outputs.DATETIME }} \
@@ -225,7 +225,6 @@ jobs:
         pip install importlib-metadata
         CIBW_ARCHS=${{ matrix.ARCH }} MATRIX_OS=${{ matrix.OS }} ./scripts/download_mlir.sh
         
-        ENABLE_RTTI=${{ matrix.ENABLE_RTTI }} \
         CIBW_ARCHS=${{ matrix.ARCH }} \
         CMAKE_GENERATOR=Ninja \
         DATETIME=${{ needs.get_aie_project_commit.outputs.DATETIME }} \
@@ -367,7 +366,7 @@ jobs:
 
     steps:
 
-      - name: set PIP_FIND_LINKS
+      - name: set ENV
         shell: bash
         run: |
           
@@ -376,6 +375,7 @@ jobs:
             PIP_FIND_LINKS_URL="$PIP_FIND_LINKS_URL https://github.com/Xilinx/mlir-aie/releases/expanded_assets/dev-wheels"
           fi
           echo "PIP_FIND_LINKS=$PIP_FIND_LINKS_URL" | tee -a $GITHUB_ENV
+          echo "ENABLE_RTTI=${{ matrix.ENABLE_RTTI }}" | tee -a $GITHUB_ENV
 
       - name: Checkout actions
         uses: actions/checkout@v3
@@ -594,4 +594,3 @@ jobs:
           allowUpdates: true
           replacesArtifacts: true
           makeLatest: true
-          body: "`pip download mlir -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/latest-wheels && unzip mlir_aie*.whl`"
diff --git a/.github/workflows/mlirDistro.yml b/.github/workflows/mlirDistro.yml
@@ -135,7 +135,7 @@ jobs:
 
     steps:
 
-    - name: set PIP_FIND_LINKS
+    - name: set ENV
       shell: bash
       run: |
         
@@ -210,7 +210,6 @@ jobs:
       working-directory: ${{ steps.workspace_root.outputs.WORKSPACE_ROOT }}
       run: |
         
-        ENABLE_RTTI=${{ matrix.ENABLE_RTTI }} \
         APPLY_PATCHES=${{ inputs.APPLY_PATCHES == '' && 'true' || inputs.APPLY_PATCHES }} \
         CIBW_ARCHS=${{ matrix.ARCH }} \
         CMAKE_GENERATOR=Ninja \
@@ -230,7 +229,6 @@ jobs:
         export APPLY_PATCHES=${{ inputs.APPLY_PATCHES == '' && 'true' || inputs.APPLY_PATCHES }}
         ./scripts/apply_patches.sh
         
-        ENABLE_RTTI=${{ matrix.ENABLE_RTTI }} \
         CIBW_ARCHS=${{ matrix.ARCH }} \
         CMAKE_GENERATOR=Ninja \
         DATETIME=${{ needs.get_llvm_project_commit.outputs.DATETIME }} \
@@ -481,4 +479,3 @@ jobs:
           allowUpdates: true
           replacesArtifacts: true
           makeLatest: true
-          body: "`pip download mlir -f https://github.com/Xilinx/mlir-aie/releases/expanded_assets/mlir-distro && unzip mlir*.whl`"
diff --git a/test/python/python_passes.py b/test/python/python_passes.py
@@ -137,7 +137,8 @@ def test_flow_test_1():
 def test_flow_test_2():
     with open(Path(THIS_FILE).parent.parent / "create-flows" / "flow_test_2.mlir") as f:
         mlir_module = Module.parse(f.read())
-    r = Router(timeout=TIMEOUT)
+    # give this one more time because it's flakey
+    r = Router(timeout=100)
     pass_ = create_python_router_pass(r)
     pm = PassManager()
     pass_manager_add_owned_pass(pm, pass_)