Only test on Python 3 and TF 2.1. | Resolves #146.

* Fix breaking BUILD rules.
* Delete unused `adanet.keras` to free up namespace.
* Use `import tensorflow.compat.v2 as tf` where possible.
* Drop Python 2 support.
* Drop TensorFlow 1.* support.
* Remove google_typing future import.
* Rename `get_test_data` to `get_holdout_data` to not confuse test runner.
Copybara import of the project:

  - fdebb94 Only test on Python 3 and TF 2.1. by Charles Weill <[email protected]>
  - 99b8f53 Remove google future import and rename helper method to n... by Charles Weill <[email protected]>
  - 1129fc5 Fix failing test. by Charles Weill <[email protected]>
  - ba09b4a Fix failing test again. by Charles Weill <[email protected]>
  - a551c8f Remove adanet.keras module. by Charles Weill <[email protected]>
  - 2cd0709 Remove remaining keras BUILD targets. by Charles Weill <[email protected]>
  - 3e85863 Remove lingering keras autoensemble modules. by Charles Weill <[email protected]>
  - 72d59f2 Fix adanet_test.py by Charles Weill <[email protected]>
  - 8e6286d Merge 72d59f2 into 14920... by Charles Weill <[email protected]>

PiperOrigin-RevId: 292949559

Author: cweill

.travis.yml

@@ -5,57 +5,51 @@ git:
   depth: 10
   quiet: true
 python:
-  - "2.7"
   - "3.6"
 env:
   global:
     - CODECOV_TOKEN="0d2c482b-f42c-4d4c-b092-cb628ad20857"
     - BAZEL_VERSION=0.20.0
     - COVERAGE_PROCESS_START=$PWD/.coveragerc
-    - NODE_TOTAL=3  # Total machines running per test setting
+    - NODE_TOTAL=8  # Total machines running per test setting
   matrix:
     # We test against recent versions of TensorFlow and tf-nightly.
 
-    # Quick test suite.
-    - TF_VERSION="1.15.*" NODE_INDEX=0
-    - TF_VERSION="1.15.*" NODE_INDEX=1
-    - TF_VERSION="1.15.*" NODE_INDEX=2
     - TF_VERSION="tf-nightly" NODE_INDEX=0
     - TF_VERSION="tf-nightly" NODE_INDEX=1
     - TF_VERSION="tf-nightly" NODE_INDEX=2
-    - TF_VERSION="2.0.0" NODE_INDEX=0
-    - TF_VERSION="2.0.0" NODE_INDEX=1
-    - TF_VERSION="2.0.0" NODE_INDEX=2
-    - TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=0
-    - TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=1
-    - TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=2
+    - TF_VERSION="tf-nightly" NODE_INDEX=3
+    - TF_VERSION="tf-nightly" NODE_INDEX=4
+    - TF_VERSION="tf-nightly" NODE_INDEX=5
+    - TF_VERSION="tf-nightly" NODE_INDEX=6
+    - TF_VERSION="tf-nightly" NODE_INDEX=7
+    - TF_VERSION="2.1" NODE_INDEX=0
+    - TF_VERSION="2.1" NODE_INDEX=1
+    - TF_VERSION="2.1" NODE_INDEX=2
+    - TF_VERSION="2.1" NODE_INDEX=3
+    - TF_VERSION="2.1" NODE_INDEX=4
+    - TF_VERSION="2.1" NODE_INDEX=5
+    - TF_VERSION="2.1" NODE_INDEX=6
+    - TF_VERSION="2.1" NODE_INDEX=7
 
 matrix:
   allow_failures:
