From 6558f2759703e36af90ed538a4c4ee7a80441e06 Mon Sep 17 00:00:00 2001 From: Kai Huang Date: Fri, 11 Dec 2020 14:52:06 +0800 Subject: [PATCH] Bump to 0.9 (#3226) * update scala * update python and doc * minor --- .../model-inference-flink/pom.xml | 2 +- .../recommendation-inference/pom.xml | 2 +- .../text-classification-training/pom.xml | 2 +- .../cluster-serving/ClusterServingSparkVersionDockerfile | 2 +- docker/cluster-serving/Dockerfile | 2 +- .../cluster-serving/download-cluster-serving-all-zip.sh | 2 +- docker/hyperzoo/Dockerfile | 2 +- docker/hyperzoo/download-cluster-serving-all-zip.sh | 2 +- docker/zoo/Dockerfile | 2 +- docs/docs/ClusterServingGuide/ProgrammingGuide.md | 4 ++-- docs/docs/PythonUserGuide/install.md | 2 +- docs/docs/ScalaUserGuide/install.md | 9 ++++----- pom.xml | 2 +- pyzoo/zoo/__init__.py | 2 +- scripts/cluster-serving/download-serving-jar.sh | 2 +- zoo/pom.xml | 2 +- 16 files changed, 20 insertions(+), 21 deletions(-) diff --git a/apps/model-inference-examples/model-inference-flink/pom.xml b/apps/model-inference-examples/model-inference-flink/pom.xml index 7460b46210..b38e040816 100644 --- a/apps/model-inference-examples/model-inference-flink/pom.xml +++ b/apps/model-inference-examples/model-inference-flink/pom.xml @@ -43,7 +43,7 @@ com.intel.analytics.zoo analytics-zoo-bigdl_0.12.1-spark_2.4.3 - 0.9.0-SNAPSHOT + 0.9.0 com.intel.analytics.zoo diff --git a/apps/model-inference-examples/recommendation-inference/pom.xml b/apps/model-inference-examples/recommendation-inference/pom.xml index d8f83fe056..cac26a0668 100644 --- a/apps/model-inference-examples/recommendation-inference/pom.xml +++ b/apps/model-inference-examples/recommendation-inference/pom.xml @@ -12,7 +12,7 @@ 2.4.3 0.12.1 - 0.9.0-SNAPSHOT + 0.9.0 diff --git a/apps/model-inference-examples/text-classification-training/pom.xml b/apps/model-inference-examples/text-classification-training/pom.xml index ed3c534285..e6f9bbaa86 100644 --- a/apps/model-inference-examples/text-classification-training/pom.xml +++ b/apps/model-inference-examples/text-classification-training/pom.xml @@ -38,7 +38,7 @@ com.intel.analytics.zoo analytics-zoo-bigdl_0.12.1-spark_2.4.3 - 0.9.0-SNAPSHOT + 0.9.0 org.scala-lang diff --git a/docker/cluster-serving/ClusterServingSparkVersionDockerfile b/docker/cluster-serving/ClusterServingSparkVersionDockerfile index dd29fcd01d..4ebe83e92e 100644 --- a/docker/cluster-serving/ClusterServingSparkVersionDockerfile +++ b/docker/cluster-serving/ClusterServingSparkVersionDockerfile @@ -6,7 +6,7 @@ WORKDIR /opt/work ARG SPARK_VERSION=2.4.3 ARG BIGDL_VERSION=0.12.1 -ARG ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT +ARG ANALYTICS_ZOO_VERSION=0.9.0 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 4b33067881..7c00efd898 100644 --- a/docker/cluster-serving/Dockerfile +++ b/docker/cluster-serving/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /opt/work ARG SPARK_VERSION=2.4.3 ARG BIGDL_VERSION=0.12.1 -ARG ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT +ARG ANALYTICS_ZOO_VERSION=0.9.0 ARG FLINK_VERSION=1.10.0 ENV FLINK_HOME /opt/work/flink-${FLINK_VERSION} diff --git a/docker/cluster-serving/download-cluster-serving-all-zip.sh b/docker/cluster-serving/download-cluster-serving-all-zip.sh index c818567969..945242387d 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.9.0-SNAPSHOT + export ANALYTICS_ZOO_VERSION=0.9.0 export BIGDL_VERSION=0.12.1 export SPARK_VERSION=2.4.3 echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION diff --git a/docker/hyperzoo/Dockerfile b/docker/hyperzoo/Dockerfile index e111c096d5..2876006560 100644 --- a/docker/hyperzoo/Dockerfile +++ b/docker/hyperzoo/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 MAINTAINER The Analytics-Zoo Authors https://github.com/intel-analytics/analytics-zoo -ARG ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT +ARG ANALYTICS_ZOO_VERSION=0.9.0 ARG BIGDL_VERSION=0.12.1 ARG SPARK_VERSION=2.4.3 ARG FLINK_VERSION=1.10.0 diff --git a/docker/hyperzoo/download-cluster-serving-all-zip.sh b/docker/hyperzoo/download-cluster-serving-all-zip.sh index 447576de8f..99c2b054ff 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.9.0-SNAPSHOT + export ANALYTICS_ZOO_VERSION=0.9.0 export BIGDL_VERSION=0.10.0 export SPARK_VERSION=2.4.3 echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION diff --git a/docker/zoo/Dockerfile b/docker/zoo/Dockerfile index ba12f594b4..25bcc83e66 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.9.0-SNAPSHOT +ARG ANALYTICS_ZOO_VERSION=0.9.0 ARG BIGDL_VERSION=0.12.1 ARG SPARK_VERSION=2.4.3 ARG RUNTIME_SPARK_MASTER=local[4] diff --git a/docs/docs/ClusterServingGuide/ProgrammingGuide.md b/docs/docs/ClusterServingGuide/ProgrammingGuide.md index 3ab218e902..5eb77886a1 100644 --- a/docs/docs/ClusterServingGuide/ProgrammingGuide.md +++ b/docs/docs/ClusterServingGuide/ProgrammingGuide.md @@ -129,8 +129,8 @@ After preparing dependencies above, make sure the environment variable `$FLINK_H ##### Install Cluster Serving by download release -For users who need to deploy and start Cluster Serving, download Cluster Serving zip `analytics-zoo-xxx-cluster-serving-all.zip` from [here](https://oss.sonatype.org/content/repositories/snapshots/com/intel/analytics/zoo/analytics-zoo-bigdl_0.10.0-spark_2.4.3/0.9.0-SNAPSHOT/) and unzip it, then run `source cluster-serving-setup.sh`. -For users who need to do inference, aka. predict data only, download Analytics Zoo python zip `analytics-zoo-xxx-cluster-serving-python.zip` from [here](https://oss.sonatype.org/content/repositories/snapshots/com/intel/analytics/zoo/analytics-zoo-bigdl_0.10.0-spark_2.4.3/0.9.0-SNAPSHOT/) and run `export PYTHONPATH=$PYTHONPATH:/path/to/zip` to add this zip to `PYTHONPATH` environment variable. +For users who need to deploy and start Cluster Serving, download Cluster Serving zip `analytics-zoo-xxx-cluster-serving-all.zip` from [here](https://oss.sonatype.org/content/repositories/snapshots/com/intel/analytics/zoo/analytics-zoo-bigdl_0.10.0-spark_2.4.3/0.9.0/) and unzip it, then run `source cluster-serving-setup.sh`. +For users who need to do inference, aka. predict data only, download Analytics Zoo python zip `analytics-zoo-xxx-cluster-serving-python.zip` from [here](https://oss.sonatype.org/content/repositories/snapshots/com/intel/analytics/zoo/analytics-zoo-bigdl_0.10.0-spark_2.4.3/0.9.0/) and run `export PYTHONPATH=$PYTHONPATH:/path/to/zip` to add this zip to `PYTHONPATH` environment variable. ##### Install Cluster Serving by pip Download package from [here](https://sourceforge.net/projects/analytics-zoo/files/cluster-serving-py/), run following command to install Cluster Serving diff --git a/docs/docs/PythonUserGuide/install.md b/docs/docs/PythonUserGuide/install.md index e9e39b9b82..6ac34ac0a8 100644 --- a/docs/docs/PythonUserGuide/install.md +++ b/docs/docs/PythonUserGuide/install.md @@ -21,7 +21,7 @@ See [here](#install-from-pip-for-local-usage) for some remarks with regard to pi You can use the following command to install the latest release version of __analytics-zoo__ via pip easily: ```bash -pip install analytics-zoo +pip install analytics-zoo==0.9.0 ``` * You are strongly recommended to use Python 3.6 or 3.7. You might need to run `pip3 install analytics-zoo` instead. diff --git a/docs/docs/ScalaUserGuide/install.md b/docs/docs/ScalaUserGuide/install.md index e4cc7c7c93..baf660e065 100644 --- a/docs/docs/ScalaUserGuide/install.md +++ b/docs/docs/ScalaUserGuide/install.md @@ -3,28 +3,27 @@ You can download the Analytics Zoo release and nightly build from the [Release Page](../release-download.md) --- -## **Link with a release version** +## **Link with 0.9.0 release** Currently, Analytics Zoo releases are hosted on maven central; here's an example to add the Analytics Zoo dependency to your own project: ```xml com.intel.analytics.zoo - analytics-zoo-bigdl_0.10.0-[spark_2.1.1|spark_2.2.0|spark_2.3.1|spark_2.4.3] - ${ANALYTICS_ZOO_VERSION} + analytics-zoo-bigdl_0.12.1-[spark_2.1.1|spark_2.2.0|spark_2.3.1|spark_2.4.3|spark_3.0.0] + 0.9.0 ``` You can find the latest ANALYTICS_ZOO_VERSION [here](https://search.maven.org/search?q=analytics-zoo-bigdl). SBT developers can use ```sbt -libraryDependencies += "com.intel.analytics.zoo" % "analytics-zoo-bigdl_0.10.0-[spark_2.1.1|spark_2.2.0|spark_2.3.1|spark_2.4.3]" % "${ANALYTICS_ZOO_VERSION}" +libraryDependencies += "com.intel.analytics.zoo" % "analytics-zoo-bigdl_0.12.1-[spark_2.1.1|spark_2.2.0|spark_2.3.1|spark_2.4.3|spark_3.0.0]" % "0.9.0" ``` Remarks: - Please choose the available suffix above according to your Spark platform you want to use. - You don't need to add the BigDL dependency to your project as it has already been packaged within Analytics Zoo. -- You can find the option `${ANALYTICS_ZOO_VERSION}` from the [Release Page](../release-download.md). --- ## **Link with a development version** diff --git a/pom.xml b/pom.xml index 2818741659..1c8c0638ad 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.intel.analytics.zoo zoo-parent pom - 0.9.0-SNAPSHOT + 0.9.0 zoo-parent A distributed analytics library for Apache Spark. diff --git a/pyzoo/zoo/__init__.py b/pyzoo/zoo/__init__.py index dbf3788d1d..62644f782f 100644 --- a/pyzoo/zoo/__init__.py +++ b/pyzoo/zoo/__init__.py @@ -35,4 +35,4 @@ for clz in creator_classes: JavaCreator.add_creator_class(clz) -__version__ = "0.9.0.dev0" +__version__ = "0.9.0" diff --git a/scripts/cluster-serving/download-serving-jar.sh b/scripts/cluster-serving/download-serving-jar.sh index 902a702c8c..8e8411396b 100644 --- a/scripts/cluster-serving/download-serving-jar.sh +++ b/scripts/cluster-serving/download-serving-jar.sh @@ -16,7 +16,7 @@ # limitations under the License. # if [ -z "${ANALYTICS_ZOO_VERSION}" ]; then - export ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT + export ANALYTICS_ZOO_VERSION=0.9.0 export BIGDL_VERSION=0.12.1 export SPARK_VERSION=2.4.3 echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION diff --git a/zoo/pom.xml b/zoo/pom.xml index cef6834961..13085e06b1 100644 --- a/zoo/pom.xml +++ b/zoo/pom.xml @@ -7,7 +7,7 @@ zoo-parent com.intel.analytics.zoo - 0.9.0-SNAPSHOT + 0.9.0 analytics-zoo-bigdl_${bigdl.version}-spark_${spark.version}