From 4c892f86e617332fb9f74034b9cbf7fb3726cd07 Mon Sep 17 00:00:00 2001 From: Jin Hai Date: Thu, 4 Jul 2024 21:29:11 +0800 Subject: [PATCH] Remove unused dockerfile and update benchmark record (#1437) ### What problem does this PR solve? 1. Remove libcxx branch 2. Remove ubuntu2310 dockerfile 3. Update release CI benchmark record ### Type of change - [x] Refactoring --------- Signed-off-by: Jin Hai --- .github/workflows/tests.yml | 1 - .../Dockerfile_infinity_builder_ubuntu2310 | 41 ------------------- tools/ci_tools/check_benchmark_result.py | 2 +- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 scripts/Dockerfile_infinity_builder_ubuntu2310 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aa63d5ee8f..135f96b7e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,7 +5,6 @@ on: branches: - 'main' - '*.*.*' - - 'libcxx' paths-ignore: - 'docs/**' - '*.md' diff --git a/scripts/Dockerfile_infinity_builder_ubuntu2310 b/scripts/Dockerfile_infinity_builder_ubuntu2310 deleted file mode 100644 index 4c82b18445..0000000000 --- a/scripts/Dockerfile_infinity_builder_ubuntu2310 +++ /dev/null @@ -1,41 +0,0 @@ -FROM ubuntu:23.10 - -RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.tuna.tsinghua.edu.cn@g' /etc/apt/sources.list -RUN apt update - -# Clang 17+ is required for C++20 modules. GCC is not supported. -RUN apt install -y clang-*-17 libc++-17-dev llvm-17 -RUN ln -s /usr/bin/clang-scan-deps-17 /usr/bin/clang-scan-deps && ln -s /usr/bin/clang-format-17 /usr/bin/clang-format && ln -s /usr/bin/clang-tidy-17 /usr/bin/clang-tidy && ln -s /usr/bin/llvm-symbolizer-17 /usr/bin/llvm-symbolizer - -ENV CC=/usr/bin/clang-17 -ENV CXX=/usr/bin/clang++-17 - -# tools -RUN apt install -y wget curl emacs-nox vim git build-essential ninja-build bison flex thrift-compiler postgresql-client python3-full tree rpm - -# build dependencies -RUN apt install -y liblz4-dev zlib1g-dev libboost1.81-dev liburing-dev libgflags-dev libevent-dev libjemalloc-dev python3-dev - -# CMake 3.28+ is requrired for C++20 modules. -# download https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3-linux-x86_64.tar.gz -RUN --mount=type=bind,source=cmake-3.29.3-linux-x86_64.tar.gz,target=/root/cmake-3.29.3-linux-x86_64.tar.gz \ - cd /root && tar xzf cmake-3.29.3-linux-x86_64.tar.gz && cp -rf cmake-3.29.3-linux-x86_64/bin/* /usr/local/bin && cp -rf cmake-3.29.3-linux-x86_64/share/* /usr/local/share && rm -fr cmake-3.29.3-linux-x86_64 - -# download https://github.com/gperftools/gperftools/releases/download/gperftools-2.15/gperftools-2.15.tar.gz -RUN --mount=type=bind,source=gperftools-2.15.tar.gz,target=/root/gperftools-2.15.tar.gz \ - cd /root && tar xzf gperftools-2.15.tar.gz && cd gperftools-2.15 && ./configure && make -j 8 && make install && rm -fr /root/gperftools-2.15 - -# download https://github.com/risinglightdb/sqllogictest-rs/releases/download/v0.20.2/sqllogictest-bin-v0.20.2-x86_64-unknown-linux-musl.tar.gz -RUN --mount=type=bind,source=sqllogictest-bin-v0.20.2-x86_64-unknown-linux-musl.tar.gz,target=/root/sqllogictest-bin-v0.20.2-x86_64-unknown-linux-musl.tar.gz \ - cd /tmp && tar xzf /root/sqllogictest-bin-v0.20.2-x86_64-unknown-linux-musl.tar.gz && cp -rf sqllogictest /usr/local/bin && rm -fr /tmp/* - -# Create a python virtual environment. Set PATH so that the shell activate this virtual environment automatically when entering a container from this image. -RUN python3 -m venv /usr/local/venv -ENV PATH="/usr/local/venv/bin:$PATH" -RUN pip3 config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple/ && pip3 config set global.trusted-host pypi.tuna.tsinghua.edu.cn && pip3 install wheel twine - -# infinity python SDK dependencies -COPY python/requirements.txt . -RUN --mount=type=bind,source=python/requirements.txt,target=/root/requirements.txt pip3 install --no-input -r /root/requirements.txt - -ENTRYPOINT [ "bash", "-c", "while true; do sleep 60; done"] diff --git a/tools/ci_tools/check_benchmark_result.py b/tools/ci_tools/check_benchmark_result.py index 55eebad9e4..c9877bdb98 100755 --- a/tools/ci_tools/check_benchmark_result.py +++ b/tools/ci_tools/check_benchmark_result.py @@ -7,7 +7,7 @@ def main(): - benchmark_bars = {"sift_1": 1.897754, "sift_8": 0.332755} + benchmark_bars = {"sift_1": 1.84197, "sift_8": 0.286523} benchmark_id = sys.argv[1] standard = benchmark_bars[benchmark_id] file_path = sys.argv[2]