-    - python: "2.7"
-      env: TF_VERSION="tf-nightly" NODE_INDEX=0
-    - python: "2.7"
-      env: TF_VERSION="tf-nightly" NODE_INDEX=1
-    - python: "2.7"
-      env: TF_VERSION="tf-nightly" NODE_INDEX=2
     - python: "3.6"
       env: TF_VERSION="tf-nightly" NODE_INDEX=0
     - python: "3.6"
       env: TF_VERSION="tf-nightly" NODE_INDEX=1
     - python: "3.6"
       env: TF_VERSION="tf-nightly" NODE_INDEX=2
-    - python: "2.7"
-      env: TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=0
-    - python: "2.7"
-      env: TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=1
-    - python: "2.7"
-      env: TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=2
     - python: "3.6"
-      env: TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=0
+      env: TF_VERSION="tf-nightly" NODE_INDEX=3
+    - python: "3.6"
+      env: TF_VERSION="tf-nightly" NODE_INDEX=4
+    - python: "3.6"
+      env: TF_VERSION="tf-nightly" NODE_INDEX=5
     - python: "3.6"
-      env: TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=1
+      env: TF_VERSION="tf-nightly" NODE_INDEX=6
     - python: "3.6"
-      env: TF_VERSION="tf-nightly-2.0-preview" NODE_INDEX=2
+      env: TF_VERSION="tf-nightly" NODE_INDEX=7
 
 before_install:
   - sudo apt-get -y install pkg-config zip g++ zlib1g-dev unzip

README.md

@@ -91,12 +91,12 @@ To get you started:
 
 ## Requirements
 
