Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ChatQnA] Add no_wrapper benchmarking and update legacy manifests #767

Merged
merged 54 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
3eaf45f
add no_wrapper code
Spycsh Sep 9, 2024
31f28f6
fix name
Spycsh Sep 9, 2024
9879f3c
merge to one
Spycsh Sep 9, 2024
7e0199c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 9, 2024
16f35e9
revert to nc 7b
Spycsh Sep 10, 2024
0dc4a07
Merge branch 'no_wrapper_bench' of https://github.com/opea-project/Ge…
Spycsh Sep 10, 2024
bee736b
revert to nc 7b
Spycsh Sep 10, 2024
778b263
fix
Spycsh Sep 10, 2024
7816ba9
add no rerank manifest dockerfile
Spycsh Sep 10, 2024
d723f06
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 10, 2024
c90713d
merge
Spycsh Sep 11, 2024
2cbc01f
addcross node yaml
Spycsh Sep 11, 2024
02bf431
Merge branch 'main' into no_wrapper_bench
Spycsh Sep 11, 2024
266fa6e
Merge branch 'main' into no_wrapper_bench
Spycsh Sep 11, 2024
475be76
fix
Spycsh Sep 12, 2024
e3755b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
871f7c8
Merge remote-tracking branch 'origin/main' into no_wrapper_bench
Spycsh Sep 12, 2024
e1e63f3
Merge branch 'no_wrapper_bench' of https://github.com/opea-project/Ge…
Spycsh Sep 12, 2024
93a9496
added tuned folder
Zhenzhong1 Sep 12, 2024
686d5d9
update OOB no wrapper with rerank manifests
Zhenzhong1 Sep 12, 2024
8a67e36
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
ae66a65
SERVICE->SERVR
Zhenzhong1 Sep 12, 2024
e29a702
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
2dfe878
updated without_rerank manifests
Zhenzhong1 Sep 12, 2024
2ae1787
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
00c8544
updated wrapper oob with rerank manifests
Zhenzhong1 Sep 12, 2024
4e73f56
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
b6f2e13
updated tuned wrapper manifests
Zhenzhong1 Sep 12, 2024
8c0b60e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
32bcba5
modify the path
Zhenzhong1 Sep 12, 2024
06e3ab0
updated tuned wrapper manifests
Zhenzhong1 Sep 12, 2024
24bc0eb
updated tuned wrapper manifests
Zhenzhong1 Sep 12, 2024
97a3d19
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 12, 2024
c746fb0
Merge remote-tracking branch 'origin/main' into no_wrapper_bench
Zhenzhong1 Sep 13, 2024
36b88d3
try fix ulimit
Spycsh Sep 13, 2024
25ff722
lower ulimit n
Spycsh Sep 13, 2024
f343c3e
updated tuned_no_wrapper
Zhenzhong1 Sep 13, 2024
33a69b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 13, 2024
188c984
added eight_gtuned_no_wrapper with rerank eudi folder
Zhenzhong1 Sep 13, 2024
4052264
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 13, 2024
220c4e5
updated tuned_no_wrapper with rerank 1024 -> 1280
Zhenzhong1 Sep 13, 2024
7665b60
revert useless ulimit
Spycsh Sep 13, 2024
bbd39c8
renamed
Zhenzhong1 Sep 13, 2024
aa4fdf9
renamed
Zhenzhong1 Sep 13, 2024
f82a060
updated tuned_no_wrapper without rerank
Zhenzhong1 Sep 13, 2024
bb9e80b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 13, 2024
6bff80c
fix norerank bug
Spycsh Sep 13, 2024
8c7799c
Merge branch 'no_wrapper_bench' of https://github.com/opea-project/Ge…
Spycsh Sep 13, 2024
d7aebe8
update readme.md
Zhenzhong1 Sep 13, 2024
89846bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 13, 2024
d1e2c35
added oob no wrapper manifests
Zhenzhong1 Sep 14, 2024
a9f7c8a
added tuned no wrapper eight manifests
Zhenzhong1 Sep 14, 2024
dd74d5e
fix
Spycsh Sep 14, 2024
1d4ba13
Merge branch 'main' into no_wrapper_bench
Spycsh Sep 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ChatQnA/Dockerfile.no_wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,4 @@ USER user

WORKDIR /home/user

RUN echo 'ulimit -S -n 999999' >> ~/.bashrc

ENTRYPOINT ["python", "chatqna_no_wrapper.py"]
34 changes: 34 additions & 0 deletions ChatQnA/Dockerfile.no_wrapper_without_rerank
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@


# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

FROM python:3.11-slim

RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
libgl1-mesa-glx \
libjemalloc-dev \
vim \
git

RUN useradd -m -s /bin/bash user && \
mkdir -p /home/user && \
chown -R user /home/user/

WORKDIR /home/user/
RUN git clone https://github.com/opea-project/GenAIComps.git

WORKDIR /home/user/GenAIComps
RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt && \
pip install --no-cache-dir langchain_core

COPY ./chatqna_no_wrapper.py /home/user/chatqna_no_wrapper.py

ENV PYTHONPATH=$PYTHONPATH:/home/user/GenAIComps

USER user

WORKDIR /home/user

ENTRYPOINT ["python", "chatqna_no_wrapper.py", "--without-rerank"]
11 changes: 11 additions & 0 deletions ChatQnA/benchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ Results will be displayed in the terminal and saved as CSV file named `1_stats.c
- Set up kubectl on the master node with access to the Kubernetes cluster.
- Install Python 3.8+ on the master node for running the stress tool.
- Ensure all nodes have a local /mnt/models folder, which will be mounted by the pods.
- Ensure that the container's ulimit can meet the the number of requests.
Zhenzhong1 marked this conversation as resolved.
Show resolved Hide resolved

```bash
# The way to modify the containered ulimit:
sudo systemctl edit containerd
# Add two lines:
[Service]
LimitNOFILE=65536:1048576

sudo systemctl daemon-reload; sudo systemctl restart containerd
```

### Kubernetes Cluster Example

Expand Down
Loading