From e07ad649c5184b099f1006f62e0534d39ef39e78 Mon Sep 17 00:00:00 2001
From: Sergei Lebedev <slebedev@google.com>
Date: Mon, 17 Jun 2019 12:27:17 -0700
Subject: [PATCH] Ensure that gen_rnn_ops is loaded on TF import

This makes the corresponding ops available under tf.raw_ops.

PiperOrigin-RevId: 253635948
---
 .../api_def/base_api/api_def_BlockLSTM.pbtxt  |  1 +
 .../base_api/api_def_BlockLSTMGrad.pbtxt      |  1 +
 .../base_api/api_def_GRUBlockCell.pbtxt       |  1 +
 .../base_api/api_def_GRUBlockCellGrad.pbtxt   |  1 +
 .../base_api/api_def_LSTMBlockCell.pbtxt      |  1 +
 .../base_api/api_def_LSTMBlockCellGrad.pbtxt  |  1 +
 tensorflow/python/BUILD                       |  1 +
 tensorflow/python/__init__.py                 |  2 ++
 .../api/golden/v1/tensorflow.raw_ops.pbtxt    | 24 +++++++++++++++++++
 .../api/golden/v2/tensorflow.raw_ops.pbtxt    | 24 +++++++++++++++++++
 10 files changed, 57 insertions(+)

