Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable bigdl 0.12 #3101

Merged
merged 2 commits into from
Nov 25, 2020
+10 −10
Merged

enable bigdl 0.12 #3101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab7ca1c
switch to bigdl 0.12
Le-Zheng Nov 19, 2020
5a8bbe7
update
Le-Zheng Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/model-inference-examples/recommendation-inference/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<description>simple example of ncf recommender inference</description>
<properties>
<spark.version>2.4.3</spark.version>
<bigdl.version>0.11.1</bigdl.version>
<bigdl.version>0.12.0</bigdl.version>
<zoo.version>0.9.0-SNAPSHOT</zoo.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion docker/cluster-serving/ClusterServingSparkVersionDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER The Analytics Zoo Authors https://github.com/intel-analytics/analytic
WORKDIR /opt/work

ARG SPARK_VERSION=2.4.3
ARG BIGDL_VERSION=0.11.1
ARG BIGDL_VERSION=0.12.0
ARG ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT

ENV SPARK_HOME /opt/work/spark-${SPARK_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion docker/cluster-serving/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER The Analytics Zoo Authors https://github.com/intel-analytics/analytic
WORKDIR /opt/work

ARG SPARK_VERSION=2.4.3
ARG BIGDL_VERSION=0.11.1
ARG BIGDL_VERSION=0.12.0
ARG ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT
ARG FLINK_VERSION=1.10.0

Expand Down
2 changes: 1 addition & 1 deletion docker/cluster-serving/download-cluster-serving-all-zip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
if [ -z "${ANALYTICS_ZOO_VERSION}" ]; then
export ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT
export BIGDL_VERSION=0.11.1
export BIGDL_VERSION=0.12.0
export SPARK_VERSION=2.4.3
echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION
fi
Expand Down
2 changes: 1 addition & 1 deletion docker/hyperzoo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,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 BIGDL_VERSION=0.11.1
ARG BIGDL_VERSION=0.12.0
ARG SPARK_VERSION=2.4.3
ARG FLINK_VERSION=1.10.0

Expand Down
2 changes: 1 addition & 1 deletion docker/zoo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ MAINTAINER The Analytics-Zoo Authors https://github.com/intel-analytics/analytic
WORKDIR /opt/work

ARG ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT
ARG BIGDL_VERSION=0.11.1
ARG BIGDL_VERSION=0.12.0
ARG SPARK_VERSION=2.4.3
ARG RUNTIME_SPARK_MASTER=local[4]
ARG RUNTIME_DRIVER_CORES=4
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/DockerUserGuide/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ sudo docker build \
```
sudo docker build \
--build-arg ANALYTICS_ZOO_VERSION=0.7.0 \
--build-arg BIGDL_VERSION=0.11.1 \
--build-arg BIGDL_VERSION=0.12.0 \
--build-arg SPARK_VERSION=2.4.3 \
--rm -t intelanalytics/analytics-zoo:0.7.0-bigdl_0.10.0-spark_2.4.3 .
```
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/PythonUserGuide/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ sc = init_nncontext()
1. We've tested this package with pip 9.0.1. `pip install --upgrade pip` if necessary.
2. Pip install supports __Mac__ and __Linux__ platforms.
3. You need to install Java __>= JDK8__ before running Analytics Zoo, which is required by `pyspark`.
4. `bigdl==0.11.1`, `pyspark==2.4.3`, `conda-pack==0.3.1` and their dependencies will be automatically installed if they haven't been detected in the current Python environment.
4. `bigdl==0.12.0`, `pyspark==2.4.3`, `conda-pack==0.3.1` and their dependencies will be automatically installed if they haven't been detected in the current Python environment.

---
## **Install from pip for Yarn cluster**
Expand Down
2 changes: 1 addition & 1 deletion scripts/cluster-serving/download-serving-jar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
if [ -z "${ANALYTICS_ZOO_VERSION}" ]; then
export ANALYTICS_ZOO_VERSION=0.9.0-SNAPSHOT
export BIGDL_VERSION=0.11.1
export BIGDL_VERSION=0.12.0
export SPARK_VERSION=2.4.3
echo "You did not specify ANALYTICS_ZOO_VERSION, will download "$ANALYTICS_ZOO_VERSION
fi
Expand Down
2 changes: 1 addition & 1 deletion zoo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<scala.macros.version>2.1.0</scala.macros.version>
<scalatest.version>2.2.4</scalatest.version>
<spark.version>2.4.3</spark.version>
<bigdl.version>0.11.1</bigdl.version>
<bigdl.version>0.12.0</bigdl.version>
<core.artifactId>zoo-core-dist-all</core.artifactId>
<core.dependencyType>pom</core.dependencyType>
<data-store-url>http://download.tensorflow.org</data-store-url>
Expand Down