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

Simplifying jpeg library header, and adding jpeg build target under tensorflow/core/platform.

Browse Source 
PiperOrigin-RevId: 272099272
This commit is contained in:
Brian Zhao 2019-09-30 17:07:21 -07:00 committed by TensorFlower Gardener
parent 52143c2b49
commit 6f9c242cd0
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/core/BUILD
View File

@ -2571,7 +2571,7 @@ cc_library(
deps = [ deps = [
":lib", ":lib",
":lib_internal", ":lib_internal",
"//tensorflow/core/platform/default/build_config:jpeg", "//tensorflow/core/platform:jpeg",
], ],
) )
@ -2657,8 +2657,8 @@ cc_library(
linkopts = ["-ldl"], linkopts = ["-ldl"],
deps = [ deps = [
":core_stringpiece", ":core_stringpiece",
"//tensorflow/core/platform:jpeg",
"//tensorflow/core/platform:stringpiece", "//tensorflow/core/platform:stringpiece",
"//tensorflow/core/platform/default/build_config:jpeg",
"//tensorflow/core/platform/default/build_config:logging", "//tensorflow/core/platform/default/build_config:logging",
"@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",

8
tensorflow/core/platform/BUILD
View File

@ -242,6 +242,14 @@ cc_library(
], ],
) )
cc_library(
name = "jpeg",
hdrs = ["jpeg.h"],
deps = [
"@libjpeg_turbo//:jpeg",
],
)
cc_library( cc_library(
name = "load_library", name = "load_library",
textual_hdrs = ["load_library.h"], textual_hdrs = ["load_library.h"],

2
tensorflow/core/platform/default/build_config/BUILD
View File

@ -221,7 +221,7 @@ cc_library(
name = "jpeg", name = "jpeg",
copts = tf_copts(), copts = tf_copts(),
deps = [ deps = [
"@jpeg", "@libjpeg_turbo//:jpeg",
], ],
) )

14
tensorflow/core/platform/jpeg.h
View File

@ -16,22 +16,14 @@ limitations under the License.
#ifndef TENSORFLOW_CORE_PLATFORM_JPEG_H_ #ifndef TENSORFLOW_CORE_PLATFORM_JPEG_H_
#define 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 <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
extern "C" { extern "C" {
#include "jerror.h" #include "jerror.h" // TF:libjpeg_turbo
#include "jpeglib.h" #include "jpeglib.h" // TF:libjpeg_turbo
} }
#else
#error Define the appropriate PLATFORM_<foo> macro for this platform
#endif
#endif // TENSORFLOW_CORE_PLATFORM_JPEG_H_ #endif // TENSORFLOW_CORE_PLATFORM_JPEG_H_

4
tensorflow/tools/lib_package/BUILD
View File

@ -153,7 +153,7 @@ genrule(
"@highwayhash//:LICENSE", "@highwayhash//:LICENSE",
"@hwloc//:COPYING", "@hwloc//:COPYING",
"@icu//:icu4c/LICENSE", "@icu//:icu4c/LICENSE",
"@jpeg//:LICENSE.md", "@libjpeg_turbo//:LICENSE.md",
"@lmdb//:LICENSE", "@lmdb//:LICENSE",
"@local_config_sycl//sycl:LICENSE.text", "@local_config_sycl//sycl:LICENSE.text",
"@local_config_tensorrt//:LICENSE", "@local_config_tensorrt//:LICENSE",
@ -225,7 +225,7 @@ genrule(
"@highwayhash//:LICENSE", "@highwayhash//:LICENSE",
"@hwloc//:COPYING", "@hwloc//:COPYING",
"@icu//:icu4j/main/shared/licenses/LICENSE", "@icu//:icu4j/main/shared/licenses/LICENSE",
"@jpeg//:LICENSE.md", "@libjpeg_turbo//:LICENSE.md",
"@lmdb//:LICENSE", "@lmdb//:LICENSE",
"@local_config_sycl//sycl:LICENSE.text", "@local_config_sycl//sycl:LICENSE.text",
"@local_config_tensorrt//:LICENSE", "@local_config_tensorrt//:LICENSE",

2
tensorflow/tools/pip_package/BUILD
View File

@ -145,9 +145,9 @@ filegroup(
"@highwayhash//:LICENSE", "@highwayhash//:LICENSE",
"@hwloc//:COPYING", "@hwloc//:COPYING",
"@icu//:icu4c/LICENSE", "@icu//:icu4c/LICENSE",
"@jpeg//:LICENSE.md",
"@keras_applications_archive//:LICENSE", "@keras_applications_archive//:LICENSE",
"@kissfft//:COPYING", "@kissfft//:COPYING",
"@libjpeg_turbo//:LICENSE.md",
"@lmdb//:LICENSE", "@lmdb//:LICENSE",
"@local_config_mlir//:LICENSE.TXT", "@local_config_mlir//:LICENSE.TXT",
"@local_config_sycl//sycl:LICENSE.text", "@local_config_sycl//sycl:LICENSE.text",

2
third_party/jpeg/workspace.bzl vendored
View File

@ -4,7 +4,7 @@ load("//third_party:repo.bzl", "third_party_http_archive")
def repo(): def repo():
third_party_http_archive( third_party_http_archive(
name = "jpeg", name = "libjpeg_turbo",
urls = [ urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.0.tar.gz", "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", "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.0.tar.gz",

2
third_party/nasm/BUILD.bazel vendored
View File

@ -157,7 +157,7 @@ cc_binary(
"output", "output",
"x86", "x86",
], ],
visibility = ["@jpeg//:__pkg__"], visibility = ["@libjpeg_turbo//:__pkg__"],
) )
config_setting( config_setting(

2
third_party/nasm/BUILD.system vendored
View File

@ -8,5 +8,5 @@ filegroup(
sh_binary( sh_binary(
name = "nasm", name = "nasm",
srcs = ["nasm"], srcs = ["nasm"],
visibility = ["@jpeg//:__pkg__"], visibility = ["@libjpeg_turbo//:__pkg__"],
) )