Replace load_variable from checkpoint in gmm and kmeans as it will be deprecated soon.

Change: 130957334

Author: tensorflower-gardener

tensorflow/contrib/factorization/python/ops/gmm.py

@@ -30,7 +30,6 @@
 from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators._sklearn import TransformerMixin
 from tensorflow.contrib.learn.python.learn.learn_io import data_feeder
-from tensorflow.contrib.learn.python.learn.utils import checkpoints
 from tensorflow.python.ops.control_flow_ops import with_dependencies
 
 
@@ -157,13 +156,13 @@ def transform(self, x, batch_size=None):
 
   def clusters(self):
     """Returns cluster centers."""
-    clusters = checkpoints.load_variable(self.model_dir,
-                                         gmm_ops.GmmAlgorithm.CLUSTERS_VARIABLE)
+    clusters = tf.contrib.framework.load_variable(
+        self.model_dir, gmm_ops.GmmAlgorithm.CLUSTERS_VARIABLE)
     return np.squeeze(clusters, 1)
 
   def covariances(self):
     """Returns the covariances."""
-    return checkpoints.load_variable(
+    return tf.contrib.framework.load_variable(
         self.model_dir,
         gmm_ops.GmmAlgorithm.CLUSTERS_COVS_VARIABLE)
 

tensorflow/contrib/factorization/python/ops/kmeans.py

@@ -28,7 +28,6 @@
 from tensorflow.contrib.learn.python.learn.estimators._sklearn import TransformerMixin
 from tensorflow.contrib.learn.python.learn.learn_io import data_feeder
 from tensorflow.contrib.learn.python.learn.monitors import BaseMonitor
-from tensorflow.contrib.learn.python.learn.utils import checkpoints
 from tensorflow.python.ops.control_flow_ops import with_dependencies
 
 SQUARED_EUCLIDEAN_DISTANCE = clustering_ops.SQUARED_EUCLIDEAN_DISTANCE
@@ -221,7 +220,7 @@ def transform(self, x, batch_size=None):
 
   def clusters(self):
     """Returns cluster centers."""
-    return checkpoints.load_variable(self.model_dir, self.CLUSTERS)
+    return tf.contrib.framework.load_variable(self.model_dir, self.CLUSTERS)
 
   def _get_train_ops(self, features, _):
     (_,