Merge pull request #458 from yahoo/experimental

TensorFlow 2.0 compatibility

.travis.yml

@@ -2,42 +2,25 @@ matrix:
   include:
   - language: python
     python: 2.7
-    dist: trusty
+    dist: xenial
     before_install:
-    - curl -LO http://www-us.apache.org/dist/spark/spark-2.4.4/spark-2.4.4-bin-hadoop2.7.tgz
-    - export SPARK_HOME=./spark
-    - mkdir $SPARK_HOME
-    - tar -xf spark-2.4.4-bin-hadoop2.7.tgz -C $SPARK_HOME --strip-components=1
-    - export PATH=$SPARK_HOME/bin:$PATH
-    - export SPARK_LOCAL_IP=127.0.0.1
-    - export SPARK_CLASSPATH=./lib/tensorflow-hadoop-1.0-SNAPSHOT.jar
-    - export PYTHONPATH=$(pwd)
+    - source scripts/travis_before_install.sh
     install:
     - pip install -r requirements.txt
     - pip install mock
     script:
     - test/run_tests.sh
   - language: python
     python: 3.6
-    dist: trusty
+    dist: xenial
     before_install:
-    - curl -LO http://www-us.apache.org/dist/spark/spark-2.4.4/spark-2.4.4-bin-hadoop2.7.tgz
-    - export SPARK_HOME=./spark
-    - mkdir $SPARK_HOME
-    - tar -xf spark-2.4.4-bin-hadoop2.7.tgz -C $SPARK_HOME --strip-components=1
-    - export PATH=$SPARK_HOME/bin:$PATH
-    - export SPARK_LOCAL_IP=127.0.0.1
-    - export SPARK_CLASSPATH=./lib/tensorflow-hadoop-1.0-SNAPSHOT.jar
-    - export PYTHONPATH=$(pwd)
+    - source scripts/travis_before_install.sh
     install:
     - pip install -r requirements.txt
     - pip list
     script:
     - sphinx-build -b html docs/source docs/build/html
     - test/run_tests.sh
-  - language: java
-    dist: trusty
-    jdk: oraclejdk8
 notifications:
   email: false
 deploy:
@@ -60,11 +43,3 @@ deploy:
     python: 3.6
     tags: true
     condition: "$TRAVIS_TAG =~ ^v.*$"
-- provider: script
-  script: mvn deploy -DskipTests --settings .travis.settings.xml
-  skip_cleanup: true
-  on:
-    branch: master
-    jdk: oraclejdk8
-    tags: true
-    condition: "$TRAVIS_TAG =~ ^scala_.*$"

README.md

@@ -1,5 +1,5 @@
 <!--
-Copyright 2017 Yahoo Inc.
+Copyright 2019 Yahoo Inc.
 Licensed under the terms of the Apache 2.0 license.
 Please see LICENSE file in the project root for terms.
 -->
@@ -41,18 +41,22 @@ deep learning on our Hadoop clusters in Yahoo's private cloud.
 TensorFlowOnSpark provides some important benefits (see [our
 blog](http://yahoohadoop.tumblr.com/post/157196317141/open-sourcing-tensorflowonspark-distributed-deep))
 over alternative deep learning solutions.
-   * Easily migrate existing TensorFlow programs with <10 lines of code change
-   * Support all TensorFlow functionalities: synchronous/asynchronous training, model/data parallelism, inferencing and TensorBoard
-   * Server-to-server direct communication achieves faster learning when available
-   * Allow datasets on HDFS and other sources pushed by Spark or pulled by TensorFlow
-   * Easily integrate with your existing Spark data processing pipelines
+   * Easily migrate existing TensorFlow programs with <10 lines of code change.
+   * Support all TensorFlow functionalities: synchronous/asynchronous training, model/data parallelism, inferencing and TensorBoard.
+   * Server-to-server direct communication achieves faster learning when available.
+   * Allow datasets on HDFS and other sources pushed by Spark or pulled by TensorFlow.
+   * Easily integrate with your existing Spark data processing pipelines.
    * Easily deployed on cloud or on-premise and on CPUs or GPUs.
 
 ## Install
 
 TensorFlowOnSpark is provided as a pip package, which can be installed on single machines via:
 ```
+# for tensorflow>=2.0.0
 pip install tensorflowonspark
+
+# for tensorflow<2.0.0
+pip install tensorflowonspark==1.4.4
 ```
 
 For distributed clusters, please see our [wiki site](../../wiki) for detailed documentation for specific environments, such as our getting started guides for [single-node Spark Standalone](https://github.com/yahoo/TensorFlowOnSpark/wiki/GetStarted_Standalone), [YARN clusters](../../wiki/GetStarted_YARN) and [AWS EC2](../../wiki/GetStarted_EC2).  Note: the Windows operating system is not currently supported due to [this issue](https://github.com/yahoo/TensorFlowOnSpark/issues/36).
@@ -61,6 +65,8 @@ For distributed clusters, please see our [wiki site](../../wiki) for detailed do
 
 To use TensorFlowOnSpark with an existing TensorFlow application, you can follow our [Conversion Guide](../../wiki/Conversion-Guide) to describe the required changes.  Additionally, our [wiki site](../../wiki) has pointers to some presentations which provide an overview of the platform.
 
+**Note: since TensorFlow 2.x breaks API compatibility with TensorFlow 1.x, the examples have been updated accordingly.  If you are using TensorFlow 1.x, you will need to checkout the `v1.4.4` tag for compatible examples and instructions.**
+
 ## API
 
 [API Documentation](https://yahoo.github.io/TensorFlowOnSpark/) is automatically generated from the code.
@@ -71,7 +77,6 @@ Please join the [TensorFlowOnSpark user group](https://groups.google.com/forum/#
 
 Contributions are always welcome.  For more information, please see our [guide for getting involved](Contributing.md).
 
-
 ## License
 
 The use and distribution terms for this software are covered by the Apache 2.0 license.

docs/source/conf.py

@@ -28,9 +28,9 @@
 author = 'Yahoo Inc'
 
 # The short X.Y version
-version = '1.4.4'
+version = '2.0.0'
 # The full version, including alpha/beta/rc tags
-release = '1.4.4'
+release = '2.0.0'
 
 
 # -- General configuration ---------------------------------------------------