Skip to content

Commit 4d759ef

Browse files
aluebsaluebs
authored
Merge pull request #48 from mchinen/lyra0.0.2
Lyra 0.0.2
2 parents 7f967b9 + b2701d5 commit 4d759ef

File tree

121 files changed

+16176
-1347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+16176
-1347
lines changed

‎.bazelrc

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
1-
# By default, the linux x86 platform is targeted.
1+
# By default, the host platform is targeted with the default c toolchain,
2+
# likely using gcc/libstdc++ on Linux.
3+
#
24
# To select the android ARM64 platform, build with `--config=android_arm64`
35
#
4-
# Both platforms require an external toolchain (NDK or clang/libc++) that
6+
# The Android platform and the clang toolchain requires an external
7+
# toolchain (NDK with clang/libc++) that
58
# needs setup by the user. See README.md for instructions.
9+
#
10+
# If clang/libc++ is installed to /usr/local/ it can be used with linux builds
11+
# instead of the default (gcc) by building with `--config=clang_toolchain`.
12+
# Since this will provide no specific advantages for most users, and the process
13+
# of installing a specific clang toolchain is a bit involved, the documentation
14+
# for clang toolchain setup is in toolchain/
615

7-
build --crosstool_top=//toolchain:clang_suite
8-
build --cpu=k8
9-
16+
build --cxxopt=-std=gnu++17
17+
build --linkopt=-lm
18+
build --cxxopt=-Wno-sign-compare
1019
# Use the default C++ toolchain to build the tools used during the
1120
# build.
1221
build --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
1322

23+
build:clang_toolchain --crosstool_top=//toolchain:clang_suite
24+
build:clang_toolchain --cpu=k8
25+
1426
# Android
1527
build:android_arm64 --cpu=arm64-v8a
1628
build:android_arm64 --fat_apk_cpu=arm64-v8a

‎BUILD

Lines changed: 24 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# [internal] load cc_fuzz_target.bzl
22
# [internal] load cc_proto_library.bzl
33
# [internal] load android_cc_test:def.bzl
4-
# [internal] load open_source_rules.bzl
54

65
package(default_visibility = [":__subpackages__"])
76

@@ -48,7 +47,7 @@ cc_library(
4847
name = "layer_wrapper_interface",
4948
hdrs = ["layer_wrapper_interface.h"],
5049
deps = [
51-
":sparse_inference_matrixvector",
50+
"//sparse_matmul",
5251
],
5352
)
5453

