experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove tensorflow/python/lib/core/strings.i. This is part of a larger effort to deprecate swig and eventually with modularization break pywrap_tensorflow into smaller components. It will also make exporting C++ ops to Python significantly easier. XLA is using the pybind11 macros already. Please refer to https://github.com/tensorflow/community/blob/master/rfcs/20190208-pybind11.md for more information.

Browse Source 
PiperOrigin-RevId: 293031503
Change-Id: Ib21a0616e8ca854218b9dc28fc37e4baaae62355
This commit is contained in:
Amit Patankar 2020-02-03 16:25:27 -08:00 committed by TensorFlower Gardener
parent e900c639a9
commit 69c32564a9
2 changed files with 0 additions and 124 deletions
tensorflow/python
BUILD
lib/core
strings.i

19
tensorflow/python/BUILD
View File

@ -45,24 +45,6 @@ exports_files(["LICENSE"])
exports_files(["platform/base.i"])
exports_files(
["lib/core/strings.i"],
visibility = [
"//bazel_pip/tensorflow/lite/toco/python:__pkg__",
"//engedu/ml/tf_from_scratch:__pkg__",
"//tensorflow:internal",
"//tensorflow/lite/toco/python:__pkg__",
"//tensorflow_model_optimization:__subpackages__",
"//tensorflow_models:__subpackages__",
"//third_party/cloud_tpu/convergence_tools:__subpackages__",
"//third_party/py/cleverhans:__subpackages__",
"//third_party/py/neural_structured_learning:__subpackages__",
"//third_party/py/reverb:__subpackages__",
"//third_party/py/tensorflow_examples:__subpackages__",
"//third_party/py/tf_slim:__subpackages__",
],
)
# Description:
py_library(
@ -5687,7 +5669,6 @@ tf_py_wrap_cc(
name = "pywrap_tensorflow_internal",
srcs = ["tensorflow.i"],
swig_includes = [
"lib/core/strings.i",
"platform/base.i",
],
# add win_def_file for pywrap_tensorflow

105
tensorflow/python/lib/core/strings.i
View File

@ -1,105 +0,0 @@
/* Copyright 2015 The TensorFlow Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
// Wrapper functions to provide a scripting-language-friendly interface
// to our string libraries.
//
// NOTE: as of 2005-01-13, this SWIG file is not used to generate a pywrap
// library for manipulation of various string-related types or access
// to the special string functions (Python has plenty). This SWIG file
// should be %import'd so that other SWIG wrappers have proper access
// to the types in //strings (such as the StringPiece object). We may
// generate a pywrap at some point in the future.
//
// NOTE: (Dan Ardelean) as of 2005-11-15 added typemaps to convert Java String
// arguments to C++ StringPiece& objects. This is required because a
// StringPiece class does not make sense - the code SWIG generates for a
// StringPiece class is useless, because it releases the buffer set in
// StringPiece after creating the object. C++ StringPiece objects rely on
// the buffer holding the data being allocated externally.
// NOTE: for now, we'll just start with what is needed, and add stuff
// as it comes up.
%{
#include "tensorflow/core/lib/core/stringpiece.h"
// Handles str in Python 2, bytes in Python 3.
// Returns true on success, false on failure.
bool _BytesToStringPiece(PyObject* obj, tensorflow::StringPiece* result) {
if (obj == Py_None) {
*result = tensorflow::StringPiece();
} else {
char* ptr;
Py_ssize_t len;
if (PyBytes_AsStringAndSize(obj, &ptr, &len) == -1) {
// Python has raised an error (likely TypeError or UnicodeEncodeError).
return false;
}
*result = tensorflow::StringPiece(ptr, len);
}
return true;
}
%}
%typemap(typecheck) tensorflow::StringPiece = char *;
%typemap(typecheck) const tensorflow::StringPiece & = char *;
// "tensorflow::StringPiece" arguments must be specified as a 'str' or 'bytes' object.
%typemap(in) tensorflow::StringPiece {
if (!_BytesToStringPiece($input, &$1)) SWIG_fail;
}
// "const tensorflow::StringPiece&" arguments can be provided the same as
// "tensorflow::StringPiece", whose typemap is defined above.
%typemap(in) const tensorflow::StringPiece & (tensorflow::StringPiece temp) {
if (!_BytesToStringPiece($input, &temp)) SWIG_fail;
$1 = &temp;
}
// C++ functions returning tensorflow::StringPiece will simply return bytes in
// Python, or None if the StringPiece contained a NULL pointer.
%typemap(out) tensorflow::StringPiece {
if ($1.data()) {
$result = PyBytes_FromStringAndSize($1.data(), $1.size());
} else {
Py_INCREF(Py_None);
$result = Py_None;
}
}
// Converts a C++ string vector to a list of Python bytes objects.
%typemap(out) std::vector<string> {
const int size = $1.size();
auto temp_string_list = tensorflow::make_safe(PyList_New(size));
if (!temp_string_list) {
SWIG_fail;
}
std::vector<tensorflow::Safe_PyObjectPtr> converted;
converted.reserve(size);
for (const string& op : $1) {
// Always treat strings as bytes, consistent with the typemap
// for string.
PyObject* py_str = PyBytes_FromStringAndSize(op.data(), op.size());
if (!py_str) {
SWIG_fail;
}
converted.emplace_back(tensorflow::make_safe(py_str));
}
for (int i = 0; i < converted.size(); ++i) {
PyList_SET_ITEM(temp_string_list.get(), i, converted[i].release());
}
$result = temp_string_list.release();
}