diff --git a/.github/workflows/ChatQnA_gaudi.yml b/.github/workflows/ChatQnA_gaudi.yml deleted file mode 100644 index a60fc98ac..000000000 --- a/.github/workflows/ChatQnA_gaudi.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: ChatQnA E2E test on Gaudi - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - ChatQnA/docker-composer/gaudi/** - - ChatQnA/tests/test_chatqna_on_gaudi.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/ChatQnA_gaudi.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - ChatQnA-Gaudi: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/ChatQnA/tests - timeout 20m bash test_chatqna_on_gaudi.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/ChatQnA/docker-composer/gaudi - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/ChatQnA/tests/*.log diff --git a/.github/workflows/ChatQnA_xeon.yml b/.github/workflows/ChatQnA_xeon.yml deleted file mode 100644 index 4a2913ff9..000000000 --- a/.github/workflows/ChatQnA_xeon.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: ChatQnA E2E test on Xeon - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - ChatQnA/docker-composer/xeon/** - - ChatQnA/tests/test_chatqna_on_xeon.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/ChatQnA_xeon.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - ChatQnA-Xeon: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/ChatQnA/tests - timeout 20m bash test_chatqna_on_xeon.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/ChatQnA/docker-composer/xeon - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/ChatQnA/tests/*.log diff --git a/.github/workflows/CodeGen_gaudi.yml b/.github/workflows/CodeGen_gaudi.yml deleted file mode 100644 index d19ac970b..000000000 --- a/.github/workflows/CodeGen_gaudi.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: CodeGen E2E test on Gaudi - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - CodeGen/docker-composer/gaudi/** - - CodeGen/tests/test_codegen_on_gaudi.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/CodeGen_gaudi.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - CodeGen-Gaudi: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/CodeGen/tests - timeout 20m bash test_codegen_on_gaudi.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/CodeGen/docker-composer/gaudi - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/CodeGen/tests/*.log diff --git a/.github/workflows/CodeGen_xeon.yml b/.github/workflows/CodeGen_xeon.yml deleted file mode 100644 index 644db31bc..000000000 --- a/.github/workflows/CodeGen_xeon.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: CodeGen E2E test on Xeon - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - CodeGen/docker-composer/xeon/** - - CodeGen/tests/test_codegen_on_xeon.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/CodeGen_xeon.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - CodeGen-Xeon: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/CodeGen/tests - timeout 20m bash test_codegen_on_xeon.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/CodeGen/docker-composer/xeon - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/CodeGen/tests/*.log diff --git a/.github/workflows/CodeTrans_gaudi.yml b/.github/workflows/CodeTrans_gaudi.yml deleted file mode 100644 index 03c707128..000000000 --- a/.github/workflows/CodeTrans_gaudi.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: CodeTrans E2E test on Gaudi - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - CodeTrans/docker-composer/gaudi/** - - CodeTrans/tests/test_codetrans_on_gaudi.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/CodeTrans_gaudi.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - CodeTrans-Gaudi: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/CodeTrans/tests - timeout 20m bash test_codetrans_on_gaudi.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/CodeTrans/docker-composer/gaudi - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/CodeTrans/tests/*.log diff --git a/.github/workflows/CodeTrans_xeon.yml b/.github/workflows/CodeTrans_xeon.yml deleted file mode 100644 index 3bb63aacf..000000000 --- a/.github/workflows/CodeTrans_xeon.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: CodeTrans E2E test on Xeon - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - CodeTrans/docker-composer/xeon/** - - CodeTrans/tests/test_codetrans_on_xeon.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/CodeTrans_xeon.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - CodeTrans-Xeon: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/CodeTrans/tests - timeout 20m bash test_codetrans_on_xeon.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/CodeTrans/docker-composer/xeon - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/CodeTrans/tests/*.log diff --git a/.github/workflows/DocSum_gaudi.yml b/.github/workflows/DocSum_gaudi.yml deleted file mode 100644 index b3db02901..000000000 --- a/.github/workflows/DocSum_gaudi.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: DocSum E2E test on Gaudi - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - DocSum/docker-composer/gaudi/** - - DocSum/tests/test_docsum_on_gaudi.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/DocSum_gaudi.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - DocSum-Gaudi: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/DocSum/tests - timeout 20m bash test_docsum_on_gaudi.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/DocSum/docker-composer/gaudi - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/DocSum/tests/*.log diff --git a/.github/workflows/DocSum_xeon.yml b/.github/workflows/DocSum_xeon.yml deleted file mode 100644 index 8ee0ac75a..000000000 --- a/.github/workflows/DocSum_xeon.yml +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -name: DocSum E2E test on Xeon - -on: - pull_request_target: - branches: [main] - types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped - paths: - - DocSum/docker-composer/xeon/** - - DocSum/tests/test_docsum_on_xeon.sh - - "!**.md" - - "!**/ui/**" - - .github/workflows/DocSum_xeon.yml - workflow_dispatch: - -# If there is a new commit, the previous jobs will be canceled -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - DocSum-Xeon: - runs-on: aise-cluster - steps: - - name: Clean Up Working Directory - run: sudo rm -rf ${{github.workspace}}/* - - - name: Checkout out Repo - uses: actions/checkout@v4 - with: - ref: "refs/pull/${{ github.event.number }}/merge" - - - name: Run Test - env: - HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} - AISE_CLUSTER_01_2_IP: ${{ secrets.AISE_CLUSTER_01_2_IP }} - run: | - cd ${{ github.workspace }}/DocSum/tests - timeout 20m bash test_docsum_on_xeon.sh - - - name: Clean Up Container - if: cancelled() || failure() - run: | - cd ${{ github.workspace }}/DocSum/docker-composer/xeon - container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) - for container_name in $container_list; do - cid=$(docker ps -aq --filter "name=$container_name") - if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi - done - - - name: Publish pipeline artifact - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - path: ${{ github.workspace }}/DocSum/tests/*.log diff --git a/.github/workflows/E2E_test_with_compose.yml b/.github/workflows/E2E_test_with_compose.yml new file mode 100644 index 000000000..a4e8876ab --- /dev/null +++ b/.github/workflows/E2E_test_with_compose.yml @@ -0,0 +1,104 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +name: E2E test with docker compose + +on: + pull_request_target: + branches: [main] + types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped + paths: + - "**/docker-composer/**" + - "**/tests/**" + - "**/ui/**" + - "!**.md" + - "!**.txt" + - .github/workflows/E2E_test_with_compose.yml + workflow_dispatch: + +# If there is a new commit, the previous jobs will be canceled +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + job1: + name: Get-test-matrix + runs-on: ubuntu-latest + outputs: + run_matrix: ${{ steps.get-test-matrix.outputs.run_matrix }} + steps: + - name: Checkout out Repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get test matrix + id: get-test-matrix + run: | + set -xe + changed_files=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} | \ + grep -vE '.github|README.md|*.txt|deprecate|kubernetes') + examples=$(printf '%s\n' "${changed_files[@]}" | grep '/' | cut -d'/' -f1 | sort -u) + run_matrix="{\"include\":[" + for example in ${examples}; do + run_hardware="" + if [ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c gaudi) != 0 ]; then run_hardware="gaudi"; fi + if [ $(printf '%s\n' "${changed_files[@]}" | grep ${example} | grep -c xeon) != 0 ]; then run_hardware="xeon ${run_hardware}"; fi + if [ $run_hardware = "" ]; then run_hardware="xeon"; fi + for hw in ${run_hardware}; do + run_matrix="${run_matrix}{\"example\":\"${example}\",\"hardware\":\"${hw}\"}," + done + done + run_matrix=$run_matrix"]}" + echo "run_matrix=${run_matrix}" >> $GITHUB_OUTPUT + + Example-test: + needs: job1 + strategy: + matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }} + runs-on: ${{ matrix.hardware }} + continue-on-error: true + steps: + - name: Test example + run: | + echo "Matrix - example ${{ matrix.example }}, hardware ${{ matrix.hardware }}" + + - name: Clean Up Working Directory + run: sudo rm -rf ${{github.workspace}}/* + + - name: Checkout out Repo + uses: actions/checkout@v4 + with: + ref: "refs/pull/${{ github.event.number }}/merge" + + - name: Run test + env: + HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }} + example: ${{ matrix.example }} + hardware: ${{ matrix.hardware }} + run: | + cd ${{ github.workspace }}/$example/tests + example_l=$(echo $example | tr '[:upper:]' '[:lower:]') + timeout 20m bash test_${example_l}_on_${hardware}.sh + + - name: Clean up container + env: + example: ${{ matrix.example }} + hardware: ${{ matrix.hardware }} + if: cancelled() || failure() + run: | + cd ${{ github.workspace }}/$example/docker-composer/$hardware + container_list=$(cat docker_compose.yaml | grep container_name | cut -d':' -f2) + for container_name in $container_list; do + cid=$(docker ps -aq --filter "name=$container_name") + if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi + done + echo y | docker system prune + + - name: Publish pipeline artifact + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.example }}-${{ matrix.hardware }} + path: ${{ github.workspace }}/${{ matrix.example }}/tests/*.log diff --git a/ChatQnA/tests/test_chatqna_on_gaudi.sh b/ChatQnA/tests/test_chatqna_on_gaudi.sh index 280b60026..9d86c0ca8 100644 --- a/ChatQnA/tests/test_chatqna_on_gaudi.sh +++ b/ChatQnA/tests/test_chatqna_on_gaudi.sh @@ -2,7 +2,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -x +set -xe WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" @@ -89,7 +89,7 @@ function validate_microservices() { fi sleep 5s - export PATH="${HOME}/miniconda3/bin:$PATH" + export PATH="${HOME}/miniforge3/bin:$PATH" source activate test_embedding=$(python -c "import random; embedding = [random.uniform(-1, 1) for _ in range(768)]; print(embedding)") curl http://${ip_address}:7000/v1/retrieval \ diff --git a/ChatQnA/tests/test_chatqna_on_xeon.sh b/ChatQnA/tests/test_chatqna_on_xeon.sh index 8581380ae..08bfffb93 100644 --- a/ChatQnA/tests/test_chatqna_on_xeon.sh +++ b/ChatQnA/tests/test_chatqna_on_xeon.sh @@ -2,12 +2,11 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -set -x +set -xe WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" -ip_name=$(echo $(hostname) | tr '[a-z]-' '[A-Z]_')_$(echo 'IP') -ip_address=$(eval echo '$'$ip_name) +ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH @@ -81,7 +80,7 @@ function validate_microservices() { fi sleep 5s - export PATH="${HOME}/miniconda3/bin:$PATH" + export PATH="${HOME}/miniforge3/bin:$PATH" source activate test_embedding=$(python -c "import random; embedding = [random.uniform(-1, 1) for _ in range(768)]; print(embedding)") curl http://${ip_address}:7000/v1/retrieval \ diff --git a/CodeGen/tests/test_codegen_on_gaudi.sh b/CodeGen/tests/test_codegen_on_gaudi.sh index 05ebaa785..cf680f333 100644 --- a/CodeGen/tests/test_codegen_on_gaudi.sh +++ b/CodeGen/tests/test_codegen_on_gaudi.sh @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -x +set -xe WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" -ip_name=$(echo $(hostname) | tr '[a-z]-' '[A-Z]_')_$(echo 'IP') -ip_address=$(eval echo '$'$ip_name) +ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH @@ -58,7 +57,7 @@ function validate_microservices() { # Check if the microservices are running correctly. # TODO: Any results check required?? - export PATH="${HOME}/miniconda3/bin:$PATH" + export PATH="${HOME}/miniforge3/bin:$PATH" curl http://${ip_address}:8028/generate \ -X POST \ diff --git a/CodeGen/tests/test_codegen_on_xeon.sh b/CodeGen/tests/test_codegen_on_xeon.sh index d7d748573..dcf84392f 100644 --- a/CodeGen/tests/test_codegen_on_xeon.sh +++ b/CodeGen/tests/test_codegen_on_xeon.sh @@ -6,8 +6,7 @@ set -xe WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" -ip_name=$(echo $(hostname) | tr '[a-z]-' '[A-Z]_')_$(echo 'IP') -ip_address=$(eval echo '$'$ip_name) +ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH @@ -46,7 +45,7 @@ function validate_microservices() { # Check if the microservices are running correctly. # TODO: Any results check required?? - export PATH="${HOME}/miniconda3/bin:$PATH" + export PATH="${HOME}/miniforge3/bin:$PATH" curl http://${ip_address}:8028/generate \ -X POST \ diff --git a/CodeTrans/tests/test_codetrans_on_xeon.sh b/CodeTrans/tests/test_codetrans_on_xeon.sh index e3f9f5bff..b1b0dcda6 100644 --- a/CodeTrans/tests/test_codetrans_on_xeon.sh +++ b/CodeTrans/tests/test_codetrans_on_xeon.sh @@ -4,7 +4,6 @@ set -xe - WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" ip_address=$(hostname -I | awk '{print $1}') diff --git a/DocSum/tests/test_docsum_on_gaudi.sh b/DocSum/tests/test_docsum_on_gaudi.sh index ca46893a2..e72d3a118 100644 --- a/DocSum/tests/test_docsum_on_gaudi.sh +++ b/DocSum/tests/test_docsum_on_gaudi.sh @@ -6,8 +6,7 @@ set -x WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" -ip_name=$(echo $(hostname) | tr '[a-z]-' '[A-Z]_')_$(echo 'IP') -ip_address=$(eval echo '$'$ip_name) +ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH diff --git a/DocSum/tests/test_docsum_on_xeon.sh b/DocSum/tests/test_docsum_on_xeon.sh index d25526799..cdd0c57f3 100644 --- a/DocSum/tests/test_docsum_on_xeon.sh +++ b/DocSum/tests/test_docsum_on_xeon.sh @@ -6,8 +6,7 @@ set -x WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" -ip_name=$(echo $(hostname) | tr '[a-z]-' '[A-Z]_')_$(echo 'IP') -ip_address=$(eval echo '$'$ip_name) +ip_address=$(hostname -I | awk '{print $1}') function build_docker_images() { cd $WORKPATH diff --git a/third-party-programs.txt b/third-party-programs.txt index 3cda4f296..feedabd0a 100644 --- a/third-party-programs.txt +++ b/third-party-programs.txt @@ -15,7 +15,6 @@ terms are listed below. 1. huggingface/transformers Copyright 2018- The Hugging Face team. All rights reserved. - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/