From 45a2fe1b62f45cddf741540227ad9c3cf6e5018d Mon Sep 17 00:00:00 2001 From: Le-Zheng <30695225+Le-Zheng@users.noreply.github.com> Date: Wed, 22 Dec 2021 15:17:42 +0800 Subject: [PATCH] docker 0.11.1 (#5090) --- .../ClusterServingSparkVersionDockerfile | 2 +- docker/cluster-serving/Dockerfile | 2 +- .../download-cluster-serving-all-zip.sh | 2 +- docker/hyperzoo/Dockerfile | 2 +- .../download-cluster-serving-all-zip.sh | 2 +- docker/zoo/Dockerfile | 2 +- .../python/docker-graphene/Dockerfile | 6 ++-- .../python/docker-graphene/README.md | 36 +++++++++---------- .../docker-graphene/build-docker-image.sh | 2 +- .../start-spark-local-orca-data-sgx.sh | 12 +++---- ...tart-spark-local-xgboost-classifier-sgx.sh | 12 +++---- ...start-spark-local-xgboost-regressor-sgx.sh | 12 +++---- .../scala/docker-graphene/Dockerfile | 4 +-- .../docker-graphene/build-docker-image.sh | 2 +- .../docker-graphene/deploy-local-spark-sgx.sh | 4 +-- .../scala/docker-graphene/environment.sh | 2 +- .../scala/docker-occlum/build-docker-image.sh | 2 +- .../scala/docker-graphene/Dockerfile | 4 +-- .../docker-graphene/build-docker-image.sh | 2 +- .../start-local-cluster-serving.sh | 2 +- .../scala/docker-occlum/Dockerfile | 4 +-- .../scala/docker-occlum/build-docker-image.sh | 2 +- .../scala/docker-occlum/environment.sh | 2 +- .../start-local-cluster-serving.sh | 2 +- 24 files changed, 62 insertions(+), 62 deletions(-) diff --git a/docker/cluster-serving/ClusterServingSparkVersionDockerfile b/docker/cluster-serving/ClusterServingSparkVersionDockerfile index 5426d2699f..ebc93678f3 100644 --- a/docker/cluster-serving/ClusterServingSparkVersionDockerfile +++ b/docker/cluster-serving/ClusterServingSparkVersionDockerfile @@ -6,7 +6,7 @@ WORKDIR /opt/work ARG SPARK_VERSION=2.4.6 ARG BIGDL_VERSION=0.13.0 -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ENV SPARK_HOME /opt/work/spark-${SPARK_VERSION} ENV JAVA_HOME /opt/jdk diff --git a/docker/cluster-serving/Dockerfile b/docker/cluster-serving/Dockerfile index 5c0d62f7a3..ae5b2c7154 100644 --- a/docker/cluster-serving/Dockerfile +++ b/docker/cluster-serving/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /opt/work ARG SPARK_VERSION=2.4.6 ARG BIGDL_VERSION=0.13.0 -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG FLINK_VERSION=1.11.2 ARG JDK_VERSION=8u192 ARG JDK_URL=your_jdk_url diff --git a/docker/cluster-serving/download-cluster-serving-all-zip.sh b/docker/cluster-serving/download-cluster-serving-all-zip.sh index 14f04fb03b..e064787bba 100644 --- a/docker/cluster-serving/download-cluster-serving-all-zip.sh +++ b/docker/cluster-serving/download-cluster-serving-all-zip.sh @@ -16,7 +16,7 @@ # limitations under the License. # if [ -z "${ANALYTICS_ZOO_VERSION}" ]; then - export ANALYTICS_ZOO_VERSION=0.11.0 + export ANALYTICS_ZOO_VERSION=0.11.1 export BIGDL_VERSION=0.13.0 export SPARK_VERSION=2.4.6 echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION diff --git a/docker/hyperzoo/Dockerfile b/docker/hyperzoo/Dockerfile index d1caab5573..f3bec4f53c 100644 --- a/docker/hyperzoo/Dockerfile +++ b/docker/hyperzoo/Dockerfile @@ -3,7 +3,7 @@ ARG SPARK_HOME=/opt/spark ARG JDK_VERSION=8u192 ARG JDK_URL=your_jdk_url ARG BIGDL_VERSION=0.13.0 -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG TINI_VERSION=v0.18.0 # stage.1 jdk & spark diff --git a/docker/hyperzoo/download-cluster-serving-all-zip.sh b/docker/hyperzoo/download-cluster-serving-all-zip.sh index 14f04fb03b..e064787bba 100644 --- a/docker/hyperzoo/download-cluster-serving-all-zip.sh +++ b/docker/hyperzoo/download-cluster-serving-all-zip.sh @@ -16,7 +16,7 @@ # limitations under the License. # if [ -z "${ANALYTICS_ZOO_VERSION}" ]; then - export ANALYTICS_ZOO_VERSION=0.11.0 + export ANALYTICS_ZOO_VERSION=0.11.1 export BIGDL_VERSION=0.13.0 export SPARK_VERSION=2.4.6 echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION diff --git a/docker/zoo/Dockerfile b/docker/zoo/Dockerfile index cee39ede8a..bd4e760ef1 100644 --- a/docker/zoo/Dockerfile +++ b/docker/zoo/Dockerfile @@ -20,7 +20,7 @@ MAINTAINER The Analytics-Zoo Authors https://github.com/intel-analytics/analytic WORKDIR /opt/work -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ARG RUNTIME_SPARK_MASTER=local[4] diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile index 5f25ad5e52..8bf8902de5 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile +++ b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile @@ -76,7 +76,7 @@ RUN git clone https://github.com/intel-analytics/BigDL.git && \ # stage.4 analytics-zoo FROM ubuntu:18.04 as analytics-zoo -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ENV ANALYTICS_ZOO_VERSION ${ANALYTICS_ZOO_VERSION} @@ -92,7 +92,7 @@ RUN ./download-analytics-zoo.sh && \ # stage.5 az ppml FROM ubuntu:18.04 -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG SPARK_VERSION=2.4.6 ENV ANALYTICS_ZOO_VERSION ${ANALYTICS_ZOO_VERSION} ENV SPARK_VERSION ${SPARK_VERSION} @@ -178,7 +178,7 @@ ADD ./check-status.sh /ppml/trusted-big-data-ml/check-status.sh ADD tracker.py ./tracker.py ADD ./start-scripts /ppml/trusted-big-data-ml/work/start-scripts -RUN jar -uf /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar ./tracker.py && \ +RUN jar -uf /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar ./tracker.py && \ chmod a+x /ppml/trusted-big-data-ml/init.sh && \ chmod a+x /ppml/trusted-big-data-ml/clean.sh && \ chmod a+x /ppml/trusted-big-data-ml/start-spark-local-train-sgx.sh && \ diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/README.md b/ppml/trusted-big-data-ml/python/docker-graphene/README.md index 2301a2fa88..649c8d2989 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/README.md +++ b/ppml/trusted-big-data-ml/python/docker-graphene/README.md @@ -257,16 +257,16 @@ Before running the example, make sure that `Boston_Housing.csv` is under `work/d ```bash SGX=1 ./pal_loader bash -c "export RABIT_TRACKER_IP=your_IP_address && /opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/jars/*' \ + '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-python-api.zip \ --executor-memory 2g \ /ppml/trusted-big-data-ml/work/examples/pyzoo/xgboost/xgboost_example.py \ --file-path path_of_boston_housing_csv" | tee test-zoo-xgboost-regressor-sgx.log @@ -334,16 +334,16 @@ After downloading the dataset, make sure that `pima-indians-diabetes.data.csv` i ```bash SGX=1 ./pal_loader bash -c "export RABIT_TRACKER_IP=your_IP_address && /opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/jars/*' \ + '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-python-api.zip \ --executor-memory 2g \ /ppml/trusted-big-data-ml/work/examples/pyzoo/xgboost/xgboost_classifier.py \ -f path_of_pima_indians_diabetes_csv" | tee test-xgboost-classifier-sgx.log @@ -387,16 +387,16 @@ After downloading the dataset, make sure that `nyc_taxi.csv` is under `work/data ```bash SGX=1 ./pal_loader bash -c "/opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/jars/*' \ + '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-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/build-docker-image.sh b/ppml/trusted-big-data-ml/python/docker-graphene/build-docker-image.sh index cdee0815ab..11fe76c863 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 @@ -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/analytics-zoo-ppml-trusted-big-data-ml-python-graphene:0.11.0 -f ./Dockerfile . + -t intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-python-graphene:0.11.1 -f ./Dockerfile . 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 0af4e84372..f7edfe8ff9 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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/jars/*' \ + '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-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-xgboost-classifier-sgx.sh b/ppml/trusted-big-data-ml/python/docker-graphene/start-scripts/start-spark-local-xgboost-classifier-sgx.sh index 7cd369b835..1c855067df 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 "export RABIT_TRACKER_IP=your_IP_address && /opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/jars/*' \ + '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-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 518ea5102e..7d60e55195 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 "export RABIT_TRACKER_IP=your_IP_address && /opt/jdk8/bin/java -cp \ - '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/jars/*' \ + '/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar:/ppml/trusted-big-data-ml/work/spark-2.4.6/conf/:/ppml/trusted-big-data-ml/work/spark-2.4.6/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/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/conf/spark-analytics-zoo.conf \ - --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-jar-with-dependencies.jar \ - --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.0/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.0-python-api.zip \ + --conf spark.executor.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --conf spark.driver.extraClassPath=/ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --properties-file /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/conf/spark-analytics-zoo.conf \ + --jars /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-jar-with-dependencies.jar \ + --py-files /ppml/trusted-big-data-ml/work/analytics-zoo-0.11.1/lib/analytics-zoo-bigdl_0.13.0-spark_2.4.6-0.11.1-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-graphene/Dockerfile b/ppml/trusted-big-data-ml/scala/docker-graphene/Dockerfile index a445931cf0..3df6a8fad7 100755 --- a/ppml/trusted-big-data-ml/scala/docker-graphene/Dockerfile +++ b/ppml/trusted-big-data-ml/scala/docker-graphene/Dockerfile @@ -69,7 +69,7 @@ RUN git clone https://github.com/intel-analytics/BigDL.git && \ # stage.4 analytics-zoo FROM ubuntu:18.04 as analytics-zoo -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ENV ANALYTICS_ZOO_VERSION ${ANALYTICS_ZOO_VERSION} @@ -84,7 +84,7 @@ RUN ./download-analytics-zoo.sh # stage.5 az ppml FROM ubuntu:18.04 -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG SPARK_VERSION=2.4.6 ENV ANALYTICS_ZOO_VERSION ${ANALYTICS_ZOO_VERSION} ENV SPARK_VERSION ${SPARK_VERSION} diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/build-docker-image.sh b/ppml/trusted-big-data-ml/scala/docker-graphene/build-docker-image.sh index dd0c5c3b1b..cb3a59c504 100755 --- a/ppml/trusted-big-data-ml/scala/docker-graphene/build-docker-image.sh +++ b/ppml/trusted-big-data-ml/scala/docker-graphene/build-docker-image.sh @@ -13,4 +13,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/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.0 -f ./Dockerfile . + -t intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.1 -f ./Dockerfile . diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/deploy-local-spark-sgx.sh b/ppml/trusted-big-data-ml/scala/docker-graphene/deploy-local-spark-sgx.sh index 2f6bbca46d..42c5f68def 100755 --- a/ppml/trusted-big-data-ml/scala/docker-graphene/deploy-local-spark-sgx.sh +++ b/ppml/trusted-big-data-ml/scala/docker-graphene/deploy-local-spark-sgx.sh @@ -5,7 +5,7 @@ export DATA_PATH=the_dir_path_of_your_prepared_data export KEYS_PATH=the_dir_path_of_your_prepared_keys export LOCAL_IP=your_local_ip_of_the_sgx_server -sudo docker pull intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.0 +sudo docker pull intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.1 sudo docker run -itd \ --privileged \ @@ -22,4 +22,4 @@ sudo docker run -itd \ --name=spark-local \ -e LOCAL_IP=$LOCAL_IP \ -e SGX_MEM_SIZE=64G \ - intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.0 + intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.1 diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/environment.sh b/ppml/trusted-big-data-ml/scala/docker-graphene/environment.sh index 9d86fcaa7f..b0cf8462b3 100755 --- a/ppml/trusted-big-data-ml/scala/docker-graphene/environment.sh +++ b/ppml/trusted-big-data-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_BIGDATA_ML_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.0 +export TRUSTED_BIGDATA_ML_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.11.1 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/scala/docker-occlum/build-docker-image.sh b/ppml/trusted-big-data-ml/scala/docker-occlum/build-docker-image.sh index 84b50b8377..cf100aee7f 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 @@ -10,4 +10,4 @@ sudo docker build \ --build-arg HTTPS_PROXY_HOST=$HTTPS_PROXY_HOST \ --build-arg HTTPS_PROXY_PORT=$HTTPS_PROXY_PORT \ --build-arg no_proxy=x.x.x.x \ - -t intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-occlum:0.11.0 -f ./Dockerfile . + -t intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-occlum:0.11.1 -f ./Dockerfile . diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile index ce8bb4c1c5..a403e91c48 100755 --- a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile +++ b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile @@ -46,7 +46,7 @@ ARG HTTP_PROXY_HOST ARG HTTP_PROXY_PORT ARG HTTPS_PROXY_HOST ARG HTTPS_PROXY_PORT -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ARG SPARK_MAJOR_VERSION=2.4 @@ -77,7 +77,7 @@ RUN cd /opt && \ # stage.4 az ppml FROM ubuntu:18.04 -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ARG FLINK_VERSION=1.10.1 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 cfec6c9d9a..b495f26c91 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/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.11.0 -f ./Dockerfile . + -t intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.11.1 -f ./Dockerfile . 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 f6b8c88716..fb67a30ea0 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,5 +21,5 @@ sudo docker run -itd \ --name=trusted-cluster-serving-local \ -e LOCAL_IP=$LOCAL_IP \ -e CORE_NUM=30 \ - intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.11.0 \ + intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.11.1 \ bash -c "cd /ppml/trusted-realtime-ml/ && ./start-all.sh && tail -f /dev/null" diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile index 36737448f6..2fff08961a 100755 --- a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile +++ b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile @@ -25,7 +25,7 @@ RUN git clone https://github.com/redis/redis.git && \ # stage. 2 Flink & analytics-zoo FROM ubuntu:18.04 as analytics-zoo -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ARG SPARK_MAJOR_VERSION=2.4 @@ -71,7 +71,7 @@ RUN cd /opt && \ # stage.3 az ppml occlum FROM ubuntu:18.04 as ppml -ARG ANALYTICS_ZOO_VERSION=0.11.0 +ARG ANALYTICS_ZOO_VERSION=0.11.1 ARG BIGDL_VERSION=0.13.0 ARG SPARK_VERSION=2.4.6 ARG FLINK_VERSION=1.10.1 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 c344a8b1e3..32507ab4c3 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/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.11.0 -f ./Dockerfile . + -t intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.11.1 -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 d49c3f2c49..1c92428fbf 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/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.11.0 +export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.11.1 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 ca27583dcf..1f15c801c0 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 @@ -15,5 +15,5 @@ sudo docker run -itd \ --name=trusted-cluster-serving-local \ -e LOCAL_IP=$LOCAL_IP \ -e CORE_NUM=30 \ - intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.11.0 \ + intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.11.1 \ bash -c "cd /opt/ && ./start-all.sh && tail -f /dev/null"