From 4010d8782cdf97788689de4df760993236b4ed91 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Wed, 23 Oct 2024 20:14:34 +0200 Subject: [PATCH 01/18] Add compile.sh --- .github/workflows/build.yml | 11 ++--------- dev_scripts/compile.sh | 31 ------------------------------- scripts/compile.sh | 10 ++++++++++ 3 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 dev_scripts/compile.sh create mode 100644 scripts/compile.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38208c0fa..a7bc45433 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: git clone https://github.com/llvm/llvm-project --branch main --single-branch cd llvm-project git checkout ${LLVM_SHA} - if [ -d "/home/runner/work/mlir-extensions/mlir-extensions/build_tools/patches" ]; then git apply /home/runner/work/mlir-extensions/mlir-extensions/build_tools/patches/*.patch; fi + git apply /home/runner/work/mlir-extensions/mlir-extensions/build_tools/patches/*.patch cmake -G Ninja -B _build -S llvm \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DLLVM_ENABLE_PROJECTS=mlir \ @@ -97,14 +97,7 @@ jobs: - name: Build IMEX and run lit tests shell: bash -le {0} run: | - external_lit=`which lit` - echo ${external_lit} - cd /home/runner/work/mlir-extensions/mlir-extensions - cmake -S . -B _build -GNinja \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_EXTERNAL_LIT=${external_lit} \ - -DMLIR_DIR=/home/runner/work/llvm-mlir/_mlir_install/lib/cmake/mlir \ - -DLLVM_LIT_ARGS=-a + ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) cmake --build _build --target check-imex - name: Build doxygen docs diff --git a/dev_scripts/compile.sh b/dev_scripts/compile.sh deleted file mode 100644 index 5fe080b82..000000000 --- a/dev_scripts/compile.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -e -set -vx - -cd $(dirname "$0")/.. -mlir_dir=$(pwd -P) - -cd .. -if test -d llvm-project -then - cd llvm-project - git clean -fd -else - git clone https://github.com/llvm/llvm-project.git - cd llvm-project -fi - -git reset --hard HEAD -git checkout $(cat $mlir_dir/build_tools/llvm_version.txt) -git apply $mlir_dir/build_tools/patches/* -cmake -G Ninja -B build -S llvm \ - -DLLVM_ENABLE_PROJECTS=mlir \ - -DLLVM_BUILD_EXAMPLES=ON \ - -DLLVM_TARGETS_TO_BUILD="X86" \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_ENABLE_ASSERTIONS=ON \ - -DLLVM_EXTERNAL_PROJECTS="Imex" \ - -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=$mlir_dir - -cmake --build build --target check-imex diff --git a/scripts/compile.sh b/scripts/compile.sh new file mode 100644 index 000000000..55fbf91a2 --- /dev/null +++ b/scripts/compile.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e +set -vx + +cd $(dirname "$0")/.. +mlir_dir=$(pwd -P) + +cmake -S llvm-project/llvm -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" + From 94aea614dc1f18441ac6c54bd731aa935e47e083 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Wed, 23 Oct 2024 20:25:48 +0200 Subject: [PATCH 02/18] Add +x to the script --- scripts/compile.sh | 1 - 1 file changed, 1 deletion(-) mode change 100644 => 100755 scripts/compile.sh diff --git a/scripts/compile.sh b/scripts/compile.sh old mode 100644 new mode 100755 index 55fbf91a2..b8d3d8234 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -7,4 +7,3 @@ cd $(dirname "$0")/.. mlir_dir=$(pwd -P) cmake -S llvm-project/llvm -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" - From b981da3c9e7bb2268ff6fb7f1abf1b22ac91b53f Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Wed, 23 Oct 2024 20:46:37 +0200 Subject: [PATCH 03/18] Fix compile.sh --- .github/workflows/build.yml | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7bc45433..252fbad54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,6 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 450 - env: - LLVM_SHA_FILE: /home/runner/work/mlir-extensions/mlir-extensions/build_tools/llvm_version.txt - strategy: matrix: python: [3.9] @@ -53,9 +50,7 @@ jobs: - name: Setup Cache Vars run: | - echo 'LLVM_SHA<> $GITHUB_ENV - cat $LLVM_SHA_FILE >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV + echo LLVM_SHA=$(cat build_tools/llvm_version.txt) | tee -a $GITHUB_ENV - name: Cache LLLVM-MLIR id: cache-llvm-mlir @@ -64,7 +59,7 @@ jobs: LLVM_CACHE_NUMBER: 1 # Increase to reset cache with: path: | - /home/runner/work/llvm-mlir/_mlir_install/** + ${{ github.workspace }}/mlir key: ${{ runner.os }}-build-llvm-${{ env.LLVM_CACHE_NUMBER }}-${{ env.LLVM_SHA }} - name: Build LLVM-MLIR @@ -72,15 +67,12 @@ jobs: shell: bash -el {0} timeout-minutes: 420 run: | - mkdir -p /home/runner/work/llvm-mlir - pushd /home/runner/work/llvm-mlir - echo "INFO: Need to rebuild LLVM-MLIR. Previous installation for MLIR not found" - np=`nproc` - echo "INFO: nproc $np" git clone https://github.com/llvm/llvm-project --branch main --single-branch cd llvm-project - git checkout ${LLVM_SHA} - git apply /home/runner/work/mlir-extensions/mlir-extensions/build_tools/patches/*.patch + git checkout $LLVM_SHA + git apply ../build_tools/patches/*.patch + + echo "INFO: Need to rebuild LLVM-MLIR. Previous installation for MLIR not found" cmake -G Ninja -B _build -S llvm \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DLLVM_ENABLE_PROJECTS=mlir \ @@ -90,18 +82,17 @@ jobs: -DLLVM_TARGETS_TO_BUILD=X86 \ -DLLVM_ENABLE_BINDINGS=OFF \ -DLLVM_ENABLE_ZSTD=OFF \ - -DCMAKE_INSTALL_PREFIX=/home/runner/work/llvm-mlir/_mlir_install + -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/mlir cmake --build _build --target install popd - name: Build IMEX and run lit tests shell: bash -le {0} run: | - ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) + ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/llvm-project/mlir/lib/cmake/mlir cmake --build _build --target check-imex - name: Build doxygen docs shell: bash -le {0} run: | - cd /home/runner/work/mlir-extensions/mlir-extensions cmake --build _build --target doc_doxygen From 5dd676089b47e7aaa1ec0496515c444d940d8fc2 Mon Sep 17 00:00:00 2001 From: Igor Zamyatin Date: Wed, 23 Oct 2024 15:28:30 -0500 Subject: [PATCH 04/18] remove popd --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 252fbad54..e931433c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,6 @@ jobs: -DLLVM_ENABLE_ZSTD=OFF \ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/mlir cmake --build _build --target install - popd - name: Build IMEX and run lit tests shell: bash -le {0} From 6d1712e582d661d3f780dcb2438c5506c3cef4db Mon Sep 17 00:00:00 2001 From: Igor Zamyatin Date: Wed, 23 Oct 2024 17:15:35 -0500 Subject: [PATCH 05/18] Update compile.sh --- scripts/compile.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/compile.sh b/scripts/compile.sh index b8d3d8234..65c6478ff 100755 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -4,6 +4,5 @@ set -e set -vx cd $(dirname "$0")/.. -mlir_dir=$(pwd -P) -cmake -S llvm-project/llvm -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" +cmake -S llvm-project/llvm -B _build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" From 38fa22b71ce923267ad4c46f444ea7f1629ecf59 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 00:56:19 +0200 Subject: [PATCH 06/18] Use compile.sh in CI --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 252fbad54..b133b164f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,13 +84,12 @@ jobs: -DLLVM_ENABLE_ZSTD=OFF \ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/mlir cmake --build _build --target install - popd - name: Build IMEX and run lit tests shell: bash -le {0} run: | ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/llvm-project/mlir/lib/cmake/mlir - cmake --build _build --target check-imex + cmake --build build --target check-imex - name: Build doxygen docs shell: bash -le {0} From 8de4e2fbca699ad529d883b9deef6265e21227b3 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 09:00:16 +0200 Subject: [PATCH 07/18] Use compile.sh in CI, r4 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b133b164f..f47e9852b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: git apply ../build_tools/patches/*.patch echo "INFO: Need to rebuild LLVM-MLIR. Previous installation for MLIR not found" - cmake -G Ninja -B _build -S llvm \ + cmake -G Ninja -B build -S llvm \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DLLVM_ENABLE_PROJECTS=mlir \ -DLLVM_ENABLE_ASSERTIONS=ON \ @@ -83,7 +83,7 @@ jobs: -DLLVM_ENABLE_BINDINGS=OFF \ -DLLVM_ENABLE_ZSTD=OFF \ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/mlir - cmake --build _build --target install + cmake --build build --target install - name: Build IMEX and run lit tests shell: bash -le {0} @@ -94,4 +94,4 @@ jobs: - name: Build doxygen docs shell: bash -le {0} run: | - cmake --build _build --target doc_doxygen + cmake --build build --target doc_doxygen From cc992e746503c399b2d03cc38e589f5c607b4ddc Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 09:32:17 +0200 Subject: [PATCH 08/18] Use compile.sh in CI, r5 --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f47e9852b..373086058 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,9 @@ jobs: build_linux: name: Builds IMEX on Linux runs-on: ubuntu-latest - timeout-minutes: 450 + defaults: + run: + shell: bash -l -eo pipefail {0} strategy: matrix: @@ -34,19 +36,15 @@ jobs: activate-environment: imex-devel - name: Conda info - shell: bash -le {0} run: conda info - name: Install Build tools - shell: bash -le {0} run: | conda install cmake ninja conda-forge::lit conda-forge::doxygen conda list - name: Checkout repo uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Setup Cache Vars run: | @@ -56,7 +54,7 @@ jobs: id: cache-llvm-mlir uses: actions/cache@v4 env: - LLVM_CACHE_NUMBER: 1 # Increase to reset cache + LLVM_CACHE_NUMBER: 2 # Increase to reset cache with: path: | ${{ github.workspace }}/mlir @@ -64,8 +62,6 @@ jobs: - name: Build LLVM-MLIR if: steps.cache-llvm-mlir.outputs.cache-hit != 'true' - shell: bash -el {0} - timeout-minutes: 420 run: | git clone https://github.com/llvm/llvm-project --branch main --single-branch cd llvm-project From 2d5d5c6f2b77dba5fb1f2c4089186ce17b7ca141 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 13:05:16 +0200 Subject: [PATCH 09/18] Use compile.sh in CI, r6 --- scripts/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compile.sh b/scripts/compile.sh index 65c6478ff..dabd31f15 100755 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -5,4 +5,4 @@ set -vx cd $(dirname "$0")/.. -cmake -S llvm-project/llvm -B _build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" +cmake -S llvm-project/llvm -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" From e1cb9cb53a3b4cc8d528c71e9ab7be93d0823d99 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 16:38:32 +0200 Subject: [PATCH 10/18] Fix MLIR_DIR in CI, r6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 373086058..aa5745367 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: - name: Build IMEX and run lit tests shell: bash -le {0} run: | - ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/llvm-project/mlir/lib/cmake/mlir + ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib/cmake/mlir cmake --build build --target check-imex - name: Build doxygen docs From ee8144f6865485cad434e5d08bd706feae5663cf Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 18:21:53 +0200 Subject: [PATCH 11/18] Fix MLIR_DIR in CI, r7 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa5745367..0babfcce7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,6 +84,7 @@ jobs: - name: Build IMEX and run lit tests shell: bash -le {0} run: | + find ${{ github.workspace }}/mlir ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib/cmake/mlir cmake --build build --target check-imex From 9b777286161e42429e06fd8ca6d3c663e412f6da Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 18:38:33 +0200 Subject: [PATCH 12/18] Fix MLIR_DIR in CI, r8 --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0babfcce7..43fdaf537 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,8 +84,7 @@ jobs: - name: Build IMEX and run lit tests shell: bash -le {0} run: | - find ${{ github.workspace }}/mlir - ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib/cmake/mlir + ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib cmake --build build --target check-imex - name: Build doxygen docs From 9a504c40271f9a62291ff5f2779f26506e858f76 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 18:41:05 +0200 Subject: [PATCH 13/18] Fix MLIR_DIR in CI, r9 --- .github/workflows/build.yml | 2 +- scripts/compile.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43fdaf537..aa5745367 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: - name: Build IMEX and run lit tests shell: bash -le {0} run: | - ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib + ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib/cmake/mlir cmake --build build --target check-imex - name: Build doxygen docs diff --git a/scripts/compile.sh b/scripts/compile.sh index dabd31f15..1627942c2 100755 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -5,4 +5,4 @@ set -vx cd $(dirname "$0")/.. -cmake -S llvm-project/llvm -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" +cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" From f8b0ff997926a1c31d39bc2e4dff6c17e5de66c5 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 18:55:47 +0200 Subject: [PATCH 14/18] Remove doxygen --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa5745367..aca1e63a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,8 +86,3 @@ jobs: run: | ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib/cmake/mlir cmake --build build --target check-imex - - - name: Build doxygen docs - shell: bash -le {0} - run: | - cmake --build build --target doc_doxygen From 1b58ddb8ffc879deb66b3908d7f61264eb9e5907 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 19:39:54 +0200 Subject: [PATCH 15/18] Add doxygen back --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aca1e63a9..aa5745367 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,3 +86,8 @@ jobs: run: | ./scripts/compile.sh -DLLVM_LIT_ARGS="-a" -DLLVM_EXTERNAL_LIT=$(which lit) -DMLIR_DIR=${{ github.workspace }}/mlir/lib/cmake/mlir cmake --build build --target check-imex + + - name: Build doxygen docs + shell: bash -le {0} + run: | + cmake --build build --target doc_doxygen From 1af0a9b65b0574356c6c8479e4e965b7b4ca8566 Mon Sep 17 00:00:00 2001 From: Igor Zamyatin Date: Thu, 24 Oct 2024 12:55:46 -0500 Subject: [PATCH 16/18] Trigger to check full CI process From b47f7f6eb30465bb76b4a303cbfa01691c6e22f1 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 21:44:10 +0200 Subject: [PATCH 17/18] Remove unused vars --- scripts/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compile.sh b/scripts/compile.sh index 1627942c2..524609f14 100755 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -5,4 +5,4 @@ set -vx cd $(dirname "$0")/.. -cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF -DLLVM_EXTERNAL_PROJECTS="Imex" -DLLVM_EXTERNAL_IMEX_SOURCE_DIR=. "$@" +cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF "$@" From f2684a7e2c0b0da9a9643139fc0c983f166983e6 Mon Sep 17 00:00:00 2001 From: Alexei Fedotov Date: Thu, 24 Oct 2024 22:42:10 +0200 Subject: [PATCH 18/18] Remove clang use --- scripts/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compile.sh b/scripts/compile.sh index 524609f14..d69232d8c 100755 --- a/scripts/compile.sh +++ b/scripts/compile.sh @@ -5,4 +5,4 @@ set -vx cd $(dirname "$0")/.. -cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF "$@" +cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_USE_LINKER=gold -DLLVM_ENABLE_ZSTD=OFF "$@"