diff options
author | bstriner <bstriner@gmail.com> | 2018-08-14 04:48:11 -0400 |
---|---|---|
committer | bstriner <bstriner@gmail.com> | 2018-08-14 04:48:11 -0400 |
commit | 26e7d51fee4ecfaeffbfad7beaf6952b3132b444 (patch) | |
tree | 662a88fa4dece905485a1d7c3f454f0b59e43acc | |
parent | 285273717d17c0609c49e020b4cc9220913d3558 (diff) |
py37
-rwxr-xr-x[-rw-r--r--] | tensorflow/c/eager/c_api.cc | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | tensorflow/python/eager/pywrap_tfe.h | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tensorflow/python/pywrap_tfe.i | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | tensorflow/workspace.bzl | 24 |
4 files changed, 20 insertions, 20 deletions
diff --git a/tensorflow/c/eager/c_api.cc b/tensorflow/c/eager/c_api.cc index ce5a3f29a4..1ccae3f138 100644..100755 --- a/tensorflow/c/eager/c_api.cc +++ b/tensorflow/c/eager/c_api.cc @@ -244,8 +244,8 @@ void TFE_ContextOptionsSetConfig(TFE_ContextOptions* options, const void* proto, } void TFE_ContextOptionsSetAsync(TFE_ContextOptions* options, - unsigned char async_) { - options->async = async_; + unsigned char enable) { + options->async = enable; } void TFE_ContextOptionsSetDevicePlacementPolicy( TFE_ContextOptions* options, TFE_ContextDevicePlacementPolicy policy) { @@ -253,9 +253,9 @@ void TFE_ContextOptionsSetDevicePlacementPolicy( } TF_CAPI_EXPORT extern void TFE_ContextSetAsyncForThread(TFE_Context* ctx, - unsigned char async_, + unsigned char enable, TF_Status* status) { - status->status = ctx->context.SetAsyncForThread(async_); + status->status = ctx->context.SetAsyncForThread(enable); } void TFE_DeleteContextOptions(TFE_ContextOptions* options) { delete options; } diff --git a/tensorflow/python/eager/pywrap_tfe.h b/tensorflow/python/eager/pywrap_tfe.h index a916a75f00..823c4078b8 100644..100755 --- a/tensorflow/python/eager/pywrap_tfe.h +++ b/tensorflow/python/eager/pywrap_tfe.h @@ -89,7 +89,7 @@ int MaybeRaiseExceptionFromStatus(const tensorflow::Status& status, PyObject* exception); // Returns the string associated with the passed-in python object. -char* TFE_GetPythonString(PyObject* o); +const char* TFE_GetPythonString(PyObject* o); // Returns a unique id on each call. int64_t get_uid(); diff --git a/tensorflow/python/pywrap_tfe.i b/tensorflow/python/pywrap_tfe.i index 157f2341e0..bc02e9a35c 100644..100755 --- a/tensorflow/python/pywrap_tfe.i +++ b/tensorflow/python/pywrap_tfe.i @@ -106,19 +106,19 @@ limitations under the License. } %typemap(in) const char* serialized_function_def { - $1 = TFE_GetPythonString($input); + $1 = const_cast<char*>(TFE_GetPythonString($input)); } %typemap(in) const char* device_name { if ($input == Py_None) { $1 = nullptr; } else { - $1 = TFE_GetPythonString($input); + $1 = const_cast<char*>(TFE_GetPythonString($input)); } } %typemap(in) const char* op_name { - $1 = TFE_GetPythonString($input); + $1 = const_cast<char*>(TFE_GetPythonString($input)); } %typemap(in) (TFE_Context*) { diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 7138c0a452..769e74d5a5 100644..100755 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -362,11 +362,11 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): tf_http_archive( name = "protobuf_archive", urls = [ - "https://mirror.bazel.build/github.com/google/protobuf/archive/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.tar.gz", - "https://github.com/google/protobuf/archive/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.tar.gz", + "https://mirror.bazel.build/github.com/google/protobuf/archive/fe2eef4bf414ebb352cf11bcec633f1fd46ec876.tar.gz", + "https://github.com/google/protobuf/archive/fe2eef4bf414ebb352cf11bcec633f1fd46ec876.tar.gz", ], - sha256 = "4bb48bcc972ee9d40a8bb7e481522030b6e6771a7283ae83c896872115180d25", - strip_prefix = "protobuf-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7", + sha256 = "b91b0ac9907af983877c960809dcad7a6dc8e4b06e34d32b7d66a12b9ea1fa17", + strip_prefix = "protobuf-fe2eef4bf414ebb352cf11bcec633f1fd46ec876", ) # We need to import the protobuf library under the names com_google_protobuf @@ -375,21 +375,21 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): tf_http_archive( name = "com_google_protobuf", urls = [ - "https://mirror.bazel.build/github.com/google/protobuf/archive/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.tar.gz", - "https://github.com/google/protobuf/archive/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.tar.gz", + "https://mirror.bazel.build/github.com/google/protobuf/archive/fe2eef4bf414ebb352cf11bcec633f1fd46ec876.tar.gz", + "https://github.com/google/protobuf/archive/fe2eef4bf414ebb352cf11bcec633f1fd46ec876.tar.gz", ], - sha256 = "4bb48bcc972ee9d40a8bb7e481522030b6e6771a7283ae83c896872115180d25", - strip_prefix = "protobuf-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7", + sha256 = "b91b0ac9907af983877c960809dcad7a6dc8e4b06e34d32b7d66a12b9ea1fa17", + strip_prefix = "protobuf-fe2eef4bf414ebb352cf11bcec633f1fd46ec876", ) tf_http_archive( name = "com_google_protobuf_cc", urls = [ - "https://mirror.bazel.build/github.com/google/protobuf/archive/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.tar.gz", - "https://github.com/google/protobuf/archive/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.tar.gz", + "https://mirror.bazel.build/github.com/google/protobuf/archive/fe2eef4bf414ebb352cf11bcec633f1fd46ec876.tar.gz", + "https://github.com/google/protobuf/archive/fe2eef4bf414ebb352cf11bcec633f1fd46ec876.tar.gz", ], - sha256 = "4bb48bcc972ee9d40a8bb7e481522030b6e6771a7283ae83c896872115180d25", - strip_prefix = "protobuf-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7", + sha256 = "b91b0ac9907af983877c960809dcad7a6dc8e4b06e34d32b7d66a12b9ea1fa17", + strip_prefix = "protobuf-fe2eef4bf414ebb352cf11bcec633f1fd46ec876", ) tf_http_archive( |