Skip to content

Commit fe19bcb

Browse files
caisqcaisq
committed
Merge commit for internal changes
2 parents 891f8f7 + 0949ece commit fe19bcb

80 files changed

Lines changed: 1355 additions & 1891 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ and discussion.**
3333

3434
People who are a little more adventurous can also try our nightly binaries:
3535

36-
* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
37-
* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/140/artifact/pip_test/whl/tensorflow-0.8.0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_CONTAINER_TYPE=GPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
38-
* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac1-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac1-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac1-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_CONTAINER_TYPE=CPU,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac1-slave/))
36+
* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
37+
* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
38+
* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac1-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac1-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac1-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac1-slave/))
3939
* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
4040
* [Android](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-android/TF_BUILD_CONTAINER_TYPE=ANDROID,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=android-slave/lastSuccessfulBuild/artifact/bazel-out/local_linux/bin/tensorflow/examples/android/tensorflow_demo.apk) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-android/TF_BUILD_CONTAINER_TYPE=ANDROID,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=android-slave/))
4141

‎configure‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
DO_NOT_SUBMIT_WARNING="Unofficial setting. DO NOT SUBMIT!!!"
44

5+
# Find out the absolute path to where ./configure resides
6+
pushd `dirname $0` #> /dev/null
7+
SOURCE_BASE_DIR=`pwd -P`
8+
popd > /dev/null
9+
510
## Set up python-related environment settings
611
while true; do
712
fromuser=""
@@ -68,6 +73,12 @@ echo "$SWIG_PATH" > tensorflow/tools/swig/swig_path
6873
# Invoke python_config and set up symlinks to python includes
6974
(./util/python/python_config.sh --setup "$PYTHON_BIN_PATH";) || exit -1
7075

76+
# Run the gen_git_source to create links where bazel can track dependencies for
77+
# git hash propagation
78+
GEN_GIT_SOURCE=tensorflow/tools/git/gen_git_source.py
79+
chmod a+x ${GEN_GIT_SOURCE}
80+
${PYTHON_BIN_PATH} ${GEN_GIT_SOURCE} --configure ${SOURCE_BASE_DIR}
81+
7182
## Set up Cuda-related environment settings
7283

7384
while [ "$TF_NEED_CUDA" == "" ]; do

‎tensorflow/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ filegroup(
176176
"//tensorflow/tools/docker:all_files",
177177
"//tensorflow/tools/docker/notebooks:all_files",
178178
"//tensorflow/tools/docs:all_files",
179+
"//tensorflow/tools/git:all_files",
179180
"//tensorflow/tools/proto_text:all_files",
180181
"//tensorflow/tools/test:all_files",
181182
"//tensorflow/user_ops:all_files",

‎tensorflow/contrib/bayesflow/BUILD‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,18 @@ cuda_py_test(
8989
],
9090
)
9191

