diff options
| author |  Vijay Vasudevan <vrv@google.com> | 2015-12-10 16:42:22 -0800 |
|---|---|---|
| committer | Vijay Vasudevan <vrv@google.com> | 2015-12-10 16:42:22 -0800 |
| commit | d9cfc64a2ddf05c0b093c8fb6704c67452ee3ea0 (patch) | |
| tree | 0310b5935c816541c4cee940bf990dc627a97141 /tensorflow/core/common_runtime/function.h | |
| parent | 475edf8e949e9913e74d2f4b183f271198ecda86 (diff) | |
TensorFlow: merge changes from internal
Change 109945903
Make unsorted_segment_sum detect negative indices
Previously it crashed. This fixes #466.
Also improve the error message to say which index is problematic.
Change 109942557
Fix the conv_grad_input with stride 2.
+ We always call the Cudnn implementation even if we have an incompatible
padding.
Base CL: 109948577
Diffstat (limited to 'tensorflow/core/common_runtime/function.h')
| -rw-r--r-- | tensorflow/core/common_runtime/function.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/core/common_runtime/function.h b/tensorflow/core/common_runtime/function.h index 0028d2c55c..2595625155 100644 --- a/tensorflow/core/common_runtime/function.h +++ b/tensorflow/core/common_runtime/function.h @@ -33,7 +33,8 @@ namespace tensorflow { typedef std::function<void()> Closure; typedef std::function<void(Closure)> Runner; FunctionLibraryRuntime* NewFunctionLibraryRuntime( - Device* device, Runner runner, const FunctionLibraryDefinition* lib_def); + Device* device, Runner runner, int graph_def_version, + const FunctionLibraryDefinition* lib_def); // FunctionLibraryRuntime::GetFunctionBody returns a description of an // instantiated function that is represented as a Graph with arg/ret |