Skip to content

Commit 107ce92

Browse files
committed
Organize set_env.sh paths
Signed-off-by: ZePan110 <[email protected]>
1 parent 5a9d800 commit 107ce92

File tree

4 files changed

+11
-34
lines changed

4 files changed

+11
-34
lines changed

DBQnA/docker_compose/amd/gpu/rocm/set_env.sh

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# Copyright (C) 2024 Intel Corporation
44
# SPDX-License-Identifier: Apache-2.0
55

6+
pushd "../../../../../" > /dev/null
7+
source .set_env.sh
8+
popd > /dev/null
9+
610
export host_ip=${ip_address}
711
export DBQNA_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
812
export DBQNA_TGI_SERVICE_PORT=8008

DBQnA/docker_compose/intel/cpu/xeon/set_env.sh

100644100755
+6-13
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@
22

33
# Copyright (C) 2024 Intel Corporation
44
# SPDX-License-Identifier: Apache-2.0
5+
56
pushd "../../../../../" > /dev/null
67
source .set_env.sh
78
popd > /dev/null
89

9-
#export host_ip=$(hostname -I | awk '{print $1}')
10-
11-
if [ -z "${HUGGINGFACEHUB_API_TOKEN}" ]; then
12-
echo "Error: HUGGINGFACEHUB_API_TOKEN is not set. Please set HUGGINGFACEHUB_API_TOKEN."
13-
fi
14-
15-
if [ -z "${host_ip}" ]; then
16-
echo "Error: host_ip is not set. Please set host_ip first."
17-
fi
10+
export host_ip=${ip_address}
1811
export no_proxy=$no_proxy,$host_ip,dbqna-xeon-react-ui-server,text2sql-service,tgi-service,postgres-container
1912
export HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
20-
export TGI_PORT=8008
21-
export TGI_LLM_ENDPOINT="http://${host_ip}:${TGI_PORT}"
22-
export LLM_MODEL_ID="mistralai/Mistral-7B-Instruct-v0.3"
13+
export HF_TOKEN=${HUGGINGFACEHUB_API_TOKEN}
2314
export POSTGRES_USER=postgres
2415
export POSTGRES_PASSWORD=testpwd
2516
export POSTGRES_DB=chinook
17+
export TGI_PORT=8008
2618
export TEXT2SQL_PORT=9090
27-
"set_env.sh" 27L, 974B
19+
export TGI_LLM_ENDPOINT="http://${host_ip}:${TGI_PORT}"
20+
export LLM_MODEL_ID="mistralai/Mistral-7B-Instruct-v0.3"

DBQnA/docker_compose/set_env.sh

-19
This file was deleted.

DBQnA/tests/test_compose_on_xeon.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ function build_docker_images() {
2828
}
2929

3030
function start_service() {
31-
cd $WORKPATH/docker_compose
31+
cd $WORKPATH/docker_compose/intel/cpu/xeon
3232
source ./set_env.sh
33-
cd intel/cpu/xeon
3433

3534
# Start Docker Containers
3635
docker compose -f compose.yaml up -d > ${LOG_PATH}/start_services_with_compose.log

0 commit comments

Comments
 (0)