-Requires [Python](https://www.python.org/) 2.7, 3.4, 3.5, 3.6, or 3.7.
+Requires [Python](https://www.python.org/) 3.6 or above.
 
-`adanet` supports both TensorFlow 2.0 and TensorFlow >=1.15. It depends on bug fixes and enhancements not present in TensorFlow releases prior to 1.15. You must install or upgrade your TensorFlow package to at least 1.15:
+`adanet` is built on TensorFlow 2.1. It depends on bug fixes and enhancements not present in TensorFlow releases prior to 2.1. You must install or upgrade your TensorFlow package to at least 2.1:
 
 ```shell
-$ pip install "tensorflow==2.0.0" # Or pip install "tensorflow==1.15.*"
+$ pip install "tensorflow==2.1"
 ```
 
 ## Installing with Pip
@@ -122,8 +122,7 @@ From the `adanet` root directory run the tests:
 
 ```shell
 $ bazel build -c opt //...
-# Run tests with nosetests, but skip example tests.
-$ NOSE_EXCLUDE='.*nasnet.*.py.*' python3 -m nose
+$ python3 -m nose
 ```
 
 Once you have verified that the tests have passed, install `adanet` from source as a [ pip package ](./adanet/pip_package/PIP.md).

adanet/BUILD

@@ -19,7 +19,6 @@ py_library(
         "//adanet/core",
         "//adanet/distributed",
         "//adanet/ensemble",
-        "//adanet/keras",
         "//adanet/replay",
         "//adanet/subnetwork",
     ],

adanet/__init__.py

@@ -20,10 +20,8 @@
 
 from adanet import distributed
 from adanet import ensemble
-from adanet import keras
 from adanet import replay
 from adanet import subnetwork
-from adanet.autoensemble import AutoEnsemble
 from adanet.autoensemble import AutoEnsembleEstimator
 from adanet.autoensemble import AutoEnsembleSubestimator
 from adanet.autoensemble import AutoEnsembleTPUEstimator
@@ -37,13 +35,11 @@
 from adanet.ensemble import ComplexityRegularized as Ensemble
 from adanet.ensemble import MixtureWeightType
 from adanet.ensemble import WeightedSubnetwork
-from adanet.keras import Model
 from adanet.subnetwork import Subnetwork
 
 from adanet.version import __version__
 
 __all__ = [
-    "AutoEnsemble",
     "AutoEnsembleEstimator",
     "AutoEnsembleSubestimator",
     "AutoEnsembleTPUEstimator",
@@ -52,8 +48,6 @@
     "Ensemble",
     "Estimator",
     "Evaluator",
-    "keras",
-    "Model",
     "replay",
     "ReportMaterializer",
     "subnetwork",

adanet/adanet_test.py

@@ -28,7 +28,6 @@ class AdaNetTest(tf.test.TestCase):
 
   def test_public(self):
     self.assertIsNotNone(adanet.__version__)
-    self.assertIsNotNone(adanet.AutoEnsemble)
     self.assertIsNotNone(adanet.AutoEnsembleEstimator)
     self.assertIsNotNone(adanet.AutoEnsembleSubestimator)
     self.assertIsNotNone(adanet.AutoEnsembleTPUEstimator)
@@ -51,9 +50,6 @@ def test_public(self):
     self.assertIsNotNone(adanet.Ensemble)
     self.assertIsNotNone(adanet.Estimator)
     self.assertIsNotNone(adanet.Evaluator)
-    self.assertIsNotNone(adanet.keras.Model)
-    self.assertIsNotNone(adanet.keras.AutoEnsemble)
-    self.assertIsNotNone(adanet.Model)
     self.assertIsNotNone(adanet.MixtureWeightType)
     self.assertIsNotNone(adanet.replay.Config)
     self.assertIsNotNone(adanet.ReportMaterializer)

adanet/autoensemble/BUILD

@@ -12,7 +12,6 @@ py_library(
     deps = [
         ":common",
         ":estimator",
-        ":keras",
     ],
 )
 
@@ -26,17 +25,6 @@ py_library(
     ],
 )
 
-py_library(
-    name = "keras",
-    srcs = ["keras.py"],
-    visibility = ["//adanet/keras:__subpackages__"],
-    deps = [
-        ":common",
-        "//adanet/keras:model",
-        "@absl_py//absl/logging",
-    ],
-)
-
 py_library(
     name = "estimator",
     srcs = ["estimator.py"],
@@ -46,17 +34,6 @@ py_library(
     ],
 )
 
-py_test(
-    name = "keras_test",
-    size = "medium",
-    srcs = ["keras_test.py"],
-    deps = [
-        ":keras",
-        "//adanet/tf_compat",
-        "@absl_py//absl/testing:parameterized",
-    ],
-)
-
 py_test(
     name = "estimator_test",
     size = "large",

adanet/autoensemble/__init__.py

@@ -22,11 +22,9 @@
 from adanet.autoensemble.common import AutoEnsembleSubestimator
 from adanet.autoensemble.estimator import AutoEnsembleEstimator
 from adanet.autoensemble.estimator import AutoEnsembleTPUEstimator
-from adanet.autoensemble.keras import AutoEnsemble
 
 __all__ = [
     "AutoEnsembleEstimator",
     "AutoEnsembleSubestimator",
     "AutoEnsembleTPUEstimator",
-    "AutoEnsemble",
 ]

adanet/autoensemble/common.py

@@ -25,7 +25,7 @@
 from adanet import subnetwork as subnetwork_lib
 from adanet import tf_compat
 
-import tensorflow as tf
+import tensorflow.compat.v2 as tf
 
 
 def _default_logits(estimator_spec):

adanet/autoensemble/estimator.py

@@ -22,7 +22,7 @@
 from adanet import core
 from adanet.autoensemble.common import _GeneratorFromCandidatePool
 
-import tensorflow as tf
+import tensorflow.compat.v2 as tf
 
 
 class AutoEnsembleEstimator(core.Estimator):  # pylint: disable=g-classes-have-attributes

adanet/autoensemble/estimator_v2_test.py

@@ -27,7 +27,7 @@
 from absl.testing import parameterized
 from adanet import tf_compat
 from adanet.autoensemble.estimator import AutoEnsembleEstimator
-import tensorflow as tf
+import tensorflow.compat.v2 as tf
 
 # pylint: disable=g-direct-tensorflow-import
 from tensorflow.python.estimator.export import export