systemlibs: unbundle pybind11

If pybind11 is installed on the system its headers are already captured
by @local_config_python//:python_headers, so the system lib only needs
to depend on that.

When installed correctly, includes should be #include "pybind11/...",
the bundled pybind11 is based off the source repo which does not match
the install paths. Use bazels strip_include_prefix to align the bundled
headers correctly.

Signed-off-by: Jason Zaman <jason@perfinion.com>

tensorflow/compiler/tf2tensorrt/utils/py_utils_wrapper.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <tuple>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/compiler/tf2tensorrt/utils/py_utils.h"
 
 std::tuple<int, int, int> get_linked_tensorrt_version() {

tensorflow/compiler/xla/python/bfloat16.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_COMPILER_XLA_PYTHON_BFLOAT16_H_
 #define TENSORFLOW_COMPILER_XLA_PYTHON_BFLOAT16_H_
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/compiler/xla/statusor.h"
 
 namespace xla {

tensorflow/compiler/xla/python/dlpack.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_COMPILER_XLA_PYTHON_DLPACK_H_
 #define TENSORFLOW_COMPILER_XLA_PYTHON_DLPACK_H_
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/compiler/xla/python/local_client.h"
 
 namespace xla {

tensorflow/compiler/xla/python/python_ref_manager.h

@@ -22,7 +22,7 @@ limitations under the License.
 #include "absl/container/inlined_vector.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/types/span.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 
 namespace xla {
 

tensorflow/compiler/xla/python/tpu_driver/client/tpu_client_extension.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/compiler/xla/python/python_ref_manager.h"
 #include "tensorflow/compiler/xla/python/tpu_driver/client/tpu_client.h"
 #include "tensorflow/compiler/xla/python/types.h"

tensorflow/compiler/xla/python/types.h

@@ -22,9 +22,9 @@ limitations under the License.
 #include "numpy/arrayobject.h"
 #include "absl/container/inlined_vector.h"
 #include "absl/types/optional.h"
-#include "include/pybind11/numpy.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/numpy.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/compiler/xla/literal.h"
 #include "tensorflow/compiler/xla/python/local_client.h"
 #include "tensorflow/compiler/xla/shape.h"

tensorflow/compiler/xla/python/xla.cc

@@ -24,10 +24,10 @@ limitations under the License.
 #include "absl/synchronization/mutex.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "include/pybind11/cast.h"
-#include "include/pybind11/numpy.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/cast.h"
+#include "pybind11/numpy.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/compiler/xla/client/client_library.h"
 #include "tensorflow/compiler/xla/client/lib/comparators.h"
 #include "tensorflow/compiler/xla/client/lib/math.h"

tensorflow/lite/experimental/support/codegen/python/codegen_lib.cc

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/detail/common.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/detail/common.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
 #include "tensorflow/lite/experimental/support/codegen/android_java_generator.h"
 #include "tensorflow/lite/experimental/support/codegen/code_generator.h"
 

tensorflow/lite/experimental/support/metadata/flatbuffers_lib/flatbuffers_lib.cc

@@ -15,9 +15,9 @@ limitations under the License.
 
 #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
 #include "flatbuffers/idl.h"  // from @flatbuffers
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
 
 namespace tflite {
 namespace support {

tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper_pybind11.cc

@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
 #include "tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 

tensorflow/lite/python/optimize/calibration_wrapper_pybind11.cc

@@ -12,8 +12,8 @@ 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.
 ==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/lite/python/optimize/calibration_wrapper.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 

tensorflow/lite/python/optimize/sparsification_wrapper_pybind11.cc

@@ -12,8 +12,8 @@ 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.
 ==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/lite/python/optimize/sparsification_wrapper.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 

tensorflow/lite/python/testdata/test_registerer_wrapper.cc

@@ -9,8 +9,8 @@ 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.
 ==============================================================================*/
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/lite/python/testdata/test_registerer.h"
 
 PYBIND11_MODULE(_pywrap_test_registerer, m) {

tensorflow/lite/testing/string_util_wrapper.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/lite/testing/string_util.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 

tensorflow/lite/tools/optimize/sparsity/python/format_converter_extension.cc

@@ -15,8 +15,8 @@ limitations under the License.
 
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/tools/optimize/sparsity/format_converter.h"
 

tensorflow/python/autograph/impl/testing/pybind_for_testing.cc

@@ -13,9 +13,9 @@
 // limitations under the License.
 // ==============================================================================
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
 
 namespace autograph {
 

tensorflow/python/client/debug_events_writer_wrapper.cc

@@ -14,8 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include "absl/strings/string_view.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/strings/stringprintf.h"
 #include "tensorflow/core/util/debug_events_writer.h"

tensorflow/python/client/device_lib_wrapper.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <string>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/framework/device_attributes.pb.h"

tensorflow/python/client/events_writer_wrapper.cc

@@ -14,8 +14,8 @@ limitations under the License.
 ==============================================================================*/
 
 #include "absl/strings/string_view.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/core/util/events_writer.h"
 #include "tensorflow/python/lib/core/pybind11_absl.h"
 #include "tensorflow/python/lib/core/pybind11_proto.h"

tensorflow/python/client/tf_session_wrapper.cc

@@ -15,11 +15,11 @@ limitations under the License.
 
 #include "Python.h"
 #include "absl/types/optional.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/c/c_api.h"
 #include "tensorflow/c/c_api_experimental.h"
 #include "tensorflow/c/c_api_internal.h"

tensorflow/python/data/service/server_lib_wrapper.cc

@@ -14,12 +14,12 @@ limitations under the License.
 ==============================================================================*/
 
 #include "Python.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
 #include "tensorflow/core/data/service/server_lib.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 #include "tensorflow/python/lib/core/pybind11_status.h"

tensorflow/python/framework/dtypes.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/detail/common.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/detail/common.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/framework/types.pb.h"
 

tensorflow/python/framework/memory_checker_test_helper.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <list>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 
 namespace py = pybind11;
 

tensorflow/python/framework/op_def_registry.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/op_def.pb.h"
 #include "tensorflow/core/framework/op_def_util.h"

tensorflow/python/framework/python_memory_checker_helper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 
 namespace py = pybind11;
 

tensorflow/python/framework/python_op_gen_wrapper.cc

@@ -16,7 +16,7 @@ limitations under the License.
 
 #include <Python.h>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/python/framework/python_op_gen.h"
 
 namespace py = pybind11;

tensorflow/python/grappler/cluster_wrapper.cc

@@ -24,8 +24,8 @@ limitations under the License.
 #include <unordered_map>
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/core/framework/kernel_def.pb.h"
 #include "tensorflow/core/framework/memory_types.h"
 #include "tensorflow/core/framework/op_def.pb.h"

tensorflow/python/grappler/cost_analyzer_wrapper.cc

@@ -17,7 +17,7 @@ limitations under the License.
 #include <sstream>
 #include <string>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/grappler/clusters/single_machine.h"
 #include "tensorflow/core/grappler/grappler_item.h"
 #include "tensorflow/core/grappler/grappler_item_builder.h"

tensorflow/python/grappler/graph_analyzer_tool_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/grappler/graph_analyzer/graph_analyzer_tool.h"
 
 PYBIND11_MODULE(_pywrap_graph_analyzer_tool, m) {

tensorflow/python/grappler/item_wrapper.cc

@@ -19,8 +19,8 @@ limitations under the License.
 #include <unordered_map>
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/node_def_util.h"
 #include "tensorflow/core/framework/op.h"

tensorflow/python/grappler/model_analyzer_wrapper.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <memory>
 #include <sstream>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/grappler/grappler_item_builder.h"
 #include "tensorflow/core/protobuf/meta_graph.pb.h"
 #include "tensorflow/python/grappler/model_analyzer.h"

tensorflow/python/grappler/tf_optimizer_wrapper.cc

@@ -18,7 +18,7 @@ limitations under the License.
 #include <string>
 #include <unordered_map>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/common_runtime/device.h"
 #include "tensorflow/core/common_runtime/device_factory.h"
 #include "tensorflow/core/framework/device_attributes.pb.h"

tensorflow/python/lib/core/bfloat16_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/python/lib/core/bfloat16.h"
 
 PYBIND11_MODULE(_pywrap_bfloat16, m) {

tensorflow/python/lib/core/py_exception_registry_wrapper.cc

@@ -17,8 +17,8 @@ limitations under the License.
 
 #include <array>
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/python/lib/core/py_exception_registry.h"
 
 namespace py = pybind11;

tensorflow/python/lib/core/py_func_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/python/lib/core/py_func.h"
 
 namespace py = pybind11;

tensorflow/python/lib/core/pybind11_absl.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_ABSL_H_
 #define TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_ABSL_H_
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/platform/stringpiece.h"
 
 #ifndef ABSL_USES_STD_STRING_VIEW

tensorflow/python/lib/core/pybind11_lib.h

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 
 #ifndef TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_LIB_H_
 #define TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_LIB_H_

tensorflow/python/lib/core/pybind11_proto.h

@@ -17,7 +17,7 @@ limitations under the License.
 #define TENSORFLOW_PYTHON_LIB_CORE_PYBIND11_PROTO_H_
 
 #include "absl/strings/str_cat.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 
 namespace tensorflow {
 

tensorflow/python/lib/core/pybind11_status.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <Python.h>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/c/tf_status.h"
 #include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/protobuf/error_codes.pb.h"

tensorflow/python/lib/io/file_io_wrapper.cc

@@ -17,8 +17,8 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/core/lib/core/error_codes.pb.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/status.h"

tensorflow/python/lib/io/record_io_wrapper.cc

@@ -17,7 +17,7 @@ limitations under the License.
 #include <string>
 
 #include "absl/memory/memory.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/lib/core/errors.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/lib/io/record_reader.h"

tensorflow/python/lite/toco_python_api_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/lite/toco/python/toco_python_api.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 

tensorflow/python/mlir_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/c/tf_status.h"
 #include "tensorflow/compiler/mlir/python/mlir.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"

tensorflow/python/platform/stacktrace_handler_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/platform/stacktrace_handler.h"
 
 namespace py = pybind11;

tensorflow/python/profiler/internal/profiler_wrapper.cc

@@ -16,8 +16,8 @@ limitations under the License.
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/core/platform/host_info.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/profiler/convert/xplane_to_profile_response.h"

tensorflow/python/profiler/internal/python_hooks.h

@@ -19,9 +19,9 @@ limitations under the License.
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
-#include "include/pybind11/cast.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/cast.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/profiler/lib/traceme.h"
 

tensorflow/python/profiler/internal/scoped_annotation_wrapper.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/profiler/lib/scoped_annotation.h"
 

tensorflow/python/profiler/internal/traceme_wrapper.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/profiler/lib/traceme.h"
 

tensorflow/python/tfcompile_wrapper.cc

@@ -15,10 +15,10 @@ limitations under the License.
 
 #include <string>
 
-#include "include/pybind11/cast.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/cast.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+#include "pybind11/stl.h"
 #include "tensorflow/compiler/aot/compile.h"
 #include "tensorflow/compiler/aot/flags.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"

tensorflow/python/tfe_wrapper.cc

@@ -16,11 +16,11 @@ limitations under the License.
 #include <memory>
 
 #include "Python.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/c/c_api.h"
 #include "tensorflow/c/c_api_experimental.h"
 #include "tensorflow/c/eager/c_api.h"

tensorflow/python/training/quantize_training_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/graph/quantize_training.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 #include "tensorflow/python/lib/core/pybind11_status.h"

tensorflow/python/util/kernel_registry_wrapper.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/python/util/kernel_registry.h"
 
 namespace py = pybind11;

tensorflow/python/util/port_wrapper.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/core/util/port.h"
 
 PYBIND11_MODULE(_pywrap_util_port, m) {

tensorflow/python/util/py_checkpoint_reader_wrapper.cc

@@ -18,11 +18,11 @@ limitations under the License.
 
 #include "numpy/arrayobject.h"
 #include "numpy/ufuncobject.h"
-#include "include/pybind11/chrono.h"
-#include "include/pybind11/complex.h"
-#include "include/pybind11/functional.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl.h"
+#include "pybind11/chrono.h"
+#include "pybind11/complex.h"
+#include "pybind11/functional.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 #include "tensorflow/c/checkpoint_reader.h"
 #include "tensorflow/c/tf_status.h"
 #include "tensorflow/core/lib/core/errors.h"

tensorflow/python/util/stat_summarizer_wrapper.cc

@@ -16,8 +16,8 @@ limitations under the License.
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/framework/step_stats.pb.h"
 #include "tensorflow/core/util/stat_summarizer.h"

tensorflow/python/util/tf_stack.cc

@@ -19,8 +19,8 @@ limitations under the License.
 #include <algorithm>
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/stl_bind.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl_bind.h"
 
 struct FrameSummary;  // Forward declaration.
 

tensorflow/python/util/tfprof_wrapper.cc

@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <string>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/profiler/internal/print_model_analysis.h"
 

tensorflow/python/util/transform_graph_wrapper.cc

@@ -16,7 +16,7 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "include/pybind11/pybind11.h"
+#include "pybind11/pybind11.h"
 #include "tensorflow/core/lib/strings/str_util.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/python/lib/core/pybind11_status.h"

tensorflow/python/util/util_wrapper.cc

@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "include/pybind11/pybind11.h"
-#include "include/pybind11/pytypes.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
 #include "tensorflow/python/lib/core/pybind11_lib.h"
 #include "tensorflow/python/util/util.h"
 

tensorflow/workspace.bzl

@@ -1034,6 +1034,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
         sha256 = "1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d",
         strip_prefix = "pybind11-2.4.3",
         build_file = clean_dep("//third_party:pybind11.BUILD"),
+        system_build_file = clean_dep("//third_party/systemlibs:pybind11.BUILD"),
     )
 
     tf_http_archive(

third_party/pybind11.BUILD

@@ -18,6 +18,7 @@ cc_library(
         "-Wno-pragma-once-outside-header",
     ],
     includes = ["include"],
+    strip_include_prefix = "include",
     deps = [
         "@org_tensorflow//third_party/python_runtime:headers",
     ],

third_party/systemlibs/pybind11.BUILD

@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "pybind11",
+    deps = [
+        "@org_tensorflow//third_party/python_runtime:headers",
+    ],
+)

third_party/systemlibs/syslibs_configure.bzl

@@ -37,6 +37,7 @@ VALID_LIBS = [
     "pasta",
     "pcre",
     "png",
+    "pybind11",
     "six_archive",
     "snappy",
     "swig",