Skip to content

Commit 0235147

Browse files
authored
Update tensorflow commit to pick latest changes. (#23895)
1 parent d21ea44 commit 0235147

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

utils/build-script-impl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2444,10 +2444,12 @@ for host in "${ALL_HOSTS[@]}"; do
24442444
# problematic for overwriting/stripping symbols. Thus, write
24452445
# permission is added here.
24462446
for lib_name in tensorflow tensorflow_framework; do
2447-
lib="lib${lib_name}.so"
2447+
lib="lib${lib_name}.so*"
2448+
dylib="lib${lib_name}*.dylib"
24482449
rm -f "${TF_LIB_DIR}/${lib}"
2449-
chmod +w "${TENSORFLOW_HOST_LIB_DIR}/${lib}"
2450-
cp -p "${TENSORFLOW_HOST_LIB_DIR}/${lib}" "${TF_LIB_DIR}"
2450+
rm -f "${TF_LIB_DIR}/${dylib}"
2451+
find "${TENSORFLOW_HOST_LIB_DIR}" \( -name "${lib}" -o -name "${dylib}" \) -exec chmod +w {} +
2452+
find "${TENSORFLOW_HOST_LIB_DIR}" \( -name "${lib}" -o -name "${dylib}" \) -exec cp -p {} "${TF_LIB_DIR}" \;
24512453
done
24522454

24532455
if [[ ! "${TENSORFLOW_TARGET_LIB_DIR}" ]] ; then
@@ -3828,10 +3830,10 @@ for host in "${ALL_HOSTS[@]}"; do
38283830
mkdir -p "${TF_DEST_DIR}"
38293831
for lib_name in tensorflow tensorflow_framework
38303832
do
3831-
lib="lib${lib_name}.so"
3833+
lib="lib${lib_name}.so*"
3834+
dylib="lib${lib_name}*.dylib"
38323835
echo "${TF_LIBDIR}/${lib} => ${TF_DEST_DIR}"
3833-
rm -f "${TF_DEST_DIR}/${lib}"
3834-
cp -a "${TF_LIBDIR}/${lib}" "${TF_DEST_DIR}"
3836+
find "${TF_LIBDIR}" \( -name "${lib}" -o -name "${dylib}" \) -exec cp -a {} "${TF_DEST_DIR}" \;
38353837
done
38363838
continue
38373839
;;

utils/update_checkout/update-checkout-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
"swift-xcode-playground-support": "swift-DEVELOPMENT-SNAPSHOT-2018-11-26-a",
241241
"ninja": "253e94c1fa511704baeb61cf69995bbf09ba435e",
242242
"icu": "release-61-1",
243-
"tensorflow": "5e8df789cc30098d791475c14a623ec68b50b4ed",
243+
"tensorflow": "6c71cb2d20026c574d409539d25dbcd6f58f6990",
244244
"tensorflow-swift-bindings": "0957744551614e433dbabc725cba29ff5ddb91d3",
245245
"tensorflow-swift-apis": "5caa4600e0796cc04dc755f7d7c4befe7bd336cd"
246246
}

0 commit comments

Comments
 (0)