Skip to content

Commit f423068

Browse files
author
Longsheng Du
committed
Merge branch 'main' into longsheng/add_onednn_graph
2 parents 64a2be0 + f53a112 commit f423068

File tree

6 files changed

+27
-2
lines changed

6 files changed

+27
-2
lines changed

.github/dockerfiles/env/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:latest
2+
3+
RUN set -ex; \
4+
export DEBIAN_FRONTEND=noninteractive; \
5+
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list;\
6+
curl -sSL https://cli.github.com/packages/githubcli-archive-keyring.gpg > /usr/share/keyrings/githubcli-archive-keyring.gpg; \
7+
apt-get update -y; \
8+
apt-get install -y --no-install-recommends --fix-missing \
9+
bash-completion \
10+
python3-pip \
11+
cmake gcc g++ ninja-build git clang-format \
12+
gh \
13+
; \
14+
rm -rf /var/lib/apt/lists/*
15+
16+
RUN pip install lit
17+
18+
SHELL ["/bin/bash", "-xec"]

.github/dockerfile/Dockerfile renamed to .github/dockerfiles/runner/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ RUN set -ex; \
1010
curl -sSL https://cli.github.com/packages/githubcli-archive-keyring.gpg > /usr/share/keyrings/githubcli-archive-keyring.gpg; \
1111
apt-get update -y; \
1212
apt-get install -y --no-install-recommends --fix-missing \
13+
python3-pip \
1314
cmake gcc g++ ninja-build git clang-format \
1415
gh \
1516
; \
1617
rm -rf /var/lib/apt/lists/*
1718

19+
RUN pip install lit
1820

1921
USER runner
2022
WORKDIR $HOME

.github/dockerfile/build.sh renamed to .github/dockerfiles/runner/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
REGISTRY=localhost:5000
44
TAG=graph-compiler-runner:latest
55

6+
kubectl -n docker-registry port-forward svc/docker-registry 5000:5000 &
7+
68
cd $(dirname "$0")
79
docker build . --tag $REGISTRY/$TAG
810
docker push $REGISTRY/$TAG

.github/workflows/build-llvm.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
cmake -G Ninja llvm -B build -DCMAKE_INSTALL_PREFIX=llvm-install \
2929
-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=true -DLLVM_ENABLE_PROJECTS="mlir" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_INSTALL_UTILS=true -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
3030
cmake --build build --target install
31-
cp llvm/bin/llvm-lit llvm-install/bin
3231
cd llvm-install
3332
tar -zcf ../llvm.tgz .
3433

.github/workflows/build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ jobs:
2424
- name: Build
2525
run: |
2626
scripts/compile.sh
27+
28+
- name: Test
29+
run: |
30+
cmake --build build --target gc-check

scripts/compile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ test -f "$llvm_dir/llvm-$llvm_hash"/llvm.tgz || get_llvm
2424
cmake -S . -G Ninja -B build \
2525
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
2626
-DMLIR_DIR=$llvm_dir/lib/cmake/mlir \
27-
-DLLVM_EXTERNAL_LIT=$llvm_dir/bin/llvm-lit
27+
-DLLVM_EXTERNAL_LIT=$(which lit)
2828
cmake --build build --parallel $(nproc)

0 commit comments

Comments
 (0)