92+
cuda_py_test(
93+
name = "stochastic_gradient_estimators_test",
94+
size = "medium",
95+
srcs = ["python/kernel_tests/stochastic_gradient_estimators_test.py"],
96+
additional_deps = [
97+
":bayesflow_py",
98+
"//tensorflow:tensorflow_py",
99+
"//tensorflow/python:framework_test_lib",
100+
"//tensorflow/python:platform_test",
101+
],
102+
)
103+
92104
cuda_py_test(
93105
name = "reinforce_simple_example",
94106
size = "small",

‎tensorflow/contrib/bayesflow/python/kernel_tests/stochastic_gradient_estimators_test.py‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# Copyright 2016 The TensorFlow Authors. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# ==============================================================================
15+
"""Tests for stochastic graphs."""
16+
17+
from __future__ import absolute_import
18+
from __future__ import division
19+
from __future__ import print_function
20+
21+
import tensorflow as tf
22+
23+
st = tf.contrib.bayesflow.stochastic_tensor
24+
sge = tf.contrib.bayesflow.stochastic_gradient_estimators
25+
26+
27+
class StochasticGradientEstimatorsTest(tf.test.TestCase):
28+
29+
def setUp(self):
30+
self._p = tf.constant(0.999999)
31+
self._final_loss = tf.constant(3.2)
32+
33+
def _testScoreFunction(self, loss_fn, expected):
34+
x = st.BernoulliTensor(p=self._p, loss_fn=loss_fn)
35+
sf = x.loss(self._final_loss)
36+
with self.test_session() as sess:
37+
sess.run(tf.initialize_all_variables())
38+
self.assertAllClose(*sess.run([expected, sf]))
39+
40+
def testScoreFunction(self):
41+
expected = tf.log(self._p) * self._final_loss
42+
self._testScoreFunction(sge.score_function, expected)
43+
44+
def testScoreFunctionWithConstantBaseline(self):
45+
b = tf.constant(9.8)
46+
expected = tf.log(self._p) * (self._final_loss - b)
47+
self._testScoreFunction(
48+
sge.get_score_function_with_constant_baseline(b), expected)
49+
50+
def testScoreFunctionWithBaselineFn(self):
51+
b = tf.constant(9.8)
52+
53+
def baseline_fn(stoch_tensor, loss):
54+
self.assertTrue(isinstance(stoch_tensor, st.StochasticTensor))
55+
self.assertTrue(isinstance(loss, tf.Tensor))
56+
return b
57+
58+
expected = tf.log(self._p) * (self._final_loss - b)
59+
self._testScoreFunction(
60+
sge.get_score_function_with_baseline(baseline_fn), expected)
61+
62+
def testScoreFunctionWithMeanBaseline(self):
63+
ema_decay = 0.8
64+
x = st.BernoulliTensor(
65+
p=self._p,
66+
loss_fn=sge.get_score_function_with_baseline(
67+
sge.get_mean_baseline(ema_decay)))
68+
sf = x.loss(self._final_loss)
69+
70+
expected = tf.log(self._p) * (self._final_loss -
71+
(1. - ema_decay) * self._final_loss)
72+
73+
with self.test_session() as sess:
74+
sess.run(tf.initialize_all_variables())
75+
sess.run(sf) # run to update EMA
76+
self.assertAllClose(*sess.run([expected, sf]))
77+
78+
def testScoreFunctionWithAdvantageFn(self):
79+
b = tf.constant(9.8)
80+
81+
def advantage_fn(stoch_tensor, loss):
82+
self.assertTrue(isinstance(stoch_tensor, st.StochasticTensor))
83+
self.assertTrue(isinstance(loss, tf.Tensor))
84+
return loss - b
85+
86+
expected = tf.log(self._p) * (self._final_loss - b)
87+
self._testScoreFunction(
88+
sge.get_score_function_with_advantage(advantage_fn), expected)
89+
90+
91+
if __name__ == "__main__":
92+
tf.test.main()

‎tensorflow/contrib/bayesflow/python/ops/stochastic_gradient_estimators.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858

5959
from tensorflow.python.framework import ops
6060
from tensorflow.python.ops import array_ops
61-
from tensorflow.python.ops import control_flow_ops
6261
from tensorflow.python.ops import math_ops
6362
from tensorflow.python.training import training
6463
from tensorflow.python.util.all_util import make_all
@@ -180,11 +179,12 @@ def get_mean_baseline(ema_decay=0.99, name="MeanBaseline"):
180179
def mean_baseline(_, loss):
181180
with ops.name_scope(name):
182181
ema = training.ExponentialMovingAverage(decay=ema_decay)
183-
update_op = ema.apply(math_ops.reduce_mean(loss))
184-
with control_flow_ops.control_dependencies([update_op]):
182+
reduced_loss = math_ops.reduce_mean(loss)
183+
update_op = ema.apply([reduced_loss])
184+
with ops.control_dependencies([update_op]):
185185
# TODO(rsepassi): Possibly implement the initialization bias correction
186186
# term from Adam (section 3 of https://arxiv.org/pdf/1412.6980v8.pdf).
187-
baseline = ema.average(loss)
187+
baseline = ema.average(reduced_loss)
188188
return baseline
189189

190190
return mean_baseline

‎tensorflow/contrib/cmake/tf_core_framework.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,21 @@ add_dependencies(tf_core_lib
177177
boringssl
178178
)
179179

180+
# Tricky setup to force always rebuilding
181+
# force_rebuild always runs forcing ${VERSION_INFO_CC} target to run
182+
# ${VERSION_INFO_CC} would cache, but it depends on a phony never produced
183+
# target.
184+
set(VERSION_INFO_CC ${tensorflow_source_dir}/tensorflow/core/util/version_info.cc)
185+
add_custom_target(force_rebuild_target ALL DEPENDS ${VERSION_INFO_CC})
186+
add_custom_command(OUTPUT __force_rebuild COMMAND cmake -E echo)
187+
add_custom_command(OUTPUT
188+
${VERSION_INFO_CC}
189+
COMMAND ${tensorflow_source_dir}/tensorflow/tools/git/gen_git_source.py
190+
--raw_generate ${VERSION_INFO_CC}
191+
DEPENDS __force_rebuild)
192+
193+
set(tf_version_srcs ${tensorflow_source_dir}/tensorflow/core/util/version_info.cc)
194+
180195

181196
########################################################
182197
# tf_core_framework library
@@ -208,6 +223,7 @@ list(REMOVE_ITEM tf_core_framework_srcs ${tf_core_framework_test_srcs})
208223

209224
add_library(tf_core_framework OBJECT
210225
${tf_core_framework_srcs}
226+
${tf_version_srcs}
211227
${PROTO_TEXT_HDRS}
212228
${PROTO_TEXT_SRCS})
213229
target_include_directories(tf_core_framework PUBLIC

‎tensorflow/contrib/learn/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
@@ModeKeys
2626
@@DNNClassifier
2727
@@DNNRegressor
28-
@@TensorFlowDNNClassifier
29-
@@TensorFlowDNNRegressor
3028
@@TensorFlowEstimator
3129
@@LinearClassifier
3230
@@LinearRegressor

‎tensorflow/contrib/learn/python/learn/estimators/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
from tensorflow.contrib.learn.python.learn.estimators.classifier import Classifier
2727
from tensorflow.contrib.learn.python.learn.estimators.dnn import DNNClassifier
2828
from tensorflow.contrib.learn.python.learn.estimators.dnn import DNNRegressor
29-
from tensorflow.contrib.learn.python.learn.estimators.dnn import TensorFlowDNNClassifier
30-
from tensorflow.contrib.learn.python.learn.estimators.dnn import TensorFlowDNNRegressor
3129
from tensorflow.contrib.learn.python.learn.estimators.dnn_linear_combined import DNNLinearCombinedClassifier
3230
from tensorflow.contrib.learn.python.learn.estimators.dnn_linear_combined import DNNLinearCombinedRegressor
3331
from tensorflow.contrib.learn.python.learn.estimators.estimator import BaseEstimator

‎tensorflow/contrib/learn/python/learn/estimators/dnn.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
from __future__ import division
2020
from __future__ import print_function
2121

22-
from tensorflow.contrib.learn.python.learn.estimators import _sklearn
2322
from tensorflow.contrib.learn.python.learn.estimators import dnn_linear_combined
24-
from tensorflow.contrib.learn.python.learn.estimators.base import DeprecatedMixin
2523
from tensorflow.python.ops import nn
2624

2725

@@ -279,14 +277,3 @@ def weights_(self):
279277
@property
280278
def bias_(self):
281279
return self.dnn_bias_
282-
283-
284-
# TensorFlowDNNClassifier and TensorFlowDNNRegressor are deprecated.
285-
class TensorFlowDNNClassifier(DeprecatedMixin, DNNClassifier,
286-
_sklearn.ClassifierMixin):
287-
pass
288-
289-
290-
class TensorFlowDNNRegressor(DeprecatedMixin, DNNRegressor,
291-
_sklearn.RegressorMixin):
292-
pass

0 commit comments

Comments
 (0)