From c31e64e34ee6367eed3e8fc0f5f6f30dae3a4ba0 Mon Sep 17 00:00:00 2001 From: Gogul Balakrishnan Date: Thu, 8 Aug 2019 08:44:34 -0700 Subject: [PATCH] Move tensorflow commit and swift-apis to pick changes. Migrate TFE_InferShapes to new API as well. make the funciton inline. Add a declaration to header. Remove TFE_InferShapes_Transition. Move swift-apis to latest commit. --- stdlib/public/CTensorFlow/ctensorflow_init.cpp | 13 ------------- stdlib/public/CTensorFlow/ctensorflow_init.h | 15 --------------- utils/update_checkout/update-checkout-config.json | 4 ++-- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/stdlib/public/CTensorFlow/ctensorflow_init.cpp b/stdlib/public/CTensorFlow/ctensorflow_init.cpp index 025db0cf38eab..56932a8b138bc 100644 --- a/stdlib/public/CTensorFlow/ctensorflow_init.cpp +++ b/stdlib/public/CTensorFlow/ctensorflow_init.cpp @@ -167,17 +167,4 @@ void *swift_tfc_CreateScalarStringTensor(char *val, int32_t valLen, return tensor; } -void TFE_InferShapes_Transition( - TFE_Op* op, TF_ShapeAndTypeList* input_shapes, - TF_Tensor** input_tensors, - TF_ShapeAndTypeList* input_tensor_as_shapes, - TF_ShapeAndTypeList** input_resource_shapes_and_types, - TF_ShapeAndTypeList** output_shapes, - TF_ShapeAndTypeList*** output_resource_shapes_and_types, TF_Status* status) { - TFE_InferShapes(op, input_shapes, input_tensors, /* num_tensors*/ 0, - input_tensor_as_shapes, input_resource_shapes_and_types, - output_shapes, output_resource_shapes_and_types, status); -} - - } // extern "C" diff --git a/stdlib/public/CTensorFlow/ctensorflow_init.h b/stdlib/public/CTensorFlow/ctensorflow_init.h index 89c0778288fed..b0ab1550de6fe 100644 --- a/stdlib/public/CTensorFlow/ctensorflow_init.h +++ b/stdlib/public/CTensorFlow/ctensorflow_init.h @@ -41,21 +41,6 @@ void *swift_tfc_CreateFloatTensor(int32_t num_dims, int64_t *dims, float *vals, void *swift_tfc_CreateScalarStringTensor(char *val, int32_t valLen, TF_Status *status); -struct TF_Tensor; -struct TF_ShapeAndTypeList; -struct TFE_Op; - -// We removed a redundant argument in the C shape inference API. -// This interface function lets us migrate swift-apis without breakages. -// (This is a temporary function and will be removed.) -void TFE_InferShapes_Transition( - TFE_Op* op, TF_ShapeAndTypeList* input_shapes, - TF_Tensor** input_tensors, - TF_ShapeAndTypeList* input_tensor_as_shapes, - TF_ShapeAndTypeList** input_resource_shapes_and_types, - TF_ShapeAndTypeList** output_shapes, - TF_ShapeAndTypeList*** output_resource_shapes_and_types, TF_Status* status); - #ifdef __cplusplus } /* end extern "C" */ #endif diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json index 56a81960207cd..181a06dd33271 100644 --- a/utils/update_checkout/update-checkout-config.json +++ b/utils/update_checkout/update-checkout-config.json @@ -455,8 +455,8 @@ "icu": "release-61-1", "clang-tools-extra": "swift-DEVELOPMENT-SNAPSHOT-2019-08-05-a", "libcxx": "swift-DEVELOPMENT-SNAPSHOT-2019-08-05-a", - "tensorflow": "fee0b38d6a2ce3e480c8b6643efe466b889036fa", - "tensorflow-swift-apis": "085217d35c02e07214f3ac99aab2ed0507cfc803", + "tensorflow": "c6719f20911f8aa6b6d9cded1c0f7761cb9c69a0", + "tensorflow-swift-apis": "8258171504d505c3fef99641213eeea2d1ba67fa", "indexstore-db": "swift-DEVELOPMENT-SNAPSHOT-2019-08-05-a", "sourcekit-lsp": "swift-DEVELOPMENT-SNAPSHOT-2019-08-05-a" }