From f17f3ddec971b4a2d344d4b28a61ffd09644cc00 Mon Sep 17 00:00:00 2001 From: Shaojun Liu <61072813+liu-shaojun@users.noreply.github.com> Date: Thu, 25 Aug 2022 16:33:31 +0800 Subject: [PATCH] fix issues (#5539) --- .../actions/dllib-scala-ut-action/action.yml | 1 + .../friesian-scala-ut-action/action.yml | 4 ++ .../orca-jep-exampletest-action/action.yml | 4 +- .../orca-python-exampletest-action/action.yml | 3 ++ .../action.yml | 3 ++ .../actions/ppml-scala-ut-action/action.yml | 1 + .github/workflows/manually_build.yml | 2 +- .github/workflows/nightly_build.yml | 42 ------------------- 8 files changed, 16 insertions(+), 44 deletions(-) diff --git a/.github/actions/dllib-scala-ut-action/action.yml b/.github/actions/dllib-scala-ut-action/action.yml index d46d3a5cedf..0c4a4c79f8b 100644 --- a/.github/actions/dllib-scala-ut-action/action.yml +++ b/.github/actions/dllib-scala-ut-action/action.yml @@ -4,6 +4,7 @@ runs: using: "composite" steps: - name: Run tests + shell: bash run: | export SPARK_LOCAL_HOSTNAME=localhost export KERAS_BACKEND=tensorflow diff --git a/.github/actions/friesian-scala-ut-action/action.yml b/.github/actions/friesian-scala-ut-action/action.yml index 9eb7a7b63f6..d659b289dd0 100644 --- a/.github/actions/friesian-scala-ut-action/action.yml +++ b/.github/actions/friesian-scala-ut-action/action.yml @@ -4,6 +4,7 @@ runs: using: "composite" steps: - name: Set up redis + shell: bash run: | sudo mkdir -p /usr/share/keyrings curl -fsSL https://packages.redis.io/gpg | sudo -E gpg --yes --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg @@ -14,6 +15,7 @@ runs: redis-cli ping - name: Set up mkl + shell: bash run: | cd /tmp curl -O http://10.239.45.10:8081/repository/raw/analytics-zoo-data/faiss-lib.zip @@ -23,6 +25,7 @@ runs: sudo ln -fs /lib/libmkl_intel_lp64.so /lib/libmkl_intel_lp64.so.2 - name: Prepare data + shell: bash run: | mkdir -p /tmp/friesian-unittest cd /tmp/friesian-unittest @@ -30,6 +33,7 @@ runs: tar -zxf friesian-serving-upload.tar.gz - name: Run tests + shell: bash run: | export SPARK_LOCAL_HOSTNAME=localhost export KERAS_BACKEND=tensorflow diff --git a/.github/actions/orca-jep-exampletest-action/action.yml b/.github/actions/orca-jep-exampletest-action/action.yml index ff5c048432d..bfd076f96d1 100644 --- a/.github/actions/orca-jep-exampletest-action/action.yml +++ b/.github/actions/orca-jep-exampletest-action/action.yml @@ -4,6 +4,7 @@ runs: using: "composite" steps: - name: Setup Env + shell: bash run: | apt-get update apt-get install wget @@ -12,6 +13,7 @@ runs: with: python-version: '3.7' - name: Install dependencies + shell: bash run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 @@ -21,8 +23,8 @@ runs: pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r python/orca/dev/example/requirements-jep.txt pip uninstall -y opencv-python-headless pip install opencv-python-headless - - name: Run Test + shell: bash run: | export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/example/run-example-tests-jep.sh diff --git a/.github/actions/orca-python-exampletest-action/action.yml b/.github/actions/orca-python-exampletest-action/action.yml index 2aac82453d4..5043272eb62 100644 --- a/.github/actions/orca-python-exampletest-action/action.yml +++ b/.github/actions/orca-python-exampletest-action/action.yml @@ -4,6 +4,7 @@ runs: using: "composite" steps: - name: Setup Env + shell: bash run: | apt-get update apt-get install wget @@ -14,6 +15,7 @@ runs: python-version: '3.7.6' - name: Install dependencies + shell: bash run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 @@ -24,6 +26,7 @@ runs: pip uninstall -y opencv-python-headless pip install opencv-python-headless - name: Run Test + shell: bash run: | export MAVEN_OPTS="-XX:MaxPermSize=3G -Xmx100G -XX:ReservedCodeCacheSize=512m" export _JAVA_OPTIONS="-Xmx100G -XX:MaxPermSize=3G" diff --git a/.github/actions/orca-python-exampletest-ray-action/action.yml b/.github/actions/orca-python-exampletest-ray-action/action.yml index d3ba6910025..491c000b192 100644 --- a/.github/actions/orca-python-exampletest-ray-action/action.yml +++ b/.github/actions/orca-python-exampletest-ray-action/action.yml @@ -4,6 +4,7 @@ runs: using: "composite" steps: - name: Setup Env + shell: bash run: | apt-get update apt-get install wget @@ -14,6 +15,7 @@ runs: python-version: '3.7' - name: Install dependencies + shell: bash run: | python -m pip install --upgrade pip python -m pip install --upgrade setuptools==58.0.4 @@ -25,6 +27,7 @@ runs: pip install opencv-python-headless - name: Run Test + shell: bash run: | export SPARK_LOCAL_HOSTNAME=localhost chmod a+x python/orca/dev/example/run-example-test-ray.sh diff --git a/.github/actions/ppml-scala-ut-action/action.yml b/.github/actions/ppml-scala-ut-action/action.yml index 5ff9f447fb9..8709a50763b 100644 --- a/.github/actions/ppml-scala-ut-action/action.yml +++ b/.github/actions/ppml-scala-ut-action/action.yml @@ -4,6 +4,7 @@ runs: using: "composite" steps: - name: Run tests + shell: bash run: | export SPARK_LOCAL_HOSTNAME=localhost export KERAS_BACKEND=tensorflow diff --git a/.github/workflows/manually_build.yml b/.github/workflows/manually_build.yml index dc9189dd49b..40b0465fdd3 100644 --- a/.github/workflows/manually_build.yml +++ b/.github/workflows/manually_build.yml @@ -67,7 +67,7 @@ jobs: bigdl-ppml-trusted-big-data-ml-python-graphene: - if: ${{ github.event.inputs.artifact == 'docker-bigdl-ppml-trusted-big-data-ml-python-graphene' || github.event.inputs.artifact == 'all' }} + if: ${{ github.event.inputs.artifact == 'bigdl-ppml-trusted-big-data-ml-python-graphene' || github.event.inputs.artifact == 'all' }} runs-on: [self-hosted, Shire] steps: diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 4f685d0f5c4..1996c6012bc 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -205,48 +205,6 @@ jobs: docker push 10.239.45.10/arda/${IMAGE}-spark-3.1.2:${TAG} docker rmi -f ${IMAGE}-spark-3.1.2:${TAG} - - needs: scala-build - if: ${{ github.event.schedule == '0 12 * * 1' || github.event.inputs.artifact == 'docker-kms' || github.event.inputs.artifact == 'all' }} - runs-on: [self-hosted, Shire] - - steps: - - uses: actions/checkout@v3 - - name: Set the variable - env: - DEFAULT_TAG: '0.3.0' - run: echo "TAG=${{ github.event.inputs.kmsTag || env.DEFAULT_TAG }}" >> $GITHUB_ENV - - name: docker deploy kms-util - run: | - export IMAGE=intelanalytics/kms-utils - cd ppml/services/kms-utils/docker - echo "########################################" - echo "############## kms-utils ###############" - echo "########################################" - docker build \ - --no-cache=true \ - --build-arg http_proxy=${HTTP_PROXY} \ - --build-arg https_proxy=${HTTPS_PROXY} \ - --build-arg JDK_URL=${JDK_URL} \ - -t $IMAGE:$TAG -f ./Dockerfile . - docker tag ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG} - docker push 10.239.45.10/arda/${IMAGE}:${TAG} - docker rmi -f ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG} - - name: docker deploy pccs - run: | - export IMAGE=intelanalytics/pccs - cd ppml/services/pccs/docker - echo "########################################" - echo "################# PCCS #################" - echo "########################################" - docker build \ - --no-cache=true \ - --build-arg http_proxy=${HTTP_PROXY} \ - --build-arg https_proxy=${HTTPS_PROXY} \ - -t $IMAGE:$TAG -f ./Dockerfile . - docker tag ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG} - docker push 10.239.45.10/arda/${IMAGE}:${TAG} - docker rmi -f ${IMAGE}:${TAG} 10.239.45.10/arda/${IMAGE}:${TAG} python-build: if: ${{ github.event.schedule || github.event.inputs.artifact == 'python-build' || github.event.inputs.artifact == 'all' }}