diff --git a/tensorflow/core/api_def/base_api/api_def_BlockLSTM.pbtxt b/tensorflow/core/api_def/base_api/api_def_BlockLSTM.pbtxt
index 9fed86bf5f1..e977dc30959 100644
--- a/tensorflow/core/api_def/base_api/api_def_BlockLSTM.pbtxt
+++ b/tensorflow/core/api_def/base_api/api_def_BlockLSTM.pbtxt
@@ -1,5 +1,6 @@
 op {
   graph_op_name: "BlockLSTM"
+  visibility: HIDDEN
   in_arg {
     name: "seq_len_max"
     description: <<END
diff --git a/tensorflow/core/api_def/base_api/api_def_BlockLSTMGrad.pbtxt b/tensorflow/core/api_def/base_api/api_def_BlockLSTMGrad.pbtxt
index fa0fe0c2f83..39a4eb40639 100644
--- a/tensorflow/core/api_def/base_api/api_def_BlockLSTMGrad.pbtxt
+++ b/tensorflow/core/api_def/base_api/api_def_BlockLSTMGrad.pbtxt
@@ -1,5 +1,6 @@
 op {
   graph_op_name: "BlockLSTMGrad"
+  visibility: HIDDEN
   in_arg {
     name: "seq_len_max"
     description: <<END
diff --git a/tensorflow/core/api_def/base_api/api_def_GRUBlockCell.pbtxt b/tensorflow/core/api_def/base_api/api_def_GRUBlockCell.pbtxt
index ca54eb72f24..b26f0fa5e31 100644
--- a/tensorflow/core/api_def/base_api/api_def_GRUBlockCell.pbtxt
+++ b/tensorflow/core/api_def/base_api/api_def_GRUBlockCell.pbtxt
@@ -1,5 +1,6 @@
 op {
   graph_op_name: "GRUBlockCell"
+  visibility: HIDDEN
   summary: "Computes the GRU cell forward propagation for 1 time step."
   description: <<END
 Args
diff --git a/tensorflow/core/api_def/base_api/api_def_GRUBlockCellGrad.pbtxt b/tensorflow/core/api_def/base_api/api_def_GRUBlockCellGrad.pbtxt
index d6075abb01c..d3256487509 100644
--- a/tensorflow/core/api_def/base_api/api_def_GRUBlockCellGrad.pbtxt
+++ b/tensorflow/core/api_def/base_api/api_def_GRUBlockCellGrad.pbtxt
@@ -1,5 +1,6 @@
 op {
   graph_op_name: "GRUBlockCellGrad"
+  visibility: HIDDEN
   summary: "Computes the GRU cell back-propagation for 1 time step."
   description: <<END
 Args
diff --git a/tensorflow/core/api_def/base_api/api_def_LSTMBlockCell.pbtxt b/tensorflow/core/api_def/base_api/api_def_LSTMBlockCell.pbtxt
index 2bba9ef33fe..37b2cd2c96d 100644
--- a/tensorflow/core/api_def/base_api/api_def_LSTMBlockCell.pbtxt
+++ b/tensorflow/core/api_def/base_api/api_def_LSTMBlockCell.pbtxt
@@ -1,5 +1,6 @@
 op {
   graph_op_name: "LSTMBlockCell"
+  visibility: HIDDEN
   in_arg {
     name: "x"
     description: <<END
diff --git a/tensorflow/core/api_def/base_api/api_def_LSTMBlockCellGrad.pbtxt b/tensorflow/core/api_def/base_api/api_def_LSTMBlockCellGrad.pbtxt
index 7171a7d1312..4257cc3e028 100644
--- a/tensorflow/core/api_def/base_api/api_def_LSTMBlockCellGrad.pbtxt
+++ b/tensorflow/core/api_def/base_api/api_def_LSTMBlockCellGrad.pbtxt
@@ -1,5 +1,6 @@
 op {
   graph_op_name: "LSTMBlockCellGrad"
+  visibility: HIDDEN
   in_arg {
     name: "x"
     description: <<END
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index d42d9694136..b18d9fa712f 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -154,6 +154,7 @@ py_library(
         ":platform",
         ":proto_ops",
         ":pywrap_tensorflow",
+        ":rnn_ops_gen",
         ":saver_test_utils",
         ":script_ops",
         ":session_ops",
diff --git a/tensorflow/python/__init__.py b/tensorflow/python/__init__.py
index 65ae6447872..76258242533 100644
--- a/tensorflow/python/__init__.py
+++ b/tensorflow/python/__init__.py
@@ -115,6 +115,8 @@ from tensorflow.python.ops import gen_boosted_trees_ops as _gen_boosted_trees_op
 # Import cudnn rnn ops to make sure their ops are registered.
 from tensorflow.python.ops import gen_cudnn_rnn_ops as _
 
+# Import rnn_ops to make sure their ops are registered.
+from tensorflow.python.ops import gen_rnn_ops as _
 
 # Import the names from python/training.py as train.Name.
 from tensorflow.python.training import training as train
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.raw_ops.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.raw_ops.pbtxt
index ca661f2a572..f0609b0e425 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.raw_ops.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.raw_ops.pbtxt
@@ -440,6 +440,14 @@ tf_module {
     name: "BitwiseXor"
     argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
+  member_method {
+    name: "BlockLSTM"
+    argspec: "args=[\'seq_len_max\', \'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'forget_bias\', \'cell_clip\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'3\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "BlockLSTMGrad"
+    argspec: "args=[\'seq_len_max\', \'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'i\', \'cs\', \'f\', \'o\', \'ci\', \'co\', \'h\', \'cs_grad\', \'h_grad\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "BoostedTreesAggregateStats"
     argspec: "args=[\'node_ids\', \'gradients\', \'hessians\', \'feature\', \'max_splits\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
@@ -1444,6 +1452,14 @@ tf_module {
     name: "FusedResizeAndPadConv2D"
     argspec: "args=[\'input\', \'size\', \'paddings\', \'filter\', \'mode\', \'strides\', \'padding\', \'resize_align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
   }
+  member_method {
+    name: "GRUBlockCell"
+    argspec: "args=[\'x\', \'h_prev\', \'w_ru\', \'w_c\', \'b_ru\', \'b_c\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "GRUBlockCellGrad"
+    argspec: "args=[\'x\', \'h_prev\', \'w_ru\', \'w_c\', \'b_ru\', \'b_c\', \'r\', \'u\', \'c\', \'d_h\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "Gather"
     argspec: "args=[\'params\', \'indices\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'None\'], "
@@ -1728,6 +1744,14 @@ tf_module {
     name: "LRNGrad"
     argspec: "args=[\'input_grads\', \'input_image\', \'output_image\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'5\', \'1\', \'1\', \'0.5\', \'None\'], "
   }
+  member_method {
+    name: "LSTMBlockCell"
+    argspec: "args=[\'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'forget_bias\', \'cell_clip\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'3\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "LSTMBlockCellGrad"
+    argspec: "args=[\'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'i\', \'cs\', \'f\', \'o\', \'ci\', \'co\', \'cs_grad\', \'h_grad\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "LeakyRelu"
     argspec: "args=[\'features\', \'alpha\', \'name\'], varargs=None, keywords=None, defaults=[\'0.2\', \'None\'], "
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.raw_ops.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.raw_ops.pbtxt
index ca661f2a572..f0609b0e425 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.raw_ops.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.raw_ops.pbtxt
@@ -440,6 +440,14 @@ tf_module {
     name: "BitwiseXor"
     argspec: "args=[\'x\', \'y\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
+  member_method {
+    name: "BlockLSTM"
+    argspec: "args=[\'seq_len_max\', \'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'forget_bias\', \'cell_clip\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'3\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "BlockLSTMGrad"
+    argspec: "args=[\'seq_len_max\', \'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'i\', \'cs\', \'f\', \'o\', \'ci\', \'co\', \'h\', \'cs_grad\', \'h_grad\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "BoostedTreesAggregateStats"
     argspec: "args=[\'node_ids\', \'gradients\', \'hessians\', \'feature\', \'max_splits\', \'num_buckets\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
@@ -1444,6 +1452,14 @@ tf_module {
     name: "FusedResizeAndPadConv2D"
     argspec: "args=[\'input\', \'size\', \'paddings\', \'filter\', \'mode\', \'strides\', \'padding\', \'resize_align_corners\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'None\'], "
   }
+  member_method {
+    name: "GRUBlockCell"
+    argspec: "args=[\'x\', \'h_prev\', \'w_ru\', \'w_c\', \'b_ru\', \'b_c\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "GRUBlockCellGrad"
+    argspec: "args=[\'x\', \'h_prev\', \'w_ru\', \'w_c\', \'b_ru\', \'b_c\', \'r\', \'u\', \'c\', \'d_h\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "Gather"
     argspec: "args=[\'params\', \'indices\', \'validate_indices\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \'None\'], "
@@ -1728,6 +1744,14 @@ tf_module {
     name: "LRNGrad"
     argspec: "args=[\'input_grads\', \'input_image\', \'output_image\', \'depth_radius\', \'bias\', \'alpha\', \'beta\', \'name\'], varargs=None, keywords=None, defaults=[\'5\', \'1\', \'1\', \'0.5\', \'None\'], "
   }
+  member_method {
+    name: "LSTMBlockCell"
+    argspec: "args=[\'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'forget_bias\', \'cell_clip\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'1\', \'3\', \'False\', \'None\'], "
+  }
+  member_method {
+    name: "LSTMBlockCellGrad"
+    argspec: "args=[\'x\', \'cs_prev\', \'h_prev\', \'w\', \'wci\', \'wcf\', \'wco\', \'b\', \'i\', \'cs\', \'f\', \'o\', \'ci\', \'co\', \'cs_grad\', \'h_grad\', \'use_peephole\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "LeakyRelu"
     argspec: "args=[\'features\', \'alpha\', \'name\'], varargs=None, keywords=None, defaults=[\'0.2\', \'None\'], "