diff --git a/WORKSPACE b/WORKSPACE index 388661cb..b3e8d97e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -36,7 +36,7 @@ protobuf_deps() git_repository( name = "com_google_absl", remote = "https://github.com/abseil/abseil-cpp.git", - tag = "20211102.0", + tag = "20220623.1", # Remove after https://github.com/abseil/abseil-cpp/issues/326 is solved. patches = [ "@//patches:com_google_absl_f863b622fe13612433fdf43f76547d5edda0c93001.diff" @@ -67,14 +67,20 @@ new_git_repository( # Audio DSP git_repository( name = "com_google_audio_dsp", - # TODO(b/231448719) use main google repo after merging PR for TF eigen compatibility. - remote = "https://github.com/mchinen/multichannel-audio-tools.git", + + remote = "https://github.com/google/multichannel-audio-tools.git", # There are no tags for this repo, we are synced to bleeding edge. - commit = "14a45c5a7c965e5ef01fe537bd816ce10a247813", + commit = "80892ee5252829701db4e57c9ecc3a825fa1e87c", repo_mapping = { "@com_github_glog_glog" : "@com_google_glog", "@eigen3": "@eigen_archive" - } + }, + patches = [ + "@//patches:multichannel-audio-tols_fix.patch" + ], + patch_args = [ + "-p1", + ] ) # Transitive dependencies of Audio DSP. @@ -97,7 +103,7 @@ git_repository( ) # Dependency for glog git_repository( - name = "com_github_gflags_gflags", + name = "gflags", remote = "https://github.com/mchinen/gflags.git", branch = "android_linking_fix" ) @@ -170,7 +176,13 @@ git_repository( remote = "https://github.com/tensorflow/tensorflow.git", # Below is reproducible and equivalent to `tag = "v2.11.0"` commit = "d5b57ca93e506df258271ea00fc29cf98383a374", - shallow_since = "1668561432 -0800" + shallow_since = "1668561432 -0800", + patches = [ + "@//patches:tensorflow_fix.patch" + ], + patch_args = [ + "-p1", + ] ) # Check bazel version requirement, which is stricter than TensorFlow's. diff --git a/patches/multichannel-audio-tols_fix.patch b/patches/multichannel-audio-tols_fix.patch new file mode 100644 index 00000000..e574eb24 --- /dev/null +++ b/patches/multichannel-audio-tols_fix.patch @@ -0,0 +1,37 @@ +From dc03c9744e98951737f4efb794a416a9f3295b4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADctor=20de=20Pedraza?= +Date: Mon, 7 Oct 2024 09:16:01 +0200 +Subject: [PATCH] use eigen3 as tensorflow + +add cstdint header +--- + audio/dsp/porting.h | 1 + + third_party/eigen3/BUILD | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/audio/dsp/porting.h b/audio/dsp/porting.h +index 56e45d2..e3296be 100644 +--- a/audio/dsp/porting.h ++++ b/audio/dsp/porting.h +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + using std::string; + +diff --git a/third_party/eigen3/BUILD b/third_party/eigen3/BUILD +index 497c1f0..de1c7f4 100644 +--- a/third_party/eigen3/BUILD ++++ b/third_party/eigen3/BUILD +@@ -23,6 +23,6 @@ cc_library( + ], + visibility = ["//visibility:public"], + deps = [ +- "@eigen_archive//:eigen", ++ "@eigen_archive//:eigen3", + ], + ) +-- +2.43.0 diff --git a/patches/tensorflow_fix.patch b/patches/tensorflow_fix.patch new file mode 100644 index 00000000..25be0a98 --- /dev/null +++ b/patches/tensorflow_fix.patch @@ -0,0 +1,21 @@ +From df9cf01f69c74ba650796903a2128f1e01c0e572 Mon Sep 17 00:00:00 2001 +From: Tom Bannink +Date: Fri, 5 May 2023 09:22:21 +0200 +Subject: [PATCH] Add missing `stdint.h` include + +--- + tensorflow/lite/kernels/internal/spectrogram.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tensorflow/lite/kernels/internal/spectrogram.cc b/tensorflow/lite/kernels/internal/spectrogram.cc +index a832962a38df1b..919eebeb3e703c 100644 +--- a/tensorflow/lite/kernels/internal/spectrogram.cc ++++ b/tensorflow/lite/kernels/internal/spectrogram.cc +@@ -17,6 +17,7 @@ limitations under the License. + + #include + #include ++#include + + #include "third_party/fft2d/fft.h" +