From 6f9c242cd088bf2017566997c08aab95ff7dcee9 Mon Sep 17 00:00:00 2001 From: Brian Zhao Date: Mon, 30 Sep 2019 17:07:21 -0700 Subject: [PATCH] Simplifying jpeg library header, and adding jpeg build target under tensorflow/core/platform. PiperOrigin-RevId: 272099272 --- tensorflow/core/BUILD | 4 ++-- tensorflow/core/platform/BUILD | 8 ++++++++ .../core/platform/default/build_config/BUILD | 2 +- tensorflow/core/platform/jpeg.h | 14 +++----------- tensorflow/tools/lib_package/BUILD | 4 ++-- tensorflow/tools/pip_package/BUILD | 2 +- third_party/jpeg/workspace.bzl | 2 +- third_party/nasm/BUILD.bazel | 2 +- third_party/nasm/BUILD.system | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 82dd3b32c71..bc47b79fba7 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -2571,7 +2571,7 @@ cc_library( deps = [ ":lib", ":lib_internal", - "//tensorflow/core/platform/default/build_config:jpeg", + "//tensorflow/core/platform:jpeg", ], ) @@ -2657,8 +2657,8 @@ cc_library( linkopts = ["-ldl"], deps = [ ":core_stringpiece", + "//tensorflow/core/platform:jpeg", "//tensorflow/core/platform:stringpiece", - "//tensorflow/core/platform/default/build_config:jpeg", "//tensorflow/core/platform/default/build_config:logging", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/strings", diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD index dd993b56408..ed0a1072461 100644 --- a/tensorflow/core/platform/BUILD +++ b/tensorflow/core/platform/BUILD @@ -242,6 +242,14 @@ cc_library( ], ) +cc_library( + name = "jpeg", + hdrs = ["jpeg.h"], + deps = [ + "@libjpeg_turbo//:jpeg", + ], +) + cc_library( name = "load_library", textual_hdrs = ["load_library.h"], diff --git a/tensorflow/core/platform/default/build_config/BUILD b/tensorflow/core/platform/default/build_config/BUILD index 4f96be29ae6..670602f80cd 100644 --- a/tensorflow/core/platform/default/build_config/BUILD +++ b/tensorflow/core/platform/default/build_config/BUILD @@ -221,7 +221,7 @@ cc_library( name = "jpeg", copts = tf_copts(), deps = [ - "@jpeg", + "@libjpeg_turbo//:jpeg", ], ) diff --git a/tensorflow/core/platform/jpeg.h b/tensorflow/core/platform/jpeg.h index f98ddb8c98a..b6c7d9692cd 100644 --- a/tensorflow/core/platform/jpeg.h +++ b/tensorflow/core/platform/jpeg.h @@ -16,22 +16,14 @@ limitations under the License. #ifndef TENSORFLOW_CORE_PLATFORM_JPEG_H_ #define TENSORFLOW_CORE_PLATFORM_JPEG_H_ -#include "tensorflow/core/platform/platform.h" - -#if defined(PLATFORM_GOOGLE) && !defined(IS_MOBILE_PLATFORM) -#include "tensorflow/core/platform/google/build_config/jpeg.h" -#elif defined(PLATFORM_POSIX) || defined(PLATFORM_WINDOWS) || \ - defined(PLATFORM_POSIX_ANDROID) || defined(IS_MOBILE_PLATFORM) #include #include #include #include + extern "C" { -#include "jerror.h" -#include "jpeglib.h" +#include "jerror.h" // TF:libjpeg_turbo +#include "jpeglib.h" // TF:libjpeg_turbo } -#else -#error Define the appropriate PLATFORM_ macro for this platform -#endif #endif // TENSORFLOW_CORE_PLATFORM_JPEG_H_ diff --git a/tensorflow/tools/lib_package/BUILD b/tensorflow/tools/lib_package/BUILD index f7b9255092f..320e37b1d7f 100644 --- a/tensorflow/tools/lib_package/BUILD +++ b/tensorflow/tools/lib_package/BUILD @@ -153,7 +153,7 @@ genrule( "@highwayhash//:LICENSE", "@hwloc//:COPYING", "@icu//:icu4c/LICENSE", - "@jpeg//:LICENSE.md", + "@libjpeg_turbo//:LICENSE.md", "@lmdb//:LICENSE", "@local_config_sycl//sycl:LICENSE.text", "@local_config_tensorrt//:LICENSE", @@ -225,7 +225,7 @@ genrule( "@highwayhash//:LICENSE", "@hwloc//:COPYING", "@icu//:icu4j/main/shared/licenses/LICENSE", - "@jpeg//:LICENSE.md", + "@libjpeg_turbo//:LICENSE.md", "@lmdb//:LICENSE", "@local_config_sycl//sycl:LICENSE.text", "@local_config_tensorrt//:LICENSE", diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index 093c6c9c631..8085aefbcf4 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -145,9 +145,9 @@ filegroup( "@highwayhash//:LICENSE", "@hwloc//:COPYING", "@icu//:icu4c/LICENSE", - "@jpeg//:LICENSE.md", "@keras_applications_archive//:LICENSE", "@kissfft//:COPYING", + "@libjpeg_turbo//:LICENSE.md", "@lmdb//:LICENSE", "@local_config_mlir//:LICENSE.TXT", "@local_config_sycl//sycl:LICENSE.text", diff --git a/third_party/jpeg/workspace.bzl b/third_party/jpeg/workspace.bzl index 831e954779d..e2137ba949f 100644 --- a/third_party/jpeg/workspace.bzl +++ b/third_party/jpeg/workspace.bzl @@ -4,7 +4,7 @@ load("//third_party:repo.bzl", "third_party_http_archive") def repo(): third_party_http_archive( - name = "jpeg", + name = "libjpeg_turbo", urls = [ "https://storage.googleapis.com/mirror.tensorflow.org/github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.0.tar.gz", "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.0.tar.gz", diff --git a/third_party/nasm/BUILD.bazel b/third_party/nasm/BUILD.bazel index c68d7139464..703b3c320dd 100644 --- a/third_party/nasm/BUILD.bazel +++ b/third_party/nasm/BUILD.bazel @@ -157,7 +157,7 @@ cc_binary( "output", "x86", ], - visibility = ["@jpeg//:__pkg__"], + visibility = ["@libjpeg_turbo//:__pkg__"], ) config_setting( diff --git a/third_party/nasm/BUILD.system b/third_party/nasm/BUILD.system index 10ef8d88320..7f74da7595a 100644 --- a/third_party/nasm/BUILD.system +++ b/third_party/nasm/BUILD.system @@ -8,5 +8,5 @@ filegroup( sh_binary( name = "nasm", srcs = ["nasm"], - visibility = ["@jpeg//:__pkg__"], + visibility = ["@libjpeg_turbo//:__pkg__"], )