Merge pull request #1 from tensorflow/test_374201786

Release of v0.1.1

Author: achoum

.bazelrc

@@ -22,6 +22,9 @@ build --nocheck_visibility
 # Yggdrasil uses tensorflow for IO.
 build --define=use_tensorflow_io=1
 
+# Pre-compiled wrappers.
+build --define=use_precompiled_wrappers=1
+
 # TensorFlow uses an old version of Absl without StatusOr, so Yggdrasil uses
 # its own implementation.
 build --define=no_absl_statusor=1

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.1.1 - 2021-05-17
+
+### Features
+
+-   Migration to TensorFlow 2.5.0.
+-   By default, use a pre-compiled version of the OP wrappers.
+
+### Bug fix
+
+-   Add missing `plotter.js` from Pip package.
+-   Use GitHub version of Yggdrasil Decision Forests by default.
+
 ## 0.1.0 - 2021-05-11
 
 Initial Release of TensorFlow Decision Forests.

WORKSPACE

@@ -8,13 +8,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # absl used by tensorflow.
 http_archive(
     name = "org_tensorflow",
-    #sha256 = "b91ec194ddf6c4a5a2f9d1db4af4daab0b187ff691e6f88142413d2c7e77a3bb",
-    #strip_prefix = "tensorflow-2.4.1",
-    #urls = ["https://github.com/tensorflow/tensorflow/archive/v2.4.1.zip"],
-
-    sha256 = "f7ad0a488559ee01f042a967c065482b074e11afd0299facbd8dc0cba9ae3fa9",
-    strip_prefix = "tensorflow-2.5.0-rc3",
-    urls = ["https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.5.0-rc3.zip"],
+    sha256 = "e3d0ee227cc19bd0fa34a4539c8a540b40f937e561b4580d4bbb7f0e31c6a713",
+    strip_prefix = "tensorflow-2.5.0",
+    urls = ["https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.5.0.zip"],
 
     #urls = ["https://github.com/tensorflow/tensorflow/archive/master.zip"],
     #strip_prefix = "tensorflow-master",

configure/MANIFEST.in

@@ -1,5 +1,6 @@
 include LICENSE
 include README
+include tensorflow_decision_forests/component/model_plotter/plotter.js
 recursive-include * *.so
 recursive-include * *.so.[0-9]
 recursive-include * *.dylib

configure/setup.py

@@ -17,30 +17,43 @@
 This file is used by tools/build_pip_package.sh.
 """
 import setuptools
+from setuptools.command.install import install
 from setuptools.dist import Distribution
 
-_VERSION = "0.1.0"
+_VERSION = "0.1.1"
 
 with open("README.md", "r", encoding="utf-8") as fh:
   long_description = fh.read()
 
 REQUIRED_PACKAGES = [
     "numpy",
     "pandas",
-    "tensorflow==2.5.0rc3",
+    "tensorflow~=2.5",
     "six",
     "absl_py",
     "wheel",
 ]
 
 
+class InstallPlatlib(install):
+
+  def finalize_options(self):
+    install.finalize_options(self)
+    if self.distribution.has_ext_modules():
+      self.install_lib = self.install_platlib
+
+
 class BinaryDistribution(Distribution):
 
   def has_ext_modules(self):
     return True
 
+  def is_pure(self):
+    return False
+
 
 setuptools.setup(
+    cmdclass={"install": InstallPlatlib},
     name="tensorflow_decision_forests",
     version=_VERSION,
     author="Google Inc.",

documentation/installation.md

@@ -52,7 +52,7 @@ Download and compile TensorFlow Decision Forests as follow:
 ```shell
 # Download the source code.
 git clone https://github.com/tensorflow/decision-forests.git
-cd tensorflow_decision_forests
+cd decision-forests
 
 # Download TensorFlow's BazelRC.
 # See "tensorflow_bazelrc" for the compilation options.
@@ -62,13 +62,13 @@ TENSORFLOW_BAZELRC="tensorflow_bazelrc"
 wget https://raw.githubusercontent.com/tensorflow/tensorflow/master/.bazelrc -O ${TENSORFLOW_BAZELRC}
 
 # Compile TensorFlow Decision Forests.
-bazel-3.7.2 build //tensorflow_decision_forests/...:all --bazelrc=${TENSORFLOW_BAZELRC} --config=linux
+bazel-3.7.2 --bazelrc=${TENSORFLOW_BAZELRC} build //tensorflow_decision_forests/...:all --config=linux
 
 # Create a pip package.
-./tools/build_pip_package.sh
+./tools/build_pip_package.sh simple
 
 # Install the pip package
-pip3 install dist/tensorflow_decision_forests-0.1.0.tar.gz
+pip3 install dist/*.whl
 ```
 
 **Note:** Compiling TensorFlow Decision Forests compiles a large part of

documentation/tutorials/advanced_colab.ipynb

@@ -44,13 +44,13 @@
         "    \u003ca target=\"_blank\" href=\"https://www.tensorflow.org/decision_forests/tutorials/advanced_colab\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/tf_logo_32px.png\" /\u003eView on TensorFlow.org\u003c/a\u003e\n",
         "  \u003c/td\u003e\n",
         "  \u003ctd\u003e\n",
-        "    \u003ca target=\"_blank\" href=\"https://colab.research.google.com/github/tensorflow/decision_forests/blob/master/documentation/tutorials/advanced_colab.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" /\u003eRun in Google Colab\u003c/a\u003e\n",
+        "    \u003ca target=\"_blank\" href=\"https://colab.research.google.com/github/tensorflow/decision-forests/blob/main/documentation/tutorials/advanced_colab.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" /\u003eRun in Google Colab\u003c/a\u003e\n",
         "  \u003c/td\u003e\n",
         "  \u003ctd\u003e\n",
-        "    \u003ca target=\"_blank\" href=\"https://github.com/tensorflow/decision_forests/blob/master/documentation/tutorials/advanced_colab.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/GitHub-Mark-32px.png\" /\u003eView on GitHub\u003c/a\u003e\n",
+        "    \u003ca target=\"_blank\" href=\"https://github.com/tensorflow/decision-forests/blob/main/documentation/tutorials/advanced_colab.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/GitHub-Mark-32px.png\" /\u003eView on GitHub\u003c/a\u003e\n",
         "  \u003c/td\u003e\n",
         "  \u003ctd\u003e\n",
-        "    \u003ca href=\"https://storage.googleapis.com/tensorflow_docs/decision_forests/documentation/tutorials/advanced_colab.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/download_logo_32px.png\" /\u003eDownload notebook\u003c/a\u003e\n",
+        "    \u003ca href=\"https://storage.googleapis.com/tensorflow_docs/decision-forests/documentation/tutorials/advanced_colab.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/download_logo_32px.png\" /\u003eDownload notebook\u003c/a\u003e\n",
         "  \u003c/td\u003e\n",
         "\u003c/table\u003e\n"
       ]
@@ -80,8 +80,11 @@
       },
       "outputs": [],
       "source": [
-        "# Install TensorFlow Dececision Forests\n",
-        "!pip install tensorflow_decision_forests"
+        "# Install TensorFlow Dececision Forests.\n",
+        "!pip install tensorflow_decision_forests\n",
+        "\n",
+        "# Use wurlitzer to capture training logs.\n",
+        "!pip install wurlitzer"
       ]
     },
     {
@@ -176,7 +179,6 @@
       },
       "outputs": [],
       "source": [
-        "%output_height 300px\n",
         "model.summary()"
       ]
     },
@@ -189,30 +191,6 @@
         "Remark the multiple variable importances with name `MEAN_DECREASE_IN_*`."
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "xTwmx8A0c4TU"
-      },
-      "source": [
-        "## Plotting the model\n",
-        "\n",
-        "Next, we plot our model.\n",
-        "\n",
-        "A Random Forest is a large model (this model has 300 trees and ~5k nodes; see the summary above). Therefore, we will only plot the first tree, and limit the nodes to depth 3."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "ZRTrXDz_dIAQ"
-      },
-      "outputs": [],
-      "source": [
-        "tfdf.model_plotter.plot_model_in_colab(model, tree_idx=0, max_depth=3)"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -612,26 +590,6 @@
         "inspector = tfdf.inspector.make_inspector(yggdrasil_model_path)\n",
         "print(\"Input features:\", inspector.features())"
       ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "muW1hgmotx8J"
-      },
-      "source": [
-        "And of course, you can plot the model :)"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "bqahDVg3t1xM"
-      },
-      "outputs": [],
-      "source": [
-        "tfdf.model_plotter.plot_model_in_colab(manual_model)"
-      ]
     }
   ],
   "metadata": {