Changes to be able to use and generate proto files externally.

- Service options : deadline and fail_fast don't seem to be supported
  externally by gRPC, remove them.
- Script added to generate the proto and service files (generate_py_proto.sh)
- The generated files are added to the source code in order for Travis to work.
  env_service_generated_pb2.py and env_service_generated_pb2_grpc.py

PiperOrigin-RevId: 264512062

Author: afrozenator

oss_scripts/generate_py_proto.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# This script use the protoc compiler to generate the python code of the
+# all of our proto files.
+
+
+# Function to prepend a pylint directive to skip the generated python file.
+function pylint_skip_file() {
+  local file_name=$1
+  printf "%s\n%s" "# pylint: skip-file" "$(cat ${file_name})" > ${file_name}
+}
+
+
+# Setup tmp directories
+TMP_DIR=$(mktemp -d)
+TMP_TF_DIR=${TMP_DIR}/tensorflow
+TMP_T2T_DIR="$PWD"
+
+echo "Temporary directory created: "
+echo ${TMP_DIR}
+
+
+TMP_T2T_PROTO_DIR="${TMP_T2T_DIR}/tensor2tensor/envs"
+ENV_SERVICE_PROTO="${TMP_T2T_PROTO_DIR}/env_service.proto"
+if [ ! -f ${ENV_SERVICE_PROTO} ]; then
+    echo "${ENV_SERVICE_PROTO} not found."
+    echo "Please run this script from the appropriate root directory."
+fi
+
+# Clone tensorflow repository.
+git clone https://github.com/tensorflow/tensorflow.git ${TMP_TF_DIR}
+
+# Install gRPC tools.
+pip install grpcio-tools
+
+# Invoke the grpc protoc compiler on env_service.proto
+python -m grpc_tools.protoc \
+  --proto_path=${TMP_TF_DIR}/ \
+  --proto_path=${TMP_T2T_DIR}/ \
+  --python_out=${TMP_T2T_DIR}/ \
+  --grpc_python_out=${TMP_T2T_DIR}/ \
+  ${ENV_SERVICE_PROTO}
+
+# Add pylint ignore and name the file as generated.
+GENERATED_ENV_SERVICE_PY="${TMP_T2T_PROTO_DIR}/env_service_generated_pb2.py"
+GENERATED_ENV_SERVICE_GRPC_PY="${TMP_T2T_PROTO_DIR}/env_service_generated_pb2_grpc.py"
+mv ${TMP_T2T_PROTO_DIR}/env_service_pb2.py ${GENERATED_ENV_SERVICE_PY}
+mv ${TMP_T2T_PROTO_DIR}/env_service_pb2_grpc.py ${GENERATED_ENV_SERVICE_GRPC_PY}
+pylint_skip_file "${GENERATED_ENV_SERVICE_PY}"
+pylint_skip_file "${GENERATED_ENV_SERVICE_GRPC_PY}"
+
+
+LICENSING_TEXT=$(cat <<-END
+# coding=utf-8
+# Copyright 2019 The Tensor2Tensor Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+END
+)
+
+function add_licensing_text() {
+  local file_name=$1
+  printf "%s\n%s" "${LICENSING_TEXT}" "$(cat ${file_name})" > ${file_name}
+}
+
+add_licensing_text "${GENERATED_ENV_SERVICE_PY}"
+add_licensing_text "${GENERATED_ENV_SERVICE_GRPC_PY}"
+

tensor2tensor/envs/__init__.py

@@ -15,9 +15,25 @@
 
 """Environments defined in T2T. Imports here force registration."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+# Proto imports.
+
+
+# pylint: disable=g-import-not-at-top,g-statement-before-imports
+def _get_env_service():
+  from tensor2tensor.envs import env_service_generated_pb2 as env_service_pb2_
+  return env_service_pb2_
+
+
+def _get_env_service_grpc():
+  from tensor2tensor.envs import env_service_generated_pb2_grpc as env_service_pb2_grpc_
+  return env_service_pb2_grpc_
+# pylint: enable=g-import-not-at-top
+
+
+env_service_pb2 = _get_env_service()  # pylint: disable=invalid-name
+env_service_pb2_grpc = _get_env_service_grpc()  # pylint: disable=invalid-name
+del _get_env_service, _get_env_service_grpc
+# pylint: enable=g-statement-before-imports
 
 from gym.envs.registration import register
 
@@ -38,3 +54,4 @@ def register_env(env_class):
 # TODO(afrozm): Register TicTacToeEnv the same way.
 # register_env(tic_tac_toe_env.TicTacToeEnv)
 ClientEnv = register_env(client_env.ClientEnv)  # pylint: disable=invalid-name
+

tensor2tensor/envs/env_service.proto

@@ -1,11 +1,11 @@
 syntax = "proto3";
 option cc_enable_arenas = true;
 
-package third_party.py.tensor2tensor.trax.rlax.envs;
+package tensor2tensor.trax.rlax.envs;
 
-import "third_party/tensorflow/core/framework/tensor.proto";
-import "third_party/tensorflow/core/framework/tensor_shape.proto";
-import "third_party/tensorflow/core/framework/types.proto";
+import "tensorflow/core/framework/tensor.proto";
+import "tensorflow/core/framework/tensor_shape.proto";
+import "tensorflow/core/framework/types.proto";
 
 // We use tensorflow.TensorProto to represent numpy arrays.
 
@@ -89,30 +89,22 @@ message EnvInfoResponse {
 service EnvService {
   // Reset
   rpc Reset(ResetRequest) returns (ResetResponse) {
-    option fail_fast = true;
   }
 
   // Step
   rpc Step(StepRequest) returns (StepResponse) {
-    option fail_fast = true;
   }
 
   // Close
   rpc Close(CloseRequest) returns (CloseResponse) {
-    option fail_fast = true;
-    option deadline = 10;
   }
 
   // Render
   rpc Render(RenderRequest) returns (RenderResponse) {
-    option fail_fast = true;
-    option deadline = 10;
   }
 
   // Observation and Action Space.
   rpc GetEnvInfo(EnvInfoRequest) returns (EnvInfoResponse) {
-    option fail_fast = true;
-    option deadline = 10;
   }
 }