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

Convert TensorFlow's jpeg dependency to new third party import method.

Browse Source 
PiperOrigin-RevId: 215948571
This commit is contained in:
A. Unique TensorFlower 2018-10-05 12:33:55 -07:00 committed by TensorFlower Gardener
parent c5bd63fd52
commit 6919ab5787
6 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tensorflow/workspace.bzl
View File

@ -22,10 +22,12 @@ load(
)
load("//third_party/flatbuffers:workspace.bzl", flatbuffers = "repo")
load("//third_party/icu:workspace.bzl", icu = "repo")
load("//third_party/jpeg:workspace.bzl", jpeg = "repo")
def initialize_third_party():
flatbuffers()
icu()
jpeg()
# Sanitize a dependency so that it works correctly from code that includes
# TensorFlow as a submodule.
@ -246,18 +248,6 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
],
)
tf_http_archive(
name = "jpeg",
build_file = clean_dep("//third_party/jpeg:jpeg.BUILD"),
sha256 = "f892fff427ab3adffc289363eac26d197ce3ccacefe5f5822377348a8166069b",
strip_prefix = "libjpeg-turbo-2.0.0",
system_build_file = clean_dep("//third_party/systemlibs:jpeg.BUILD"),
urls = [
"https://mirror.bazel.build/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",
],
)
tf_http_archive(
name = "png_archive",
build_file = clean_dep("//third_party:png.BUILD"),

2
third_party/jpeg/BUILD vendored
View File

@ -1 +1 @@
licenses(["notice"])
# Needed to make this a package.

11
third_party/jpeg/jpeg.BUILD → third_party/jpeg/BUILD.bazel vendored
View File

@ -162,9 +162,9 @@ cc_library(
hdrs = [
"simd/powerpc/jccolext-altivec.c",
"simd/powerpc/jcgryext-altivec.c",
"simd/powerpc/jcsample.h",
"simd/powerpc/jdcolext-altivec.c",
"simd/powerpc/jdmrgext-altivec.c",
"simd/powerpc/jcsample.h",
"simd/powerpc/jsimd_altivec.h",
],
copts = libjpegturbo_copts,
@ -186,7 +186,6 @@ cc_library(
"jsimd.h",
"jsimddct.h",
"simd/jsimd.h",
"simd/x86_64/jsimd.c",
"simd/x86_64/jccolor-avx2.o",
"simd/x86_64/jccolor-sse2.o",
"simd/x86_64/jcgray-avx2.o",
@ -213,6 +212,7 @@ cc_library(
"simd/x86_64/jquantf-sse2.o",
"simd/x86_64/jquanti-avx2.o",
"simd/x86_64/jquanti-sse2.o",
"simd/x86_64/jsimd.c",
"simd/x86_64/jsimdcpu.o",
],
copts = libjpegturbo_copts,
@ -322,9 +322,9 @@ cc_library(
"jpeglib.h",
"jsimd.h",
"jsimddct.h",
"simd/jsimd.h",
"simd/arm/jsimd.c",
"simd/arm/jsimd_neon.S",
"simd/jsimd.h",
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
@ -343,9 +343,9 @@ cc_library(
"jpeglib.h",
"jsimd.h",
"jsimddct.h",
"simd/jsimd.h",
"simd/arm64/jsimd.c",
"simd/arm64/jsimd_neon.S",
"simd/jsimd.h",
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
@ -366,7 +366,6 @@ cc_library(
"jsimd.h",
"jsimddct.h",
"simd/jsimd.h",
"simd/x86_64/jsimd.c",
"simd/x86_64/jccolor-avx2.obj",
"simd/x86_64/jccolor-sse2.obj",
"simd/x86_64/jcgray-avx2.obj",
@ -393,6 +392,7 @@ cc_library(
"simd/x86_64/jquantf-sse2.obj",
"simd/x86_64/jquanti-avx2.obj",
"simd/x86_64/jquanti-sse2.obj",
"simd/x86_64/jsimd.c",
"simd/x86_64/jsimdcpu.obj",
],
copts = libjpegturbo_copts,
@ -603,6 +603,7 @@ JCONFIGINT_WIN_SUBSTITUTIONS = {
}
JCONFIGINT_NOWIN_SUBSTITUTIONS.update(JCONFIGINT_COMMON_SUBSTITUTIONS)
JCONFIGINT_WIN_SUBSTITUTIONS.update(JCONFIGINT_COMMON_SUBSTITUTIONS)
template_rule(

0
third_party/systemlibs/jpeg.BUILD → third_party/jpeg/BUILD.system vendored
View File

1
third_party/jpeg/jpeg_helpers.BUILD.bazel vendored Normal file
View File

@ -0,0 +1 @@
licenses(["notice"])

17
third_party/jpeg/workspace.bzl vendored Normal file
View File

@ -0,0 +1,17 @@
"""loads the jpeg library, used by TF."""
load("//third_party:repo.bzl", "third_party_http_archive")
def repo():
third_party_http_archive(
name = "jpeg",
urls = [
"https://mirror.bazel.build/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",
],
sha256 = "f892fff427ab3adffc289363eac26d197ce3ccacefe5f5822377348a8166069b",
strip_prefix = "libjpeg-turbo-2.0.0",
build_file = "//third_party/jpeg:BUILD.bazel",
# build_file = clean_dep("//third_party/jpeg:jpeg.BUILD"),
system_build_file = "//third_party/jpeg:BUILD.system",
)