Skip to content

Commit 19c9e5f

Browse files
authored
Merge pull request #26348 from bgogul/move_tensorflow
Move tensorflow commit to pick up shape inference API.
2 parents 60afcf8 + 87c1dbc commit 19c9e5f

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

stdlib/public/CTensorFlow/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ foreach(sdk ${TARGET_SDKS})
8282
copy_tf_headers("${adjusted_tf_include_dir}/tensorflow/c/c_api_experimental.h" c_api_experimental.h)
8383
copy_tf_headers("${adjusted_tf_include_dir}/tensorflow/c/tf_attrtype.h" tf_attrtype.h)
8484
copy_tf_headers("${adjusted_tf_include_dir}/tensorflow/c/tf_status.h" tf_status.h)
85+
copy_tf_headers("${adjusted_tf_include_dir}/tensorflow/c/tf_datatype.h" tf_datatype.h)
86+
copy_tf_headers("${adjusted_tf_include_dir}/tensorflow/c/tf_tensor.h" tf_tensor.h)
8587
copy_tf_headers("${adjusted_tf_include_dir}/tensorflow/c/eager/c_api.h" c_api_eager.h)
8688
copy_tf_headers("${CMAKE_CURRENT_SOURCE_DIR}/ctensorflow_init.h" ctensorflow_init.h)
8789

utils/fix-tf-headers.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ cp "$1" "$2"
1414
sed -i -e 's#include "'"$3"'tensorflow/c/c_api.h"#include "c_api.h"#g' "$2"
1515
sed -i -e 's#include "'"$3"'tensorflow/c/tf_attrtype.h"#include "tf_attrtype.h"#g' "$2"
1616
sed -i -e 's#include "'"$3"'tensorflow/c/tf_status.h"#include "tf_status.h"#g' "$2"
17+
sed -i -e 's#include "'"$3"'tensorflow/c/tf_datatype.h"#include "tf_datatype.h"#g' "$2"
18+
sed -i -e 's#include "'"$3"'tensorflow/c/tf_tensor.h"#include "tf_tensor.h"#g' "$2"
1719
sed -i -e 's#include "'"$3"'tensorflow/c/c_api_experimental.h"#include "c_api_experimental.h"#g' "$2"
1820
sed -i -e 's#include "'"$3"'tensorflow/c/eager/c_api.h"#include "c_api_eager.h"#g' "$2"

utils/update_checkout/update-checkout-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
"icu": "release-61-1",
445445
"clang-tools-extra": "swift-DEVELOPMENT-SNAPSHOT-2019-07-22-a",
446446
"libcxx": "swift-DEVELOPMENT-SNAPSHOT-2019-07-22-a",
447-
"tensorflow": "ebc41609e27dcf0998d8970e77a2e1f53e13ac86",
447+
"tensorflow": "fee0b38d6a2ce3e480c8b6643efe466b889036fa",
448448
"tensorflow-swift-apis": "4656fe74edcdd73d819435235254d1ec9c1dd6ff",
449449
"indexstore-db": "swift-DEVELOPMENT-SNAPSHOT-2019-07-22-a",
450450
"sourcekit-lsp": "swift-DEVELOPMENT-SNAPSHOT-2019-07-22-a"

0 commit comments

Comments
 (0)