Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3713a48

Browse files
varex83varex83
authored
Merge pull request #28 from NethermindEth/bohdan/fix-ci-llvm-19
fix: update CI to use LLVM-19
2 parents a2dc265 + 8c69810 commit 3713a48

6 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎.github/actions/setup-native-deps/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ runs:
2323
id: set-env-vars
2424
shell: bash
2525
run: |
26-
echo "MLIR_SYS_180_PREFIX=/usr/lib/llvm-18/" >> $GITHUB_ENV &&
27-
echo "LLVM_SYS_181_PREFIX=/usr/lib/llvm-18/" >> $GITHUB_ENV &&
28-
echo "TABLEGEN_180_PREFIX=/usr/lib/llvm-18/" >> $GITHUB_ENV
26+
echo "MLIR_SYS_190_PREFIX=/usr/lib/llvm-19/" >> $GITHUB_ENV &&
27+
echo "LLVM_SYS_191_PREFIX=/usr/lib/llvm-19/" >> $GITHUB_ENV &&
28+
echo "TABLEGEN_190_PREFIX=/usr/lib/llvm-19/" >> $GITHUB_ENV

‎Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ RUN curl -L "https://github.com/protocolbuffers/protobuf/releases/download/v$PRO
3333
ENV PROTOC=/root/.local/bin/protoc
3434

3535
# Install LLVM 18
36-
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" > /etc/apt/sources.list.d/llvm-18.list
37-
RUN echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/apt/sources.list.d/llvm-18.list
36+
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" > /etc/apt/sources.list.d/llvm-19.list
37+
RUN echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/apt/sources.list.d/llvm-19.list
3838
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
3939

4040
RUN apt update -y && apt install -y --ignore-missing --allow-downgrades \
4141
libmlir-18-dev \
4242
libpolly-18-dev \
43-
llvm-18-dev \
43+
llvm-19-dev \
4444
mlir-18-tools \
4545
clang-18
4646

47-
ENV MLIR_SYS_180_PREFIX=/usr/lib/llvm-18/
48-
ENV LLVM_SYS_181_PREFIX=/usr/lib/llvm-18/
49-
ENV TABLEGEN_180_PREFIX=/usr/lib/llvm-18/
47+
ENV MLIR_SYS_180_PREFIX=/usr/lib/llvm-19/
48+
ENV LLVM_SYS_181_PREFIX=/usr/lib/llvm-19/
49+
ENV TABLEGEN_180_PREFIX=/usr/lib/llvm-19/
5050

5151
#####################
5252
# Stage 1 (planer): #