@@ -58,7 +57,7 @@ cc_library(
5857
deps = [
5958
":dsp_util",
6059
":layer_wrapper_interface",
61-
":sparse_inference_matrixvector",
60+
"//sparse_matmul",
6261
"@com_google_glog//:glog",
6362
],
6463
)
@@ -68,7 +67,7 @@ cc_library(
6867
hdrs = ["conv1d_layer_wrapper.h"],
6968
deps = [
7069
":layer_wrapper",
71-
":sparse_inference_matrixvector",
70+
"//sparse_matmul",
7271
"@com_google_absl//absl/memory",
7372
"@com_google_glog//:glog",
7473
],
@@ -79,7 +78,7 @@ cc_library(
7978
hdrs = ["dilated_convolutional_layer_wrapper.h"],
8079
deps = [
8180
":layer_wrapper",
82-
":sparse_inference_matrixvector",
81+
"//sparse_matmul",
8382
"@com_google_absl//absl/memory",
8483
"@com_google_glog//:glog",
8584
],
@@ -90,7 +89,7 @@ cc_library(
9089
hdrs = ["transpose_convolutional_layer_wrapper.h"],
9190
deps = [
9291
":layer_wrapper",
93-
":sparse_inference_matrixvector",
92+
"//sparse_matmul",
9493
"@com_google_absl//absl/memory",
9594
"@com_google_glog//:glog",
9695
],
@@ -114,7 +113,7 @@ cc_library(
114113
":dsp_util",
115114
":layer_wrappers_lib",
116115
":lyra_types",
117-
":sparse_inference_matrixvector",
116+
"//sparse_matmul",
118117
"@com_google_absl//absl/memory",
119118
"@com_google_absl//absl/strings:str_format",
120119
"@com_google_absl//absl/types:span",
@@ -128,14 +127,12 @@ cc_library(
128127
hdrs = ["benchmark_decode_lib.h"],
129128
deps = [
130129
":architecture_utils",
130+
":dsp_util",
131131
":generative_model_interface",
132132
":log_mel_spectrogram_extractor_impl",
133133
":lyra_config",
134134
":wavegru_model_impl",
135135
"@com_google_absl//absl/base:core_headers",
136-
"@com_google_absl//absl/flags:flag",
137-
"@com_google_absl//absl/flags:parse",
138-
"@com_google_absl//absl/flags:usage",
139136
"@com_google_absl//absl/status",
140137
"@com_google_absl//absl/strings",
141138
"@com_google_absl//absl/time",
@@ -246,7 +243,7 @@ cc_library(
246243
":generative_model_interface",
247244
":lyra_types",
248245
":lyra_wavegru",
249-
":sparse_inference_matrixvector",
246+
"//sparse_matmul",
250247
"@com_google_absl//absl/memory",
251248
"@com_google_absl//absl/status",
252249
"@com_google_absl//absl/time",
@@ -275,7 +272,7 @@ cc_library(
275272
":generative_model_interface",
276273
":lyra_types",
277274
":lyra_wavegru",
278-
":sparse_inference_matrixvector",
275+
"//sparse_matmul",
279276
"@com_google_absl//absl/memory",
280277
"@com_google_absl//absl/status",
281278
"@com_google_absl//absl/time",
@@ -656,7 +653,7 @@ cc_library(
656653
copts = ["-O3"],
657654
deps = [
658655
":layer_wrapper",
659-
":sparse_inference_matrixvector",
656+
"//sparse_matmul",
660657
],
661658
)
662659

@@ -690,8 +687,8 @@ cc_library(
690687
],
691688
data = glob(["wavegru/**"]),
692689
deps = [
693-
":sparse_inference_matrixvector",
694690
":vector_quantizer_interface",
691+
"//sparse_matmul",
695692
"@com_google_absl//absl/memory",
696693
"@com_google_absl//absl/status",
697694
"@com_google_absl//absl/types:optional",
@@ -733,7 +730,7 @@ cc_library(
733730
":layer_wrappers_lib",
734731
":lyra_types",
735732
":project_and_sample",
736-
":sparse_inference_matrixvector",
733+
"//sparse_matmul",
737734
"@com_google_absl//absl/memory",
738735
"@com_google_absl//absl/time",
739736
"@com_google_absl//absl/types:span",
@@ -750,7 +747,7 @@ cc_library(
750747
copts = ["-O3"],
751748
deps = [
752749
":lyra_types",
753-
":sparse_inference_matrixvector",
750+
"//sparse_matmul",
754751
"@com_google_absl//absl/status",
755752
"@com_google_absl//absl/strings",
756753
"@com_google_absl//absl/time",
@@ -827,36 +824,6 @@ cc_test(
827824
],
828825
)
829826

830-
cc_test(
831-
name = "sparse_inference_matrixvector_test",
832-
size = "small",
833-
timeout = "short",
834-
srcs = ["sparse_inference_matrixvector_test.cc"],
835-
deps = [
836-
":sparse_inference_matrixvector",
837-
"@com_google_googletest//:gtest_main",
838-
],
839-
)
840-
841-
cc_library(
842-
name = "sparse_inference_matrixvector",
843-
srcs = select({
844-
":android_config": ["lib/android_arm64/libsparse_inference.so"],
845-
"//conditions:default": ["lib/linux_x86_64/libsparse_inference.so"],
846-
}),
847-
hdrs = ["sparse_inference_matrixvector.h"],
848-
defines = [
849-
"ACCURATE_TRANSCENDENTAL_APPROX",
850-
"FAST_SAMPLING",
851-
"FAST_TRANSCENDENTALS",
852-
"SIGMOID_AS_TANH",
853-
],
854-
deps = [
855-
"@com_google_absl//absl/status",
856-
"@com_google_glog//:glog",
857-
],
858-
)
859-
860827
cc_binary(
861828
name = "encoder_main",
862829
srcs = [
@@ -926,7 +893,7 @@ cc_test(
926893
":exported_layers_test",
927894
":lyra_config",
928895
":lyra_wavegru",
929-
":sparse_inference_matrixvector",
896+
"//sparse_matmul",
930897
"@com_google_absl//absl/strings:str_format",
931898
"@com_google_googletest//:gtest_main",
932899
"@gulrak_filesystem//:filesystem",
@@ -945,7 +912,7 @@ cc_test(
945912
deps = [
946913
":lyra_config",
947914
":lyra_wavegru",
948-
":sparse_inference_matrixvector",
915+
"//sparse_matmul",
949916
"@com_google_absl//absl/strings:str_format",
950917
"@com_google_googletest//:gtest_main",
951918
"@gulrak_filesystem//:filesystem",
@@ -964,7 +931,7 @@ cc_test(
964931
deps = [
965932
":lyra_config",
966933
":lyra_wavegru",
967-
":sparse_inference_matrixvector",
934+
"//sparse_matmul",
968935
"@com_google_absl//absl/strings:str_format",
969936
"@com_google_googletest//:gtest_main",
970937
"@gulrak_filesystem//:filesystem",
@@ -998,7 +965,7 @@ cc_test(
998965
":exported_layers_test",
999966
":lyra_types",
1000967
":project_and_sample",
1001-
":sparse_inference_matrixvector",
968+
"//sparse_matmul",
1002969
"@com_google_absl//absl/strings:str_format",
1003970
"@com_google_googletest//:gtest_main",
1004971
"@gulrak_filesystem//:filesystem",
@@ -1095,7 +1062,7 @@ cc_library(
10951062
deps = [
10961063
":layer_wrappers_lib",
10971064
":lyra_types",
1098-
":sparse_inference_matrixvector",
1065+
"//sparse_matmul",
10991066
"@com_google_absl//absl/random",
11001067
"@com_google_googletest//:gtest",
11011068
"@gulrak_filesystem//:filesystem",
@@ -1341,7 +1308,7 @@ cc_test(
13411308
":exported_layers_test",
13421309
":lyra_config",
13431310
":lyra_types",
1344-
":sparse_inference_matrixvector",
1311+
"//sparse_matmul",
13451312
"@com_google_absl//absl/types:span",
13461313
"@com_google_googletest//:gtest_main",
13471314
"@gulrak_filesystem//:filesystem",
@@ -1357,7 +1324,7 @@ cc_library(
13571324
visibility = ["//visibility:public"],
13581325
deps = [
13591326
":layer_wrappers_lib",
1360-
":sparse_inference_matrixvector",
1327+
"//sparse_matmul",
13611328
"@com_google_absl//absl/memory",
13621329
"@com_google_googletest//:gtest",
13631330
],
@@ -1381,7 +1348,7 @@ cc_test(
13811348
":conv1d_layer_wrapper",
13821349
":layer_wrapper",
13831350
":layer_wrapper_test_common",
1384-
":sparse_inference_matrixvector",
1351+
"//sparse_matmul",
13851352
"@com_google_googletest//:gtest_main",
13861353
"@gulrak_filesystem//:filesystem",
13871354
],
@@ -1405,7 +1372,7 @@ cc_test(
14051372
":dilated_convolutional_layer_wrapper",
14061373
":layer_wrapper",
14071374
":layer_wrapper_test_common",
1408-
":sparse_inference_matrixvector",
1375+
"//sparse_matmul",
14091376
"@com_google_googletest//:gtest_main",
14101377
"@gulrak_filesystem//:filesystem",
14111378
],
@@ -1428,8 +1395,8 @@ cc_test(
14281395
deps = [
14291396
":layer_wrapper",
14301397
":layer_wrapper_test_common",
1431-
":sparse_inference_matrixvector",
14321398
":transpose_convolutional_layer_wrapper",
1399+
"//sparse_matmul",
14331400
"@com_google_googletest//:gtest_main",
14341401
"@gulrak_filesystem//:filesystem",
14351402
],
@@ -1483,7 +1450,7 @@ cc_library(
14831450
],
14841451
hdrs = ["dsp_util.h"],
14851452
deps = [
1486-
":sparse_inference_matrixvector",
1453+
"//sparse_matmul",
14871454
"@com_google_absl//absl/types:optional",
14881455
"@com_google_absl//absl/types:span",
14891456
"@com_google_audio_dsp//audio/dsp:signal_vector_util",

0 commit comments

Comments
 (0)