Skip to content

Commit

Permalink
bump version to 0.4.0 (#1119)
Browse files Browse the repository at this point in the history
  • Loading branch information
hkvision authored Jan 24, 2019
1 parent 59006b7 commit 7b8d3a6
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 38 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MAINTAINER The Analytics-Zoo Authors https://github.com/intel-analytics/analytic

WORKDIR /opt/work

ARG ANALYTICS_ZOO_VERSION=0.4.0-SNAPSHOT
ARG ANALYTICS_ZOO_VERSION=0.4.0
ARG BIGDL_VERSION=0.7.2
ARG SPARK_VERSION=2.4.0
ARG RUNTIME_DRIVER_CORES=4
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/PythonUserGuide/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ For Python users, Analytics Zoo can be installed either [from pip](#install-from
You can use the following command to install the latest release version of __analytics-zoo__ via pip easily:

```bash
pip install analytics-zoo # for Python 2.7
pip3 install analytics-zoo # for Python 3.5 and Python 3.6
pip install analytics-zoo==0.4.0 # for Python 2.7
pip3 install analytics-zoo==0.4.0 # for Python 3.5 and Python 3.6
```

* Note that you might need to add `sudo` if you don't have the permission for installation.
Expand All @@ -29,7 +29,7 @@ sc = init_nncontext()
2. Pip install supports __Mac__ and __Linux__ platforms.
3. Pip install only supports __local__ mode. Cluster mode might be supported in the future. For those who want to use Analytics Zoo in cluster mode, please try to [install without pip](#install-without-pip).
4. You need to install Java __>= JDK8__ before running Analytics Zoo, which is required by `pyspark`.
5. `pyspark==2.3.2`, `bigdl==0.7.1` and their dependencies will automatically be installed if they haven't been detected in the current Python environment.
5. `pyspark==2.3.2`, `bigdl==0.7.2` and their dependencies will automatically be installed if they haven't been detected in the current Python environment.


---
Expand Down
34 changes: 4 additions & 30 deletions docs/docs/ScalaUserGuide/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +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 Analytics Zoo 0.4.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
<dependency>
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>analytics-zoo-bigdl_0.7.1-[spark_1.6.2|spark_2.1.1|spark_2.2.0|spark_2.3.1]</artifactId>
<version>${ANALYTICS_ZOO_VERSION}</version>
<artifactId>analytics-zoo-bigdl_0.7.2-[spark_1.6.2|spark_2.1.1|spark_2.2.0|spark_2.3.1]</artifactId>
<version>0.4.0</version>
</dependency>
```

SBT developers can use
```sbt
libraryDependencies += "com.intel.analytics.zoo" % "analytics-zoo-bigdl_0.7.1-[spark_1.6.2|spark_2.1.1|spark_2.2.0|spark_2.3.1]" % "${ANALYTICS_ZOO_VERSION}"
libraryDependencies += "com.intel.analytics.zoo" % "analytics-zoo-bigdl_0.7.2-[spark_1.6.2|spark_2.1.1|spark_2.2.0|spark_2.3.1]" % "0.4.0"
```

Remarks:

- Please choose the available suffix above according to your Spark platform and the BigDL version 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**

Currently, Analytics Zoo development version is hosted on [SonaType](https://oss.sonatype.org/content/groups/public/com/intel/analytics/zoo/).

To link your application with the latest Analytics Zoo development version, you should add some dependencies like [Linking with Analytics Zoo releases](#link-with-a-release-version), but set `${ANALYTICS_ZOO_VERSION}` to latest version, and add below repository to your pom.xml.

```xml
<repository>
<id>sonatype</id>
<name>sonatype repository</name>
<url>https://oss.sonatype.org/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
```

SBT developers can use
```sbt
resolvers += "ossrh repository" at "https://oss.sonatype.org/content/repositories/snapshots/"
```

## **Download Analytics Zoo Source**

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.intel.analytics.zoo</groupId>
<artifactId>zoo-parent</artifactId>
<packaging>pom</packaging>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0</version>

<name>zoo-parent</name>
<description>A distributed analytics library for Apache Spark.</description>
Expand Down
2 changes: 1 addition & 1 deletion pyzoo/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def setup_package():
license='Apache License, Version 2.0',
url='https://github.com/intel-analytics/analytics-zoo',
packages=packages,
install_requires=['pyspark==2.3.2', 'bigdl==0.7.1'],
install_requires=['pyspark==2.3.2', 'bigdl==0.7.2'],
dependency_links=['https://d3kbcqa49mib13.cloudfront.net/spark-2.0.0-bin-hadoop2.7.tgz'],
include_package_data=True,
package_data={"zoo.share": ['lib/analytics-zoo*with-dependencies.jar', 'conf/*', 'bin/*',
Expand Down
2 changes: 1 addition & 1 deletion pyzoo/zoo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
for clz in creator_classes:
JavaCreator.add_creator_class(clz)

__version__ = "0.4.0.dev0"
__version__ = "0.4.0"
2 changes: 1 addition & 1 deletion zoo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>zoo-parent</artifactId>
<groupId>com.intel.analytics.zoo</groupId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0</version>
</parent>

<artifactId>analytics-zoo-bigdl_${bigdl.version}-spark_${spark.version}</artifactId>
Expand Down

0 comments on commit 7b8d3a6

Please sign in to comment.