aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/examples/learn/boston.py
diff options
context:
space:
mode:
authorGravatar Martin Wicke <wicke@google.com>2017-03-23 12:31:16 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-03-23 13:44:29 -0700
commitbc456e361d49d1d89a74b80060c70efb51fd7d87 (patch)
tree825e04287f1e2d2ac098ca3f0fdd4e361aefd68c /tensorflow/examples/learn/boston.py
parent8ca071456537e6c96ae8896c2a20b1f08b0e59d3 (diff)
Merge changes from github.
Change: 151046259
Diffstat (limited to 'tensorflow/examples/learn/boston.py')
-rw-r--r--tensorflow/examples/learn/boston.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tensorflow/examples/learn/boston.py b/tensorflow/examples/learn/boston.py
index 2986ff9106..19cfdee513 100644
--- a/tensorflow/examples/learn/boston.py
+++ b/tensorflow/examples/learn/boston.py
@@ -16,19 +16,22 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
-from sklearn import cross_validation
+
+from sklearn import datasets
+from sklearn import model_selection
from sklearn import metrics
from sklearn import preprocessing
+
import tensorflow as tf
def main(unused_argv):
# Load dataset
- boston = tf.contrib.learn.datasets.load_dataset('boston')
+ boston = datasets.load_boston()
x, y = boston.data, boston.target
# Split dataset into train / test
- x_train, x_test, y_train, y_test = cross_validation.train_test_split(
+ x_train, x_test, y_train, y_test = model_selection.train_test_split(
x, y, test_size=0.2, random_state=42)
# Scale data (training set) to 0 mean and unit standard deviation.