Remove integral_types.h

This header provides non-standard aliases (`intXX`) for standard integer types (`intXX_t`). The code has been migrated to use standard spellings, so this header is no longer needed. PiperOrigin-RevId: 619174048
tensorflow · Mar 26, 2024 · 686d63b · 686d63b
1 parent 9358acf
commit 686d63b
Show file tree

Hide file tree

Showing 22 changed files with 3 additions and 103 deletions.
diff --git a/tensorflow_lite_support/cc/port/BUILD b/tensorflow_lite_support/cc/port/BUILD
@@ -39,13 +39,6 @@ cc_library_with_tflite(
     deps = ["//tensorflow_lite_support/cc/port/default:tflite_wrapper"],
 )
 
-cc_library(
-    name = "integral_types",
-    hdrs = ["integral_types.h"],
-    visibility = ["//tensorflow_lite_support:users"],
-    deps = ["//base:types"],
-)
-
 cc_library(
     name = "gtest_main",
     testonly = 1,

diff --git a/tensorflow_lite_support/cc/port/integral_types.h b/tensorflow_lite_support/cc/port/integral_types.h
diff --git a/tensorflow_lite_support/cc/task/audio/BUILD b/tensorflow_lite_support/cc/task/audio/BUILD
@@ -23,7 +23,6 @@ cc_library_with_tflite(
     ],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/audio/core:audio_buffer",
         "//tensorflow_lite_support/cc/task/audio/proto:audio_classifier_options_cc_proto",

diff --git a/tensorflow_lite_support/cc/task/audio/audio_classifier.cc b/tensorflow_lite_support/cc/task/audio/audio_classifier.cc
@@ -21,7 +21,6 @@ limitations under the License.
 #include "absl/strings/str_format.h"  // from @com_google_absl
 #include "tensorflow/lite/c/c_api_types.h"
 #include "tensorflow_lite_support/cc/common.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/task/audio/proto/audio_classifier_options.pb.h"
 #include "tensorflow_lite_support/cc/task/audio/proto/class_proto_inc.h"
 #include "tensorflow_lite_support/cc/task/audio/proto/classifications_proto_inc.h"

diff --git a/tensorflow_lite_support/cc/task/core/BUILD b/tensorflow_lite_support/cc/task/core/BUILD
@@ -129,7 +129,6 @@ cc_library(
     ],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core/proto:external_file_proto_inc",

diff --git a/tensorflow_lite_support/cc/task/vision/BUILD b/tensorflow_lite_support/cc/task/vision/BUILD
@@ -111,7 +111,6 @@ cc_library_with_tflite(
     ],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core:external_file_handler",
@@ -150,7 +149,6 @@ cc_library_with_tflite(
     visibility = ["//visibility:private"],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core:external_file_handler",
@@ -198,7 +196,6 @@ cc_library_with_tflite(
     ],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core:external_file_handler",
@@ -233,7 +230,6 @@ cc_library_with_tflite(
     visibility = ["//visibility:private"],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core:external_file_handler",
@@ -278,7 +274,6 @@ cc_library_with_tflite(
     ],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core:external_file_handler",
@@ -310,7 +305,6 @@ cc_library_with_tflite(
     visibility = ["//visibility:private"],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/core:external_file_handler",

diff --git a/tensorflow_lite_support/cc/task/vision/core/BUILD b/tensorflow_lite_support/cc/task/vision/core/BUILD
@@ -23,7 +23,6 @@ cc_library_with_tflite(
     deps = [
         ":frame_buffer",
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/task/core:task_utils",
         "//tensorflow_lite_support/cc/task/vision/proto:bounding_box_proto_inc",
@@ -42,7 +41,6 @@ cc_library(
     hdrs = ["frame_buffer.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:statusor",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",

diff --git a/tensorflow_lite_support/cc/task/vision/core/base_vision_task_api.h b/tensorflow_lite_support/cc/task/vision/core/base_vision_task_api.h
@@ -26,7 +26,6 @@ limitations under the License.
 #include "absl/time/clock.h"  // from @com_google_absl
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow_lite_support/cc/common.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
 #include "tensorflow_lite_support/cc/task/core/base_task_api.h"
 #include "tensorflow_lite_support/cc/task/core/task_utils.h"

diff --git a/tensorflow_lite_support/cc/task/vision/image_classifier.cc b/tensorflow_lite_support/cc/task/vision/image_classifier.cc
@@ -20,7 +20,6 @@ limitations under the License.
 #include "absl/strings/string_view.h"  // from @com_google_absl
 #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
 #include "tensorflow_lite_support/cc/common.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
 #include "tensorflow_lite_support/cc/task/core/task_api_factory.h"
 #include "tensorflow_lite_support/cc/task/core/task_utils.h"

diff --git a/tensorflow_lite_support/cc/task/vision/image_classifier.h b/tensorflow_lite_support/cc/task/vision/image_classifier.h
@@ -24,7 +24,6 @@ limitations under the License.
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow/lite/core/api/op_resolver.h"
 #include "tensorflow/lite/kernels/register.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/statusor.h"
 #include "tensorflow_lite_support/cc/task/core/external_file_handler.h"
 #include "tensorflow_lite_support/cc/task/vision/core/base_vision_task_api.h"

diff --git a/tensorflow_lite_support/cc/task/vision/image_embedder.h b/tensorflow_lite_support/cc/task/vision/image_embedder.h
@@ -21,7 +21,6 @@ limitations under the License.
 #include "absl/status/status.h"  // from @com_google_absl
 #include "tensorflow/lite/core/api/op_resolver.h"
 #include "tensorflow/lite/kernels/register.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/statusor.h"
 #include "tensorflow_lite_support/cc/task/core/external_file_handler.h"
 #include "tensorflow_lite_support/cc/task/processor/embedding_postprocessor.h"

diff --git a/tensorflow_lite_support/cc/task/vision/image_segmenter.cc b/tensorflow_lite_support/cc/task/vision/image_segmenter.cc
@@ -23,7 +23,6 @@ limitations under the License.
 #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow_lite_support/cc/common.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
 #include "tensorflow_lite_support/cc/task/core/task_api_factory.h"
 #include "tensorflow_lite_support/cc/task/core/task_utils.h"

diff --git a/tensorflow_lite_support/cc/task/vision/utils/BUILD b/tensorflow_lite_support/cc/task/vision/utils/BUILD
@@ -39,7 +39,6 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/vision/core:frame_buffer",
@@ -64,7 +63,6 @@ cc_library(
     deps = [
         ":frame_buffer_common_utils",
         ":libyuv_frame_buffer_utils",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/vision/core:frame_buffer",
@@ -91,7 +89,6 @@ cc_library(
     deps = [
         ":frame_buffer_common_utils",
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/vision/core:frame_buffer",
@@ -111,7 +108,6 @@ cc_library_with_tflite(
     ],
     deps = [
         "//tensorflow_lite_support/cc:common",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/metadata:metadata_schema_cc",
@@ -134,7 +130,6 @@ cc_library(
     ],
     deps = [
         ":frame_buffer_common_utils",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:status_macros",
         "//tensorflow_lite_support/cc/port:statusor",
         "//tensorflow_lite_support/cc/task/vision/core:frame_buffer",

diff --git a/tensorflow_lite_support/cc/task/vision/utils/image_tensor_specs.cc b/tensorflow_lite_support/cc/task/vision/utils/image_tensor_specs.cc
@@ -21,7 +21,6 @@ limitations under the License.
 #include "absl/strings/str_cat.h"  // from @com_google_absl
 #include "absl/types/optional.h"  // from @com_google_absl
 #include "tensorflow_lite_support/cc/common.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
 #include "tensorflow_lite_support/cc/port/statusor.h"
 #include "tensorflow_lite_support/cc/task/core/tflite_engine.h"

diff --git a/tensorflow_lite_support/cc/task/vision/utils/libyuv_frame_buffer_utils.cc b/tensorflow_lite_support/cc/task/vision/utils/libyuv_frame_buffer_utils.cc
@@ -27,7 +27,6 @@ limitations under the License.
 #include "libyuv/convert_argb.h"  // from @libyuv
 #include "libyuv/scale.h"  // from @libyuv
 #include "tensorflow_lite_support/cc/common.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
 #include "tensorflow_lite_support/cc/port/statusor.h"
 #include "tensorflow_lite_support/cc/task/vision/core/frame_buffer.h"

diff --git a/tensorflow_lite_support/cc/text/tokenizers/BUILD b/tensorflow_lite_support/cc/text/tokenizers/BUILD
@@ -1,11 +1,12 @@
-# This package contains C++ support libraries that Java libraries can invoke.
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
 load(
     "@org_tensorflow//tensorflow/lite:build_def.bzl",
     "tflite_copts",
     "tflite_jni_binary",
 )
 
+# This package contains C++ support libraries that Java libraries can invoke.
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
 package(
     default_visibility = ["//tensorflow_lite_support:users"],
     licenses = ["notice"],  # Apache 2.0
@@ -46,7 +47,6 @@ cc_library(
     ],
     deps = [
         ":tokenizer",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/utils:common_utils",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_googlesource_code_re2//:re2",

diff --git a/tensorflow_lite_support/cc/text/tokenizers/bert_tokenizer.cc b/tensorflow_lite_support/cc/text/tokenizers/bert_tokenizer.cc
@@ -17,8 +17,6 @@ limitations under the License.
 
 #include <cstdint>
 
-#include "tensorflow_lite_support/cc/port/integral_types.h"
-
 namespace tflite {
 namespace support {
 namespace text {

diff --git a/tensorflow_lite_support/scann_ondevice/cc/core/BUILD b/tensorflow_lite_support/scann_ondevice/cc/core/BUILD
@@ -50,7 +50,6 @@ cc_library(
         ":processor",
         ":serialized_searcher_cc_proto",
         ":top_n_amortized_constant",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "@com_google_absl//absl/types:span",
         "@com_google_glog//:glog",
         "@eigen_archive//:eigen3",
@@ -80,7 +79,6 @@ cc_library(
     deps = [
         ":serialized_searcher_cc_proto",
         ":top_n_amortized_constant",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "@com_google_glog//:glog",
         "@eigen_archive//:eigen3",
     ],
@@ -97,7 +95,6 @@ cc_test(
         ":serialized_searcher_cc_proto",
         ":top_n_amortized_constant",
         "//tensorflow_lite_support/cc/port:gtest_main",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:proto2",
         "@com_google_absl//absl/synchronization",
         "@com_google_glog//:glog",
@@ -124,7 +121,6 @@ cc_test(
         ":indexer",
         ":serialized_searcher_cc_proto",
         "//tensorflow_lite_support/cc/port:gtest_main",
-        "//tensorflow_lite_support/cc/port:integral_types",
         "//tensorflow_lite_support/cc/port:proto2",
         "@com_google_glog//:glog",
     ],

diff --git a/tensorflow_lite_support/scann_ondevice/cc/core/indexer_test.cc b/tensorflow_lite_support/scann_ondevice/cc/core/indexer_test.cc
@@ -20,7 +20,6 @@ limitations under the License.
 #include <glog/logging.h>
 #include "tensorflow_lite_support/cc/port/gmock.h"
 #include "tensorflow_lite_support/cc/port/gtest.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/proto2.h"
 #include "tensorflow_lite_support/cc/port/status_matchers.h"
 #include "tensorflow_lite_support/scann_ondevice/cc/core/serialized_searcher.pb.h"

diff --git a/tensorflow_lite_support/scann_ondevice/cc/core/searcher.h b/tensorflow_lite_support/scann_ondevice/cc/core/searcher.h
@@ -24,7 +24,6 @@ limitations under the License.
 #include <glog/logging.h>
 #include "absl/types/span.h"  // from @com_google_absl
 #include "Eigen/Core"  // from @eigen_archive
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/scann_ondevice/cc/core/index_table_sum.h"
 #include "tensorflow_lite_support/scann_ondevice/cc/core/processor.h"
 #include "tensorflow_lite_support/scann_ondevice/cc/core/serialized_searcher.pb.h"

diff --git a/tensorflow_lite_support/scann_ondevice/cc/core/searcher_test.cc b/tensorflow_lite_support/scann_ondevice/cc/core/searcher_test.cc
@@ -25,7 +25,6 @@ limitations under the License.
 #include "Eigen/Core"  // from @eigen_archive
 #include "tensorflow_lite_support/cc/port/gmock.h"
 #include "tensorflow_lite_support/cc/port/gtest.h"
-#include "tensorflow_lite_support/cc/port/integral_types.h"
 #include "tensorflow_lite_support/cc/port/proto2.h"
 #include "tensorflow_lite_support/scann_ondevice/cc/core/partitioner.h"
 #include "tensorflow_lite_support/scann_ondevice/cc/core/processor.h"

diff --git a/tensorflow_lite_support/scann_ondevice/cc/core/simd_utils.h b/tensorflow_lite_support/scann_ondevice/cc/core/simd_utils.h
@@ -27,8 +27,6 @@ limitations under the License.
 #include <cmath>
 #include <memory>
 
-#include "tensorflow_lite_support/cc/port/integral_types.h"
-
 namespace tflite {
 namespace scann_ondevice {
 namespace core {