From c430e54c3c62f35845dc06a890729536b068fb46 Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Wed, 16 Nov 2016 21:16:20 -0800 Subject: [PATCH] Uprev tensorflow. (#33) * No longer need to hide ResourceHandle ops * Blacklisted not supported TensorArrayV2 * Ownership of feed tensors changed (1f0c5119a0230c5160d45496175b9256f097e144) --- tensorflow-core-ops/Setup.hs | 4 +--- tensorflow/src/TensorFlow/Internal/FFI.hs | 1 + third_party/tensorflow | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tensorflow-core-ops/Setup.hs b/tensorflow-core-ops/Setup.hs index 31842d9..25e93b9 100644 --- a/tensorflow-core-ops/Setup.hs +++ b/tensorflow-core-ops/Setup.hs @@ -75,6 +75,7 @@ blackList = , "QueueDequeueUpTo" , "Stack" , "TensorArray" + , "TensorArrayV2" -- These should be possible to support by adding a bunch of -- overloads with a variable number of tuple arguments. , "Assert" @@ -99,7 +100,4 @@ blackList = , "_ListToArray" -- Easy: support larger result tuples. , "Skipgram" - -- Can be removed after 139136489 is released. - , "ResourceGather" - , "ResourceScatterAdd" ] diff --git a/tensorflow/src/TensorFlow/Internal/FFI.hs b/tensorflow/src/TensorFlow/Internal/FFI.hs index 05a33b6..441fbfb 100644 --- a/tensorflow/src/TensorFlow/Internal/FFI.hs +++ b/tensorflow/src/TensorFlow/Internal/FFI.hs @@ -137,6 +137,7 @@ run session feeds fetches targets = do fetchNames tensorOuts (fromIntegral fetchesLen) ctargets (fromIntegral targetsLen) nullPtr + mapM_ Raw.deleteTensor feedTensors outTensors <- peekArray fetchesLen tensorOuts mapM createTensorData outTensors diff --git a/third_party/tensorflow b/third_party/tensorflow index 86f5ab7..3d41cf7 160000 --- a/third_party/tensorflow +++ b/third_party/tensorflow @@ -1 +1 @@ -Subproject commit 86f5ab7474825da756838b34e1b4eac93f5fc68a +Subproject commit 3d41cf77d624aeee0482f92121a9300b29db2809