From 0b19b8237a8bae784b33366c6912a2df5048a3a8 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 25 Apr 2019 15:11:00 -0700 Subject: [PATCH] Undo failed attempts at including kissfft PiperOrigin-RevId: 245315183 --- tensorflow/tools/pip_package/setup.py | 1 - third_party/kissfft/BUILD.bazel | 6 +----- third_party/kissfft/BUILD.system | 11 ----------- third_party/kissfft/workspace.bzl | 1 - third_party/systemlibs/syslibs_configure.bzl | 1 - 5 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 third_party/kissfft/BUILD.system diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 3ba7d3f48d9..cedf1491904 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -56,7 +56,6 @@ REQUIRED_PACKAGES = [ 'google_pasta >= 0.1.2', 'keras_applications >= 1.0.6', 'keras_preprocessing >= 1.0.5', - 'kissfft >= 1.3.0, < 1.3.1', 'numpy >= 1.14.5, < 2.0', 'six >= 1.10.0', 'protobuf >= 3.6.1', diff --git a/third_party/kissfft/BUILD.bazel b/third_party/kissfft/BUILD.bazel index bab35e145d5..a57cb6ebda4 100644 --- a/third_party/kissfft/BUILD.bazel +++ b/third_party/kissfft/BUILD.bazel @@ -4,11 +4,7 @@ package( licenses(["notice"]) # Apache 2.0 -filegroup( - name = "LICENSE", - srcs = glob(["LICENSES/**"]), - visibility = ["//visibility:public"], -) +exports_files(["LICENSE"]) cc_library( name = "kiss_fftr_16", diff --git a/third_party/kissfft/BUILD.system b/third_party/kissfft/BUILD.system deleted file mode 100644 index 6a42f52b7f1..00000000000 --- a/third_party/kissfft/BUILD.system +++ /dev/null @@ -1,11 +0,0 @@ -licenses(["notice"]) # MIT - -filegroup( - name = "LICENSE", - visibility = ["//visibility:public"], -) - -cc_library( - name = "kiss_fftr_16", - visibility = ["//visibility:public"], -) diff --git a/third_party/kissfft/workspace.bzl b/third_party/kissfft/workspace.bzl index f578d462ef6..6d16d165029 100644 --- a/third_party/kissfft/workspace.bzl +++ b/third_party/kissfft/workspace.bzl @@ -12,5 +12,4 @@ def repo(): "https://github.com/mborgerding/kissfft/archive/cddf3833fdf24fa84b79be37efdcd348cae0e39c.tar.gz", ], build_file = "//third_party/kissfft:BUILD.bazel", - system_build_file = "//third_party/kissfft:BUILD.system", ) diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl index d381a5580b0..a2d4123fd62 100644 --- a/third_party/systemlibs/syslibs_configure.bzl +++ b/third_party/systemlibs/syslibs_configure.bzl @@ -30,7 +30,6 @@ VALID_LIBS = [ "jpeg", "jsoncpp_git", "keras_applications_archive", - "kissfft", "lmdb", "nasm", "nsync",