diff options
author | Patrick Nguyen <drpng@google.com> | 2017-04-14 08:52:16 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-04-14 10:17:10 -0700 |
commit | ba4bfd9208998d937ce740e2c2978889ec0c68be (patch) | |
tree | c3eac7737dd583c44743bf3936ecfe39101785a3 /tensorflow/contrib/linear_optimizer | |
parent | 69c064d3fe310676196f76f5a5eda45bf81845cf (diff) |
Add sdca ops to tf.train.
This adds:
* tf.train.sdca_optimizer
* tf.train.sdca_fprint
* tf.train.sdca_shrink_l1
which were previously documented, and prior to 1.0, in tf.sdca.
In 1.0, they were absent from tf.sdca, so this does not break
compatibility.
The module tf.sdca is removed.
Change: 153176548
Diffstat (limited to 'tensorflow/contrib/linear_optimizer')
-rw-r--r-- | tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py | 2 | ||||
-rw-r--r-- | tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py b/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py index eb1bdeff59..70f777f08b 100644 --- a/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py +++ b/tensorflow/contrib/linear_optimizer/python/kernel_tests/sdca_ops_test.py @@ -1058,7 +1058,7 @@ class SdcaFprintTest(SdcaModelTest): def testFprint(self): with self._single_threaded_test_session(): in_data = constant_op.constant(['abc', 'very looooooong string', 'def']) - out_data = gen_sdca_ops._sdca_fprint(in_data) + out_data = gen_sdca_ops.sdca_fprint(in_data) self.assertAllEqual([[4143508125394299908, -6879828354153669051], [5849691694103072671, -4874542629849009556], [603227410218889250, 8762207001949257490]], diff --git a/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py b/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py index d8f140f5ed..13f2f0f502 100644 --- a/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py +++ b/tensorflow/contrib/linear_optimizer/python/ops/sdca_ops.py @@ -307,7 +307,7 @@ class SdcaModel(object): sparse_features_values.append(sf.feature_values) # pylint: disable=protected-access - example_ids_hashed = gen_sdca_ops._sdca_fprint( + example_ids_hashed = gen_sdca_ops.sdca_fprint( internal_convert_to_tensor(self._examples['example_ids'])) # pylint: enable=protected-access example_state_data = self._hashtable.lookup(example_ids_hashed) @@ -328,7 +328,7 @@ class SdcaModel(object): sparse_weights.append(array_ops.gather(w, sparse_indices[-1])) # pylint: disable=protected-access - esu, sfw, dfw = gen_sdca_ops._sdca_optimizer( + esu, sfw, dfw = gen_sdca_ops.sdca_optimizer( sparse_example_indices, sparse_feature_indices, sparse_features_values, @@ -390,7 +390,7 @@ class SdcaModel(object): with ops.device(var.device): # pylint: disable=protected-access update_ops.append( - gen_sdca_ops._sdca_shrink_l1( + gen_sdca_ops.sdca_shrink_l1( self._convert_n_to_tensor( [var], as_ref=True), l1=self._symmetric_l1_regularization(), |