From a326af67f016b16cc8cc282d4f405dec4e464216 Mon Sep 17 00:00:00 2001 From: Le-Zheng Date: Mon, 26 Sep 2022 13:59:57 +0800 Subject: [PATCH] ppml docker 2.1.0 --- ppml/services/kms-utils/docker/Dockerfile | 2 +- ppml/services/kms-utils/docker/entrypoint.sh | 24 +++++++++---------- ppml/tdx/docker/client-image/tdx-client.yaml | 4 ++-- .../python/docker-gramine/Dockerfile | 2 +- .../docker-gramine/build-docker-image.sh | 4 ++-- .../python/docker-graphene/Dockerfile | 2 +- .../azure/deploy-local-spark-sgx.sh | 2 +- .../azure/submit-spark-sgx-az.sh | 2 +- .../docker-graphene/build-docker-image.sh | 4 ++-- .../docker-graphene/deploy-local-spark-sgx.sh | 2 +- .../kubernetes/bigdl-ppml-helm/Chart.yaml | 2 +- .../docker-graphene/standalone/environment.sh | 2 +- .../start-spark-local-bigdl-lennet-sgx.sh | 8 +++---- .../start-spark-local-orca-data-sgx.sh | 12 +++++----- .../start-spark-local-orca-tf-text.sh | 12 +++++----- ...tart-spark-local-xgboost-classifier-sgx.sh | 12 +++++----- ...start-spark-local-xgboost-regressor-sgx.sh | 12 +++++----- .../scala/docker-occlum/Dockerfile | 2 +- .../scala/docker-occlum/build-docker-image.sh | 2 +- .../docker-occlum/kubernetes/run_spark_gbt.sh | 2 +- .../kubernetes/run_spark_gbt_criteo.sh | 2 +- .../docker-occlum/kubernetes/run_spark_lr.sh | 2 +- .../docker-occlum/kubernetes/run_spark_pi.sh | 2 +- .../docker-occlum/kubernetes/run_spark_sql.sh | 2 +- .../kubernetes/run_spark_tpch.sh | 2 +- .../kubernetes/run_spark_xgboost.sh | 4 ++-- .../run_spark_on_occlum_glibc.sh | 4 ++-- .../start-occlum-attestation-server.sh | 2 +- .../scala/docker-occlum/start-spark-local.sh | 2 +- .../scala/docker-graphene/Dockerfile | 2 +- .../docker-graphene/build-docker-image.sh | 2 +- .../scala/docker-graphene/environment.sh | 2 +- .../start-local-cluster-serving.sh | 2 +- .../scala/docker-occlum/Dockerfile | 2 +- .../scala/docker-occlum/build-docker-image.sh | 2 +- .../scala/docker-occlum/environment.sh | 2 +- .../start-local-cluster-serving.sh | 2 +- 37 files changed, 76 insertions(+), 76 deletions(-) diff --git a/ppml/services/kms-utils/docker/Dockerfile b/ppml/services/kms-utils/docker/Dockerfile index c830f143307..83c2b5f78ca 100644 --- a/ppml/services/kms-utils/docker/Dockerfile +++ b/ppml/services/kms-utils/docker/Dockerfile @@ -1,6 +1,6 @@ ARG JDK_VERSION=8u192 ARG SPARK_VERSION=3.1.2 -ARG BIGDL_VERSION=2.1.0-SNAPSHOT +ARG BIGDL_VERSION=2.1.0 # stage.1 java & spark FROM ubuntu:20.04 AS builder diff --git a/ppml/services/kms-utils/docker/entrypoint.sh b/ppml/services/kms-utils/docker/entrypoint.sh index 2e07af118bb..90254115eb3 100644 --- a/ppml/services/kms-utils/docker/entrypoint.sh +++ b/ppml/services/kms-utils/docker/entrypoint.sh @@ -21,7 +21,7 @@ elif [ "$action" = "generatekeys" ]; then if [ "$KMS_TYPE" = "ehsm" ]; then appid=$2 apikey=$3 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.GenerateKeys \ --primaryKeyPath /home/key/ehsm_encrypted_primary_key \ --dataKeyPath /home/key/ehsm_encrypted_data_key \ @@ -33,7 +33,7 @@ elif [ "$action" = "generatekeys" ]; then elif [ "$KMS_TYPE" = "simple" ]; then appid=$2 apikey=$3 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.GenerateKeys \ --primaryKeyPath /home/key/simple_encrypted_primary_key \ --dataKeyPath /home/key/simple_encrypted_data_key \ @@ -42,7 +42,7 @@ elif [ "$action" = "generatekeys" ]; then --simpleAPIKEY $apikey elif [ "$KMS_TYPE" = "azure" ]; then keyVaultName=$2 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.GenerateKeys \ --primaryKeyPath /home/key/simple_encrypted_primary_key \ --dataKeyPath /home/key/simple_encrypted_data_key \ @@ -59,7 +59,7 @@ elif [ "$action" = "encrypt" ]; then if [ "$KMS_TYPE" = "ehsm" ]; then appid=$2 apikey=$3 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.Encrypt \ --inputPath $input_path \ --primaryKeyPath /home/key/ehsm_encrypted_primary_key \ @@ -72,7 +72,7 @@ elif [ "$action" = "encrypt" ]; then elif [ "$KMS_TYPE" = "simple" ]; then appid=$2 apikey=$3 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.Encrypt \ --inputPath $input_path \ --primaryKeyPath /home/key/simple_encrypted_primary_key \ @@ -82,7 +82,7 @@ elif [ "$action" = "encrypt" ]; then --simpleAPIKEY $apikey elif [ "$KMS_TYPE" = "azure" ]; then keyVaultName=$2 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.Encrypt \ --inputPath $input_path \ --primaryKeyPath /home/key/simple_encrypted_primary_key \ @@ -99,7 +99,7 @@ elif [ "$action" = "encryptwithrepartition" ]; then apikey=$3 input_path=$4 output_path=$input_path.encrypted - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.EncryptWithRepartition \ --inputPath $input_path \ --outputPath $output_path \ @@ -118,7 +118,7 @@ elif [ "$action" = "encryptwithrepartition" ]; then apikey=$3 input_path=$4 output_path=$input_path.encrypted - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.EncryptWithRepartition \ --inputPath $input_path \ --outputPath $output_path \ @@ -134,7 +134,7 @@ elif [ "$action" = "encryptwithrepartition" ]; then keyVaultName=$2 input_path=$3 output_path=$input_path.encrypted - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.EncryptWithRepartition \ --inputPath $input_path \ --outputPath $output_path \ @@ -154,7 +154,7 @@ elif [ "$action" = "decrypt" ]; then appid=$2 apikey=$3 input_path=$4 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.Decrypt \ --inputPath $input_path \ --inputPartitionNum 8 \ @@ -172,7 +172,7 @@ elif [ "$action" = "decrypt" ]; then appid=$2 apikey=$3 input_path=$4 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.Decrypt \ --inputPath $input_path \ --inputPartitionNum 8 \ @@ -187,7 +187,7 @@ elif [ "$action" = "decrypt" ]; then elif [ "$KMS_TYPE" = "azure" ]; then keyVaultName=$2 input_path=$3 - java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0-SNAPSHOT.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ + java -cp $BIGDL_HOME/jars/bigdl-ppml-spark_3.1.2-2.1.0.jar:$SPARK_HOME/jars/*:$SPARK_HOME/examples/jars/*:$BIGDL_HOME/jars/* \ com.intel.analytics.bigdl.ppml.examples.Decrypt \ --inputPath $input_path \ --inputPartitionNum 8 \ diff --git a/ppml/tdx/docker/client-image/tdx-client.yaml b/ppml/tdx/docker/client-image/tdx-client.yaml index ed3da88e2ff..e31a70fb54f 100644 --- a/ppml/tdx/docker/client-image/tdx-client.yaml +++ b/ppml/tdx/docker/client-image/tdx-client.yaml @@ -6,7 +6,7 @@ spec: runtimeClassName: kata-cc containers: - name: spark-local-k8s-client-kata-cc - image: intelanalytics/bigdl-tdx-client-spark-3.1.2:2.1.0-SNAPSHOT + image: intelanalytics/bigdl-tdx-client-spark-3.1.2:2.1.0 imagePullPolicy: Always securityContext: privileged: true @@ -33,7 +33,7 @@ spec: - name: RUNTIME_K8S_SERVICE_ACCOUNT value: "spark" - name: RUNTIME_K8S_SPARK_IMAGE - value: "intelanalytics/bigdl-tdx-client-spark-3.1.2:2.1.0-SNAPSHOT" + value: "intelanalytics/bigdl-tdx-client-spark-3.1.2:2.1.0" - name: RUNTIME_DRIVER_HOST value: "x.x.x.x" - name: RUNTIME_DRIVER_PORT diff --git a/ppml/trusted-big-data-ml/python/docker-gramine/Dockerfile b/ppml/trusted-big-data-ml/python/docker-gramine/Dockerfile index cbdffc3d577..ff5f1ef14d8 100644 --- a/ppml/trusted-big-data-ml/python/docker-gramine/Dockerfile +++ b/ppml/trusted-big-data-ml/python/docker-gramine/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.1.0-SNAPSHOT +ARG BIGDL_VERSION=2.1.0 ARG SPARK_VERSION=3.1.2 ARG TINI_VERSION=v0.18.0 ARG JDK_VERSION=8u192 diff --git a/ppml/trusted-big-data-ml/python/docker-gramine/build-docker-image.sh b/ppml/trusted-big-data-ml/python/docker-gramine/build-docker-image.sh index c3c96c91621..f9ed7030dc5 100644 --- a/ppml/trusted-big-data-ml/python/docker-gramine/build-docker-image.sh +++ b/ppml/trusted-big-data-ml/python/docker-gramine/build-docker-image.sh @@ -17,7 +17,7 @@ Proxy_Modified="sudo docker build \ --build-arg JDK_URL=${SPARK_JAR_REPO_URL} \ --build-arg SPARK_JAR_REPO_URL=${SPARK_JAR_REPO_URL} \ --build-arg no_proxy=x.x.x.x \ - -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-gramine:2.1.0-SNAPSHOT -f ./Dockerfile ." + -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-gramine:2.1.0 -f ./Dockerfile ." No_Proxy_Modified="sudo docker build \ --build-arg JDK_VERSION=8u192 \ @@ -25,7 +25,7 @@ No_Proxy_Modified="sudo docker build \ --build-arg JDK_URL=${SPARK_JAR_REPO_URL} \ --build-arg SPARK_JAR_REPO_URL=${SPARK_JAR_REPO_URL} \ --build-arg no_proxy=x.x.x.x \ - -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-gramine:2.1.0-SNAPSHOT -f ./Dockerfile ." + -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-gramine:2.1.0 -f ./Dockerfile ." if [[ "$JDK_URL" == "http://your-http-url-to-download-jdk" ]] || [[ "$SPARK_JAR_REPO_URL" == "http://your_spark_jar_repo_url" ]] then diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile index 7ffb4c186d0..16a557535a0 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile +++ b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.1.0-SNAPSHOT +ARG BIGDL_VERSION=2.1.0 ARG SPARK_VERSION=3.1.2 ARG TINI_VERSION=v0.18.0 ARG JDK_VERSION=8u192 diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/azure/deploy-local-spark-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/azure/deploy-local-spark-sgx.sh index bdc6dc07c9a..509d11833a6 100755 --- a/ppml/trusted-big-data-ml/python/docker-graphene/azure/deploy-local-spark-sgx.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/azure/deploy-local-spark-sgx.sh @@ -1,7 +1,7 @@ #!/bin/bash export LOCAL_IP=YOUR_LOCAL_IP -export DOCKER_IMAGE=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0-SNAPSHOT +export DOCKER_IMAGE=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0 sudo docker pull $DOCKER_IMAGE diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/azure/submit-spark-sgx-az.sh b/ppml/trusted-big-data-ml/python/docker-graphene/azure/submit-spark-sgx-az.sh index 0c5b94ce8c6..ff7c5ca1511 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/azure/submit-spark-sgx-az.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/azure/submit-spark-sgx-az.sh @@ -32,7 +32,7 @@ export TF_MKL_ALLOC_MAX_BYTES=10737418240 && \ --conf spark.driver.defaultJavaOptions="-Dlog4j.configuration=/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/log4j2.xml" \ --conf spark.executor.defaultJavaOptions="-Dlog4j.configuration=/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/log4j2.xml" \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0 \ --conf spark.kubernetes.driver.podTemplateFile=/ppml/trusted-big-data-ml/azure/spark-driver-template-az.yaml \ --conf spark.kubernetes.executor.podTemplateFile=/ppml/trusted-big-data-ml/azure/spark-executor-template-az.yaml \ --conf spark.kubernetes.executor.deleteOnTermination=false \ diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/build-docker-image.sh b/ppml/trusted-big-data-ml/python/docker-graphene/build-docker-image.sh index c789f5f7116..a549123dd8e 100755 --- a/ppml/trusted-big-data-ml/python/docker-graphene/build-docker-image.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/build-docker-image.sh @@ -16,14 +16,14 @@ Proxy_Modified="sudo docker build \ --build-arg JDK_URL=${JDK_URL} \ --build-arg SPARK_JAR_REPO_URL=${SPARK_JAR_REPO_URL} \ --build-arg no_proxy=x.x.x.x \ - -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0-SNAPSHOT -f ./Dockerfile ." + -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0 -f ./Dockerfile ." No_Proxy_Modified="sudo docker build \ --build-arg JDK_VERSION=8u192 \ --build-arg JDK_URL=${JDK_URL} \ --build-arg SPARK_JAR_REPO_URL=${SPARK_JAR_REPO_URL} \ --build-arg no_proxy=x.x.x.x \ - -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0-SNAPSHOT -f ./Dockerfile ." + -t intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0 -f ./Dockerfile ." if [[ "$JDK_URL" == "http://your-http-url-to-download-jdk" ]] || [[ "$SPARK_JAR_REPO_URL" == "http://your_spark_jar_repo_url" ]] then diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/deploy-local-spark-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/deploy-local-spark-sgx.sh index 1eb5cfd7174..a0b23ba38db 100755 --- a/ppml/trusted-big-data-ml/python/docker-graphene/deploy-local-spark-sgx.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/deploy-local-spark-sgx.sh @@ -4,7 +4,7 @@ export ENCLAVE_KEY_PATH=YOUR_LOCAL_ENCLAVE_KEY_PATH export DATA_PATH=YOUR_LOCAL_DATA_PATH export KEYS_PATH=YOUR_LOCAL_KEYS_PATH export LOCAL_IP=YOUR_LOCAL_IP -export DOCKER_IMAGE=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0-SNAPSHOT +export DOCKER_IMAGE=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0 sudo docker pull $DOCKER_IMAGE diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/kubernetes/bigdl-ppml-helm/Chart.yaml b/ppml/trusted-big-data-ml/python/docker-graphene/kubernetes/bigdl-ppml-helm/Chart.yaml index e95863d2e29..9de78c60760 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/kubernetes/bigdl-ppml-helm/Chart.yaml +++ b/ppml/trusted-big-data-ml/python/docker-graphene/kubernetes/bigdl-ppml-helm/Chart.yaml @@ -3,4 +3,4 @@ name: bigdl-ppml-helm-chart description: A Helm chart for submitting BigDL PPML Spark jobs to Kubernetes type: application version: 0.1.0 -appVersion: 2.1.0-SNAPSHOT +appVersion: 2.1.0 diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/standalone/environment.sh b/ppml/trusted-big-data-ml/python/docker-graphene/standalone/environment.sh index c80fdd01046..46478ee87fc 100755 --- a/ppml/trusted-big-data-ml/python/docker-graphene/standalone/environment.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/standalone/environment.sh @@ -2,7 +2,7 @@ export MASTER=YOUR_MASTER_IP export WORKERS=(YOUR_WORKER_IP_1 YOUR_WORKER_IP_2 YOUR_WORKER_IP_3) -export TRUSTED_BIGDATA_ML_IMAGE=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0-SNAPSHOT +export TRUSTED_BIGDATA_ML_IMAGE=intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.1.0 export SOURCE_ENCLAVE_KEY_PATH=YOUR_LOCAL_ENCLAVE_KEY_PATH export SOURCE_KEYS_PATH=YOUR_LOCAL_KEYS_PATH diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-bigdl-lennet-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-bigdl-lennet-sgx.sh index 3b607eaa219..a11e7a2554d 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-bigdl-lennet-sgx.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-bigdl-lennet-sgx.sh @@ -2,7 +2,7 @@ cd /ppml/trusted-big-data-ml SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ + '/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ -Xmx2g \ org.apache.spark.deploy.SparkSubmit \ --master 'local[4]' \ @@ -12,13 +12,13 @@ SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ --conf spark.rpc.message.maxSize=190 \ --conf spark.network.timeout=10000000 \ --conf spark.executor.heartbeatInterval=10000000 \ - --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/conf/spark-bigdl.conf \ - --py-files local://${BIGDL_HOME}/python/bigdl-orca-spark_${SPARK_VERSION}-${BIGDL_VERSION}-python-api.zip,local://${BIGDL_HOME}/python/bigdl-dllib-spark_${SPARK_VERSION}-${BIGDL_VERSION}-python-api.zip,/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/examples/dllib/lenet/lenet.py \ + --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0/conf/spark-bigdl.conf \ + --py-files local://${BIGDL_HOME}/python/bigdl-orca-spark_${SPARK_VERSION}-${BIGDL_VERSION}-python-api.zip,local://${BIGDL_HOME}/python/bigdl-dllib-spark_${SPARK_VERSION}-${BIGDL_VERSION}-python-api.zip,/ppml/trusted-big-data-ml/work/bigdl-2.1.0/examples/dllib/lenet/lenet.py \ --driver-cores 2 \ --total-executor-cores 2 \ --executor-cores 2 \ --executor-memory 8g \ - /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/examples/dllib/lenet/lenet.py \ + /ppml/trusted-big-data-ml/work/bigdl-2.1.0/examples/dllib/lenet/lenet.py \ --dataPath /ppml/trusted-big-data-ml/work/data/mnist \ --maxEpoch 2" 2>&1 | tee test-bigdl-lenet-sgx.log && \ cat test-bigdl-lenet-sgx.log | egrep -a "Accuracy" diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-data-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-data-sgx.sh index 253e1ad193a..c67332e7c1d 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-data-sgx.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-data-sgx.sh @@ -1,15 +1,15 @@ #!/bin/bash SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ + '/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ -Xmx2g \ org.apache.spark.deploy.SparkSubmit \ --master 'local[4]' \ --conf spark.driver.memory=2g \ - --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/python/bigdl-orca-spark_3.1.2-2.1.0-SNAPSHOT-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0/python/bigdl-orca-spark_3.1.2-2.1.0-python-api.zip \ --executor-memory 2g \ /ppml/trusted-big-data-ml/work/examples/pyzoo/orca/data/spark_pandas.py \ -f path_of_nyc_taxi_csv" | tee test-orca-data-sgx.log diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-tf-text.sh b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-tf-text.sh index dedbdab52d2..94311433b08 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-tf-text.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-orca-tf-text.sh @@ -1,15 +1,15 @@ #!/bin/bash SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ + '/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ -Xmx3g \ org.apache.spark.deploy.SparkSubmit \ --master 'local[4]' \ --conf spark.driver.memory=3g \ - --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/python/bigdl-orca-spark_3.1.2-2.1.0-SNAPSHOT-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0/python/bigdl-orca-spark_3.1.2-2.1.0-python-api.zip \ --executor-memory 3g \ --executor-cores 2 \ --driver-cores 2 \ diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-classifier-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-classifier-sgx.sh index 80ec6463dc5..926177f6a58 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-classifier-sgx.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-classifier-sgx.sh @@ -1,15 +1,15 @@ #!/bin/bash SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ + '/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ -Xmx2g \ org.apache.spark.deploy.SparkSubmit \ --master 'local[4]' \ --conf spark.driver.memory=2g \ - --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/python/bigdl-orca-spark_3.1.2-2.1.0-SNAPSHOT-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0/python/bigdl-orca-spark_3.1.2-2.1.0-python-api.zip \ --executor-memory 2g \ /ppml/trusted-big-data-ml/work/examples/pyzoo/xgboost/xgboost_classifier.py \ -f path_of_pima_indians_diabetes_data_csv" | tee test-xgboost-classifier-sgx.log diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-regressor-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-regressor-sgx.sh index 8951603740c..1e241b98d18 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-regressor-sgx.sh +++ b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-regressor-sgx.sh @@ -1,15 +1,15 @@ #!/bin/bash SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ + '/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/*:/ppml/trusted-big-data-ml/work/spark-3.1.2/conf/:/ppml/trusted-big-data-ml/work/spark-3.1.2/jars/*' \ -Xmx2g \ org.apache.spark.deploy.SparkSubmit \ --master 'local[4]' \ --conf spark.driver.memory=2g \ - --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/jars/* \ - --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0-SNAPSHOT/python/bigdl-orca-spark_3.1.2-2.1.0-SNAPSHOT-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --properties-file /ppml/trusted-big-data-ml/work/bigdl-2.1.0/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/bigdl-2.1.0/jars/* \ + --py-files /ppml/trusted-big-data-ml/work/bigdl-2.1.0/python/bigdl-orca-spark_3.1.2-2.1.0-python-api.zip \ --executor-memory 2g \ /ppml/trusted-big-data-ml/work/examples/pyzoo/xgboost/xgboost_example.py \ --file-path /ppml/trusted-big-data-ml/work/data/Boston_Housing.csv" | tee test-zoo-xgboost-regressor-sgx.log diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile b/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile index 620bc923a8b..ceb7bbe7c32 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile @@ -160,7 +160,7 @@ RUN cd /opt && \ FROM occlum/occlum:0.28.1-ubuntu20.04 as ppml -ARG BIGDL_VERSION=2.1.0-SNAPSHOT +ARG BIGDL_VERSION=2.1.0 ARG SPARK_VERSION ARG HADOOP_VERSION ENV HADOOP_VERSION=${HADOOP_VERSION} diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/build-docker-image.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/build-docker-image.sh index a21a84cd452..0bb203892af 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/build-docker-image.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/build-docker-image.sh @@ -12,4 +12,4 @@ sudo docker build \ --build-arg HTTPS_PROXY_PORT=$HTTPS_PROXY_PORT \ --build-arg no_proxy=x.x.x.x \ --build-arg SPARK_JAR_REPO_URL=$SPARK_JAR_REPO_URL \ - -t intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT -f ./Dockerfile . + -t intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 -f ./Dockerfile . diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt.sh index 1708cec950e..b1417b59261 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt.sh @@ -7,7 +7,7 @@ ${SPARK_HOME}/bin/spark-submit \ --class org.apache.spark.examples.ml.GBTExample \ --conf spark.executor.instances=1 \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.podNamePrefix="sparkgbt" \ --conf spark.kubernetes.executor.deleteOnTermination=false \ diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt_criteo.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt_criteo.sh index 5a8c011dc62..efd579b1b78 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt_criteo.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_gbt_criteo.sh @@ -6,7 +6,7 @@ ${SPARK_HOME}/bin/spark-submit \ --name spark-gbt \ --class com.intel.analytics.bigdl.dllib.example.nnframes.gbt.gbtClassifierTrainingExampleOnCriteoClickLogsDataset \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.deleteOnTermination=false \ --conf spark.kubernetes.driver.podTemplateFile=./driver.yaml \ diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_lr.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_lr.sh index 5cc584ecfcb..dadef97903a 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_lr.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_lr.sh @@ -7,7 +7,7 @@ ${SPARK_HOME}/bin/spark-submit \ --class org.apache.spark.examples.ml.LogisticRegressionExample \ --conf spark.executor.instances=1 \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.podNamePrefix="sparklr" \ --conf spark.kubernetes.executor.deleteOnTermination=false \ diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_pi.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_pi.sh index d4e143e9c54..dae130d56db 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_pi.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_pi.sh @@ -7,7 +7,7 @@ ${SPARK_HOME}/bin/spark-submit \ --class org.apache.spark.examples.SparkPi \ --conf spark.executor.instances=1 \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.deleteOnTermination=false \ --conf spark.kubernetes.driver.podTemplateFile=./driver.yaml \ diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_sql.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_sql.sh index 4e9400278e2..b24d11889a9 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_sql.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_sql.sh @@ -7,7 +7,7 @@ ${SPARK_HOME}/bin/spark-submit \ --class org.apache.spark.examples.sql.SparkSQLExample \ --conf spark.executor.instances=1 \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.podNamePrefix="sparksql" \ --conf spark.kubernetes.executor.deleteOnTermination=false \ diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_tpch.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_tpch.sh index 88df7517be8..fc90ee596cb 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_tpch.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_tpch.sh @@ -6,7 +6,7 @@ ${SPARK_HOME}/bin/spark-submit \ --name spark-tpch \ --class main.scala.TpchQuery \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.container.image.pullPolicy="IfNotPresent" \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.deleteOnTermination=false \ diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_xgboost.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_xgboost.sh index a61d3aa1090..ea9ca3a31d9 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_xgboost.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/kubernetes/run_spark_xgboost.sh @@ -7,7 +7,7 @@ ${SPARK_HOME}/bin/spark-submit \ --class com.intel.analytics.bigdl.dllib.example.nnframes.xgboost.xgbClassifierTrainingExample \ --conf spark.executor.instances=1 \ --conf spark.rpc.netty.dispatcher.numThreads=32 \ - --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + --conf spark.kubernetes.container.image=intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ --conf spark.kubernetes.authenticate.driver.serviceAccountName=spark \ --conf spark.kubernetes.executor.deleteOnTermination=false \ --conf spark.kubernetes.driver.podTemplateFile=./driver.yaml \ @@ -20,5 +20,5 @@ ${SPARK_HOME}/bin/spark-submit \ --driver-memory 2g \ --conf spark.kubernetes.driverEnv.SGX_DRIVER_JVM_MEM_SIZE="2G" \ --conf spark.executorEnv.SGX_EXECUTOR_JVM_MEM_SIZE="3G" \ - local:/bin/jars/bigdl-dllib-spark_3.1.2-2.1.0-SNAPSHOT.jar \ + local:/bin/jars/bigdl-dllib-spark_3.1.2-2.1.0.jar \ /host/data/xgboost_data 2 100 /host/data/xgboost_model_to_be_saved diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/run_spark_on_occlum_glibc.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/run_spark_on_occlum_glibc.sh index 560e5b098fb..6341fde8308 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/run_spark_on_occlum_glibc.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/run_spark_on_occlum_glibc.sh @@ -354,7 +354,7 @@ run_spark_xgboost() { --executor-cores 2 \ --executor-memory 9G \ --driver-memory 10G \ - /bin/jars/bigdl-dllib-spark_3.1.2-2.1.0-SNAPSHOT.jar \ + /bin/jars/bigdl-dllib-spark_3.1.2-2.1.0.jar \ -i /host/data -s /host/data/model -t 2 -r 100 -d 2 -w 1 } @@ -376,7 +376,7 @@ run_spark_gbt() { --executor-cores 2 \ --executor-memory 9G \ --driver-memory 10G \ - /bin/jars/bigdl-dllib-spark_3.1.2-2.1.0-SNAPSHOT.jar \ + /bin/jars/bigdl-dllib-spark_3.1.2-2.1.0.jar \ -i /host/data -s /host/data/model -I 100 -d 5 } diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/start-occlum-attestation-server.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/start-occlum-attestation-server.sh index bb2499609c8..ae749559e01 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/start-occlum-attestation-server.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/start-occlum-attestation-server.sh @@ -14,5 +14,5 @@ sudo docker run -it \ -e PCCS_URL=$PCCS_URL \ -e ATTESTATION_SERVER_IP=$ATTESTATION_SERVER_IP \ -e ATTESTATION_SERVER_PORT=$ATTESTATION_SERVER_PORT \ - intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ bash -c "cd /root/demos/remote_attestation/init_ra_flow/ && ./run_attestation_server.sh" diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/start-spark-local.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/start-spark-local.sh index f62cb6722ed..a2f38d8889a 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/start-spark-local.sh +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/start-spark-local.sh @@ -20,5 +20,5 @@ sudo docker run -it \ -e ATTESTATION_SERVER_IP=$ATTESTATION_SERVER_IP \ -e ATTESTATION_SERVER_PORT=$ATTESTATION_SERVER_PORT \ -e SGX_LOG_LEVEL=off \ - intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0-SNAPSHOT \ + intelanalytics/bigdl-ppml-trusted-big-data-ml-scala-occlum:2.1.0 \ bash /opt/run_spark_on_occlum_glibc.sh $1 diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile index a82c45acb85..0b4dfcbd782 100755 --- a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile +++ b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.1.0-SNAPSHOT +ARG BIGDL_VERSION=2.1.0 ARG SPARK_VERSION=3.1.2 # stage.1 graphene diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/build-docker-image.sh b/ppml/trusted-realtime-ml/scala/docker-graphene/build-docker-image.sh index 66150d04783..baa15f3acf0 100755 --- a/ppml/trusted-realtime-ml/scala/docker-graphene/build-docker-image.sh +++ b/ppml/trusted-realtime-ml/scala/docker-graphene/build-docker-image.sh @@ -14,4 +14,4 @@ sudo docker build \ --build-arg JDK_VERSION=8u192 \ --build-arg JDK_URL=$JDK_URL \ --build-arg no_proxy=x.x.x.x \ - -t intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-graphene:2.1.0-SNAPSHOT -f ./Dockerfile . + -t intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-graphene:2.1.0 -f ./Dockerfile . diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/environment.sh b/ppml/trusted-realtime-ml/scala/docker-graphene/environment.sh index 2e7931110dc..b35399ef820 100755 --- a/ppml/trusted-realtime-ml/scala/docker-graphene/environment.sh +++ b/ppml/trusted-realtime-ml/scala/docker-graphene/environment.sh @@ -3,7 +3,7 @@ export MASTER=YOUR_MASTER_IP export WORKERS=(YOUR_WORKER_IP_1 YOUR_WORKER_IP_2 YOUR_WORKER_IP_3) -export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-graphene:2.1.0-SNAPSHOT +export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-graphene:2.1.0 export SOURCE_ENCLAVE_KEY_PATH=YOUR_LOCAL_ENCLAVE_KEY_PATH export SOURCE_KEYS_PATH=YOUR_LOCAL_KEYS_PATH diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/start-local-cluster-serving.sh b/ppml/trusted-realtime-ml/scala/docker-graphene/start-local-cluster-serving.sh index 89456953b3d..a5af21db727 100755 --- a/ppml/trusted-realtime-ml/scala/docker-graphene/start-local-cluster-serving.sh +++ b/ppml/trusted-realtime-ml/scala/docker-graphene/start-local-cluster-serving.sh @@ -21,7 +21,7 @@ sudo docker run -itd \ --name=trusted-cluster-serving-local \ -e LOCAL_IP=$LOCAL_IP \ -e CORE_NUM=30 \ - intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-graphene:2.1.0-SNAPSHOT \ + intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-graphene:2.1.0 \ bash -c "cd /ppml/trusted-realtime-ml/ && ./start-all.sh && tail -f /dev/null" sudo docker exec -i trusted-cluster-serving-local bash -c "mkdir /dev/sgx && \ diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile index b733c99dff5..923d2ca5caa 100755 --- a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile +++ b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.1.0-SNAPSHOT +ARG BIGDL_VERSION=2.1.0 ARG SPARK_VERSION=3.1.2 ARG FLINK_VERSION=1.11.3 ARG SCALA_VERSION=2.12 diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/build-docker-image.sh b/ppml/trusted-realtime-ml/scala/docker-occlum/build-docker-image.sh index 0a3b4d7b401..e1777c1f6c4 100755 --- a/ppml/trusted-realtime-ml/scala/docker-occlum/build-docker-image.sh +++ b/ppml/trusted-realtime-ml/scala/docker-occlum/build-docker-image.sh @@ -11,4 +11,4 @@ sudo docker build \ --build-arg HTTP_PROXY_PORT=$HTTP_PROXY_PORT \ --build-arg HTTPS_PROXY_HOST=$HTTPS_PROXY_HOST \ --build-arg HTTPS_PROXY_PORT=$HTTPS_PROXY_PORT \ - -t intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-occlum:2.1.0-SNAPSHOT -f ./Dockerfile . + -t intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-occlum:2.1.0 -f ./Dockerfile . diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/environment.sh b/ppml/trusted-realtime-ml/scala/docker-occlum/environment.sh index e1ab92b175f..1a4405094c0 100755 --- a/ppml/trusted-realtime-ml/scala/docker-occlum/environment.sh +++ b/ppml/trusted-realtime-ml/scala/docker-occlum/environment.sh @@ -3,7 +3,7 @@ export MASTER=YOUR_MASTER_IP export WORKERS=(YOUR_WORKER_IP_1 YOUR_WORKER_IP_2 YOUR_WORKER_IP_3) -export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-occlum:2.1.0-SNAPSHOT +export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-occlum:2.1.0 export SOURCE_KEYS_PATH=YOUR_LOCAL_KEYS_PATH export SOURCE_SECURE_PASSWORD_PATH=YOUR_LOCAL_SECURE_PASSWORD_PATH diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/start-local-cluster-serving.sh b/ppml/trusted-realtime-ml/scala/docker-occlum/start-local-cluster-serving.sh index 05c3d80c1b4..e3434f340a5 100755 --- a/ppml/trusted-realtime-ml/scala/docker-occlum/start-local-cluster-serving.sh +++ b/ppml/trusted-realtime-ml/scala/docker-occlum/start-local-cluster-serving.sh @@ -19,5 +19,5 @@ sudo docker run -itd \ -e SGX_HEAP=128MB \ -e SGX_KERNEL_HEAP=512MB \ -e SGX_MMAP=26000MB \ - intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-occlum:2.1.0-SNAPSHOT \ + intelanalytics/bigdl-ppml-trusted-realtime-ml-scala-occlum:2.1.0 \ bash -c "export PATH=/opt/occlum/build/bin:$PATH && cd /opt/ && ./start-all.sh && tail -f /dev/null"