tensorflow-1.0.0.patch

diff --git a/tensorflow/core/distributed_runtime/rpc/BUILD b/tensorflow/core/distributed_runtime/rpc/BUILD
index 13e357c..c003365 100644
--- a/tensorflow/core/distributed_runtime/rpc/BUILD
+++ b/tensorflow/core/distributed_runtime/rpc/BUILD
@@ -289,7 +289,7 @@ cc_library(
     ],
 )
 
-cc_binary(
+cc_library(
     name = "grpc_tensorflow_server",
     srcs = [
         "grpc_tensorflow_server.cc",
@@ -462,3 +462,35 @@ tf_cuda_cc_test(
         "//tensorflow/core/kernels:variable_ops",
     ],
 )
+
+genrule(
+    name = "copy_jni_md_h",
+    srcs = select({
+        "//tensorflow:darwin": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
+        "//conditions:default": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
+    }),
+    outs = ["jni_md.h"],
+    cmd = "cp -f $< $@",
+)
+
+genrule(
+    name = "copy_jni_h",
+    srcs = ["@bazel_tools//tools/jdk:jni_header"],
+    outs = ["jni.h"],
+    cmd = "cp -f $< $@",
+)
+
+cc_binary(
+    name = "libbridge.so",
+    linkshared = 1,
+    includes = ["."],
+    srcs = [
+        "com_github_hdl_tensorflow_bridge_TFServer.cc",
+        "exception_jni.cc",
+        "jni_md.h",
+        "jni.h"
+    ],
+    deps = [
+        "grpc_tensorflow_server",
+    ],
+)
diff --git a/tensorflow/core/distributed_runtime/rpc/com_github_hdl_tensorflow_bridge_TFServer.cc b/tensorflow/core/distributed_runtime/rpc/com_github_hdl_tensorflow_bridge_TFServer.cc
new file mode 100644
index 0000000..1b8b69a
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/rpc/com_github_hdl_tensorflow_bridge_TFServer.cc
@@ -0,0 +1,100 @@
+#include <jni.h>
+#include <stdio.h>
+#include <iostream>
+#include <string>
+using namespace std;
+
+#include "exception_jni.h"
+#include "com_github_hdl_tensorflow_bridge_TFServer.h"
+#include "tensorflow/core/distributed_runtime/server_lib.h"
+
+using tensorflow::ServerDef;
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    createServer
+ * Signature: ([B)J
+ */
+JNIEXPORT jlong JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_createServer
+  (JNIEnv * env, jobject jobj, jbyteArray array) {
+
+  jbyte* elements = env->GetByteArrayElements(array, NULL);
+  jsize textLength = env->GetArrayLength(array);
+  char* b = new char[textLength + 1];
+  memcpy(b, elements, textLength);
+  b[textLength] = '\0';
+
+  env->ReleaseByteArrayElements(array, elements, JNI_ABORT);
+
+  std::unique_ptr< tensorflow::ServerInterface > *arg2 = (std::unique_ptr< tensorflow::ServerInterface > *) 0 ;
+  std::unique_ptr< tensorflow::ServerInterface > temp2 ;
+  arg2 = &temp2;
+
+  ServerDef *arg1 = 0 ;
+  tensorflow::ServerDef temp1 ;
+  if(!temp1.ParseFromString(string(b, textLength))) {
+    throwException(env, kTFServerException,
+                       "The ServerDef could not be parsed as a valid protocol buffer");
+    return -1;
+  }
+//  cout << temp1.DebugString() << "\n";
+  arg1 = &temp1;
+
+  tensorflow::Status status = tensorflow::NewServer((ServerDef const &)*arg1, arg2);
+  if (!status.ok()) {
+    throwException(env, kTFServerException, status.error_message().c_str());
+    return -1;
+  }
+
+  tensorflow::ServerInterface * server = arg2->release();
+  return (jlong)std::addressof(*server);
+}
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    startServer
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_startServer
+  (JNIEnv * env, jobject jobj, jlong serverAddr) {
+  long pointer = (long)serverAddr;
+  tensorflow::ServerInterface* server = (tensorflow::ServerInterface*)pointer;
+  server->Start();
+}
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    join
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_join
+  (JNIEnv * env, jobject jobj, jlong serverAddr) {
+  long pointer = (long)serverAddr;
+  tensorflow::ServerInterface* server = (tensorflow::ServerInterface*)pointer;
+  server->Join();
+}
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    stop
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_stop
+  (JNIEnv * env, jobject jobj, jlong serverAddr) {
+  long pointer = (long)serverAddr;
+  tensorflow::ServerInterface* server = (tensorflow::ServerInterface*)pointer;
+  server->Stop();
+}
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    target
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_target
+  (JNIEnv * env, jobject jobj, jlong serverAddr) {
+  long pointer = (long)serverAddr;
+  tensorflow::ServerInterface* server = (tensorflow::ServerInterface*)pointer;
+  string target = server->target();
+  return env->NewStringUTF(target.c_str());
+}
\ No newline at end of file
diff --git a/tensorflow/core/distributed_runtime/rpc/com_github_hdl_tensorflow_bridge_TFServer.h b/tensorflow/core/distributed_runtime/rpc/com_github_hdl_tensorflow_bridge_TFServer.h
new file mode 100644
index 0000000..215eeb8
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/rpc/com_github_hdl_tensorflow_bridge_TFServer.h
@@ -0,0 +1,53 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_github_hdl_tensorflow_bridge_TFServer */
+
+#ifndef _Included_com_github_hdl_tensorflow_bridge_TFServer
+#define _Included_com_github_hdl_tensorflow_bridge_TFServer
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    createServer
+ * Signature: ([B)J
+ */
+JNIEXPORT jlong JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_createServer
+  (JNIEnv *, jobject, jbyteArray);
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    startServer
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_startServer
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    join
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_join
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    stop
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_stop
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     com_github_hdl_tensorflow_bridge_TFServer
+ * Method:    target
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_github_hdl_tensorflow_bridge_TFServer_target
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/tensorflow/core/distributed_runtime/rpc/exception_jni.cc b/tensorflow/core/distributed_runtime/rpc/exception_jni.cc
new file mode 100644
index 0000000..76a0854
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/rpc/exception_jni.cc
@@ -0,0 +1,39 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+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.
+==============================================================================*/
+
+#include <stdarg.h>
+
+#include "exception_jni.h"
+
+const char kTFServerException[] = "org/tensorflow/bridge/TFServerException";
+const char kIllegalArgumentException[] = "java/lang/IllegalArgumentException";
+const char kIllegalStateException[] = "java/lang/IllegalStateException";
+const char kNullPointerException[] = "java/lang/NullPointerException";
+const char kIndexOutOfBoundsException[] = "java/lang/IndexOutOfBoundsException";
+const char kUnsupportedOperationException[] =
+    "java/lang/UnsupportedOperationException";
+
+void throwException(JNIEnv* env, const char* clazz, const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  char* message = nullptr;
+  if (vasprintf(&message, fmt, args) >= 0) {
+    printf("%s", message);
+    env->ThrowNew(env->FindClass(clazz), message);
+  } else {
+    env->ThrowNew(env->FindClass(clazz), "");
+  }
+  va_end(args);
+}
diff --git a/tensorflow/core/distributed_runtime/rpc/exception_jni.h b/tensorflow/core/distributed_runtime/rpc/exception_jni.h
new file mode 100644
index 0000000..cc2cda2
--- /dev/null
+++ b/tensorflow/core/distributed_runtime/rpc/exception_jni.h
@@ -0,0 +1,39 @@
+/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+
+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.
+==============================================================================*/
+
+#ifndef TENSORFLOW_JAVA_EXCEPTION_JNI_H_
+#define TENSORFLOW_JAVA_EXCEPTION_JNI_H_
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+class TF_Status;
+
+extern const char kTFServerException[];
+extern const char kIllegalArgumentException[];
+extern const char kIllegalStateException[];
+extern const char kNullPointerException[];
+extern const char kIndexOutOfBoundsException[];
+extern const char kUnsupportedOperationException[];
+
+void throwException(JNIEnv* env, const char* clazz, const char* fmt, ...);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
+#endif  // TENSORFLOW_JAVA_EXCEPTION_JNI_H_