‎scripts/build_native_blockifier.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ function build() {
1313
pushd crates/native_blockifier
1414
pypy3.9 -m venv venv
1515
source venv/bin/activate
16-
export MLIR_SYS_180_PREFIX=/usr/lib/llvm-18/
17-
export LLVM_SYS_181_PREFIX=/usr/lib/llvm-18/
18-
export TABLEGEN_180_PREFIX=/usr/lib/llvm-18/
16+
export MLIR_SYS_180_PREFIX=/usr/lib/llvm-19/
17+
export LLVM_SYS_181_PREFIX=/usr/lib/llvm-19/
18+
export TABLEGEN_180_PREFIX=/usr/lib/llvm-19/
1919
cargo build --release -p native_blockifier --features "testing" || clean
2020
clean
2121
popd

‎scripts/install_build_tools.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ function install_rust () {
3232
}
3333

3434
function install_llvm() {
35-
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main" > /etc/apt/sources.list.d/llvm-18.list
36-
echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main" >> /etc/apt/sources.list.d/llvm-18.list
35+
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main" > /etc/apt/sources.list.d/llvm-19.list
36+
echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main" >> /etc/apt/sources.list.d/llvm-19.list
3737
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
3838

3939
apt update -y
40-
apt install -y libmlir-18-dev libpolly-18-dev llvm-18-dev mlir-18-tools
40+
apt install -y libmlir-18-dev libpolly-18-dev llvm-19-dev mlir-18-tools
4141
}
4242

4343
install_llvm

‎scripts/sequencer-ci.Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ENV RUSTUP_HOME=/opt/rust
1616
ENV CARGO_HOME=/opt/rust
1717
ENV PATH=$PATH:/opt/rust/bin
1818

19-
ENV MLIR_SYS_180_PREFIX=/usr/lib/llvm-18/
20-
ENV LLVM_SYS_181_PREFIX=/usr/lib/llvm-18/
21-
ENV TABLEGEN_180_PREFIX=/usr/lib/llvm-18/
19+
ENV MLIR_SYS_180_PREFIX=/usr/lib/llvm-19/
20+
ENV LLVM_SYS_181_PREFIX=/usr/lib/llvm-19/
21+
ENV TABLEGEN_180_PREFIX=/usr/lib/llvm-19/
2222

2323
COPY install_build_tools.sh .
2424
RUN bash install_build_tools.sh

‎scripts/setup_native_deps.sh‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ setup_llvm_deps() {
1616
case "$(uname)" in
1717
Darwin)
1818
brew update
19-
brew install llvm@18
19+
brew install llvm@19
2020

2121
LIBRARY_PATH=/opt/homebrew/lib
22-
MLIR_SYS_180_PREFIX="$(brew --prefix llvm@18)"
23-
LLVM_SYS_181_PREFIX="$MLIR_SYS_180_PREFIX"
24-
TABLEGEN_180_PREFIX="$MLIR_SYS_180_PREFIX"
22+
MLIR_SYS_190_PREFIX="$(brew --prefix llvm@19)"
23+
LLVM_SYS_191_PREFIX="$MLIR_SYS_190_PREFIX"
24+
TABLEGEN_190_PREFIX="$MLIR_SYS_190_PREFIX"
2525

2626
export LIBRARY_PATH
27-
export MLIR_SYS_180_PREFIX
28-
export LLVM_SYS_181_PREFIX
29-
export TABLEGEN_180_PREFIX
27+
export MLIR_SYS_190_PREFIX
28+
export LLVM_SYS_191_PREFIX
29+
export TABLEGEN_190_PREFIX
3030
;;
3131
Linux)
3232
export DEBIAN_FRONTEND=noninteractive
@@ -35,22 +35,22 @@ setup_llvm_deps() {
3535
CODENAME=$(grep VERSION_CODENAME /etc/os-release | cut -d= -f2)
3636
[ -z "$CODENAME" ] && { echo "Error: Unable to determine OS codename"; exit 1; }
3737

38-
echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-18 main" > /etc/apt/sources.list.d/llvm-18.list
39-
echo "deb-src http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-18 main" >> /etc/apt/sources.list.d/llvm-18.list
38+
echo "deb http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-19 main" > /etc/apt/sources.list.d/llvm-19.list
39+
echo "deb-src http://apt.llvm.org/$CODENAME/ llvm-toolchain-$CODENAME-19 main" >> /etc/apt/sources.list.d/llvm-19.list
4040
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
4141

4242
apt-get update && apt-get upgrade -y
4343
apt-get install -y zstd
44-
apt-get install -y llvm-18 llvm-18-dev llvm-18-runtime clang-18 clang-tools-18 lld-18 libpolly-18-dev libmlir-18-dev mlir-18-tools
44+
apt-get install -y llvm-19 llvm-19-dev llvm-19-runtime clang-19 clang-tools-19 lld-19 libpolly-19-dev libmlir-19-dev mlir-19-tools
4545
apt-get install -y libgmp3-dev
4646

47-
MLIR_SYS_180_PREFIX=/usr/lib/llvm-18/
48-
LLVM_SYS_181_PREFIX=/usr/lib/llvm-18/
49-
TABLEGEN_180_PREFIX=/usr/lib/llvm-18/
47+
MLIR_SYS_190_PREFIX=/usr/lib/llvm-19/
48+
LLVM_SYS_191_PREFIX=/usr/lib/llvm-19/
49+
TABLEGEN_190_PREFIX=/usr/lib/llvm-19/
5050

51-
export MLIR_SYS_180_PREFIX
52-
export LLVM_SYS_181_PREFIX
53-
export TABLEGEN_180_PREFIX
51+
export MLIR_SYS_190_PREFIX
52+
export LLVM_SYS_191_PREFIX
53+
export TABLEGEN_190_PREFIX
5454
;;
5555
*)
5656
echo "Error: Unsupported operating system"
@@ -60,9 +60,9 @@ setup_llvm_deps() {
6060

6161
# GitHub Actions specific
6262
[ -n "$GITHUB_ACTIONS" ] && {
63-
echo "MLIR_SYS_180_PREFIX=$MLIR_SYS_180_PREFIX" >> $GITHUB_ENV
64-
echo "LLVM_SYS_181_PREFIX=$LLVM_SYS_181_PREFIX" >> $GITHUB_ENV
65-
echo "TABLEGEN_180_PREFIX=$TABLEGEN_180_PREFIX" >> $GITHUB_ENV
63+
echo "MLIR_SYS_190_PREFIX=$MLIR_SYS_190_PREFIX" >> $GITHUB_ENV
64+
echo "LLVM_SYS_191_PREFIX=$LLVM_SYS_191_PREFIX" >> $GITHUB_ENV
65+
echo "TABLEGEN_190_PREFIX=$TABLEGEN_190_PREFIX" >> $GITHUB_ENV
6666
}
6767
}
6868

0 commit comments

Comments
 (0)