diff --git a/.bazelrc b/.bazelrc index 223a550..426ff74 100644 --- a/.bazelrc +++ b/.bazelrc @@ -11,9 +11,9 @@ build:release --compilation_mode=opt build:release --linkopt=-Wl,--strip-all build:release --stamp -build:linux/x86_64 --platforms //riva:linux_x86_64 -build:linux/aarch64 --platforms //riva:linux_aarch64 -build:l4t/aarch64 --platforms //riva:linux_aarch64 +build:linux/x86_64 --platforms //nemotronspeech:linux_x86_64 +build:linux/aarch64 --platforms //nemotronspeech:linux_aarch64 +build:l4t/aarch64 --platforms //nemotronspeech:linux_aarch64 build:asan --strip=never build:asan --copt=-fsanitize=address diff --git a/.circleci/config.yml b/.circleci/config.yml index 238bafe..9eb548f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,10 +40,10 @@ jobs: name: "Collect artifacts" command: | mkdir /tmp/artifacts; - cp bazel-bin/riva/clients/asr/riva_asr_client /tmp/artifacts/riva_asr_client-linux-amd64; - cp bazel-bin/riva/clients/asr/riva_streaming_asr_client /tmp/artifacts/riva_streaming_asr_client-linux-amd64; - cp bazel-bin/riva/clients/tts/riva_tts_client /tmp/artifacts/riva_tts_client-linux-amd64; - cp bazel-bin/riva/clients/tts/riva_tts_perf_client /tmp/artifacts/riva_tts_perf_client-linux-amd64; + cp bazel-bin/nemotronspeech/clients/asr/nemotron_asr_client /tmp/artifacts/nemotron_asr_client-linux-amd64; + cp bazel-bin/nemotronspeech/clients/asr/nemotron_streaming_asr_client /tmp/artifacts/nemotron_streaming_asr_client-linux-amd64; + cp bazel-bin/nemotronspeech/clients/tts/nemotron_tts_client /tmp/artifacts/nemotron_tts_client-linux-amd64; + cp bazel-bin/nemotronspeech/clients/tts/nemotron_tts_perf_client /tmp/artifacts/nemotron_tts_perf_client-linux-amd64; - store_artifacts: path: /tmp/artifacts diff --git a/README.md b/README.md index 6092fe8..14c5681 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,23 @@ [![CircleCI](https://circleci.com/gh/nvidia-riva/cpp-clients.svg?style=shield)](https://circleci.com/gh/nvidia-riva/cpp-clients) [![License](https://img.shields.io/badge/license-MIT-green)](https://opensource.org/licenses/MIT) -# NVIDIA Riva Clients +# NVIDIA Nemotron Speech Clients -NVIDIA Riva is a GPU-accelerated SDK for building Speech AI applications that are customized for your use case and deliver real-time performance. This repo provides performant client example command-line clients. +NVIDIA Nemotron Speech is a GPU-accelerated SDK for building Speech AI applications that are customized for your use case and deliver real-time performance. This repo provides performant client example command-line clients. ## Features - **Automatic Speech Recognition (ASR)** - - `riva_streaming_asr_client` - - `riva_asr_client` + - `nemotron_streaming_asr_client` + - `nemotron_asr_client` - **Speech Synthesis (TTS)** - - `riva_tts_client` - - `riva_tts_perf_client` + - `nemotron_tts_client` + - `nemotron_tts_perf_client` - **Natural Language Processing (NLP)** - - `riva_nlp_punct` + - `nemotron_nlp_punct` ## Requirements 1. Meet the Quick Start [prerequisites](https://docs.nvidia.com/deeplearning/riva/user-guide/docs/quick-start-guide.html#prerequisites) -2. A NVIDIA Riva Server (Set one up using the [quick start guide](https://docs.nvidia.com/deeplearning/riva/user-guide/docs/quick-start-guide.html#local-deployment-using-quick-start-scripts)) +2. A NVIDIA Nemotron Speech Server (Set one up using the [quick start guide](https://docs.nvidia.com/deeplearning/riva/user-guide/docs/quick-start-guide.html#local-deployment-using-quick-start-scripts)) 3. Docker (for Docker build) 4. Bazel 5.0.0 (for local build) @@ -25,18 +25,18 @@ NVIDIA Riva is a GPU-accelerated SDK for building Speech AI applications that ar ### Docker -To avoid needing to manually build the clients yourself, Riva comes with a ready to use client docker image. This allows you to run the clients through an interactive docker container. +To avoid needing to manually build the clients yourself, Nemotron Speech comes with a ready to use client docker image. This allows you to run the clients through an interactive docker container. -The clients will need access to a Riva Server. If your server is running locally all you need to do is allow the client container access to your local network. +The clients will need access to a Nemotron Speech Server. If your server is running locally all you need to do is allow the client container access to your local network. If your server is not running locally, all clients come with a command line option `--riva_uri`. This defaults to `localhost:50051`, which is also the default server configuration. As the server is not local, run the client using `--riva_uri [IP]:[PORT]` with your configuration. To build the docker image simply run ``` -DOCKER_BUILDKIT=1 docker build . --tag riva-client +DOCKER_BUILDKIT=1 docker build . --tag nemotronspeech-client ``` To start an interactive docker container, with access to your local network, you can then run ``` -docker run -it --net=host riva-client +docker run -it --net=host nemotronspeech-client ``` Then you can run the clients as command line programs @@ -57,30 +57,30 @@ bazel build ... To build a specific client, you can run: ``` -bazel build //riva/clients/[asr/tts/nlp]:[CLIENT_NAME] +bazel build //nemotronspeech/clients/[asr/tts/nlp]:[CLIENT_NAME] ``` -For example, to build the `riva_streaming_asr_client` you would run: +For example, to build the `nemotron_streaming_asr_client` you would run: ``` -bazel build //riva/clients/asr:riva_streaming_asr_client +bazel build //nemotronspeech/clients/asr:nemotron_streaming_asr_client ``` -You can find the built binaries in `bazel-bin/riva/clients` +You can find the built binaries in `bazel-bin/nemotronspeech/clients` ## Usage ### Speech Recognition (ASR) Clients -Riva comes with 2 ASR clients: -1. `riva_asr_client` for offline usage. Using this client, the server will wait until it receives the full audio file before transcribing it and sending it back to the client. -2. `riva_streaming_asr_client` for online usage. Using this client, the server will start transcribing after it receives a sufficient amount of audio data, "streaming" intermediate transcripts as it goes on back to the client. By default, it is set to transcribe after every `100ms`, this can be changed using the `--chunk_duration_ms` command line flag. +Nemotron Speech comes with 2 ASR clients: +1. `nemotron_asr_client` for offline usage. Using this client, the server will wait until it receives the full audio file before transcribing it and sending it back to the client. +2. `nemotron_streaming_asr_client` for online usage. Using this client, the server will start transcribing after it receives a sufficient amount of audio data, "streaming" intermediate transcripts as it goes on back to the client. By default, it is set to transcribe after every `100ms`, this can be changed using the `--chunk_duration_ms` command line flag. To use the clients, simply pass in a folder containing audio files or an individual audio file name with the `audio_file` flag: ``` -$ riva_streaming_asr_client --audio_file individual_audio_file.wav +$ nemotron_streaming_asr_client --audio_file individual_audio_file.wav ``` or ``` -$ riva_asr_client --audio_file audio_folder +$ nemotron_asr_client --audio_file audio_folder ``` Note that only single-channel audio files in the `.wav` format are currently supported. @@ -88,34 +88,34 @@ Note that only single-channel audio files in the `.wav` format are currently sup Other options and information can be found by running the clients with `-help` ### Speech Synthesis (TTS) Client -Riva comes with 2 TTS clients: -1. `riva_tts_client` -2. `riva_tts_perf_client` +Nemotron Speech comes with 2 TTS clients: +1. `nemotron_tts_client` +2. `nemotron_tts_perf_client` Both clients support an `online` flag, which is similar to the `streaming` ASR client. Enabling the flag will stream the audio back to the client as soon as it is generated on the server, otherwise will send the entire batch at once. Language can also be specified using a BCP-47 language tag, which is default to `en-US` -To use the `riva_tts_client` simply run the client passing in text with the `--text` flag: +To use the `nemotron_tts_client` simply run the client passing in text with the `--text` flag: ``` -$ riva_tts_client --text="Text to be synthesized" +$ nemotron_tts_client --text="Text to be synthesized" ``` -The `riva_tts_perf_client` performs the same as the `riva_tts_client` however provides additional information about latency and throughput. Run the client passing in a file containing the text input using the `--text_file` flag. +The `nemotron_tts_perf_client` performs the same as the `nemotron_tts_client` however provides additional information about latency and throughput. Run the client passing in a file containing the text input using the `--text_file` flag. ``` -$ riva_tts_perf_client --text_file=/text_files/input.txt +$ nemotron_tts_perf_client --text_file=/text_files/input.txt ``` Other options and information can be found by running the clients with `-help` ### NLP Client -Riva comes with `riva_nlp_punct` NLP client for Punctuation. The `examples` folder contains example queries to test out the API. +Nemotron Speech comes with `nemotron_nlp_punct` NLP client for Punctuation. The `examples` folder contains example queries to test out the API. To run the Punctuation client, simply pass in a text file containing queries using the `--queries` flag ``` -$ riva_nlp_punct --queries=examples/punctuation_queries.txt +$ nemotron_nlp_punct --queries=examples/punctuation_queries.txt Done sending 3 requests 1: Punct text: Do you have any red Nvidia shirts? 0: Punct text: Add punctuation to this sentence. @@ -126,7 +126,7 @@ Other options and information can be found by running the client with `-help` ## Documentation -Additional documentation on the Riva Speech Skills SDK can be found [here](https://docs.nvidia.com/deeplearning/riva/user-guide/docs/). +Additional documentation on the Nemotron Speech Skills SDK can be found [here](https://docs.nvidia.com/deeplearning/riva/user-guide/docs/). ## License diff --git a/WORKSPACE b/WORKSPACE index 470ba0c..10fe4fb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,4 +1,4 @@ -workspace(name = "com_nvidia_riva_api") +workspace(name = "com_nvidia_nemotronspeech_api") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository") @@ -76,8 +76,8 @@ grpc_extra_deps() git_repository( name = "nvriva_common", - remote = "https://github.com/nvidia-riva/common.git", - commit = "71df98266725320a6b6b3a9f32a6da832dc93691" + remote = "https://gitlab-master.nvidia.com/sarane/common.git", + commit = "d7276290d1031e69145140015542c6bd4c13f09a" ) http_archive( diff --git a/riva/BUILD b/nemotronspeech/BUILD similarity index 100% rename from riva/BUILD rename to nemotronspeech/BUILD diff --git a/riva/clients/asr/BUILD b/nemotronspeech/clients/asr/BUILD similarity index 68% rename from riva/clients/asr/BUILD rename to nemotronspeech/clients/asr/BUILD index d88c46b..a779c09 100644 --- a/riva/clients/asr/BUILD +++ b/nemotronspeech/clients/asr/BUILD @@ -13,7 +13,7 @@ package( cc_library( name = "asr_client_helper", - srcs = ["riva_asr_client_helper.h", "riva_asr_client_helper.cc"], + srcs = ["nemotron_asr_client_helper.h", "nemotron_asr_client_helper.cc"], deps = select({ "@platforms//cpu:aarch64": [ "@alsa_aarch64//:libasound" @@ -23,7 +23,7 @@ cc_library( ], }) + [ "@com_github_grpc_grpc//:grpc++", - "@nvriva_common//riva/proto:riva_grpc_asr", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", ], ) @@ -40,9 +40,9 @@ cc_library( }) + [ ":asr_client_helper", "@com_github_grpc_grpc//:grpc++", - "@nvriva_common//riva/proto:riva_grpc_asr", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", "@glog//:glog", - "//riva/utils/wav:reader", + "//nemotronspeech/utils/wav:reader", ], ) @@ -54,8 +54,8 @@ cc_library( deps = [ ":asr_client_helper", ":client_call", - "//riva/utils/wav:reader", - "//riva/utils/opus", + "//nemotronspeech/utils/wav:reader", + "//nemotronspeech/utils/opus", "@glog//:glog", ] + select({ "@platforms//cpu:aarch64": [ @@ -65,43 +65,43 @@ cc_library( "@alsa//:libasound" ], }) + [ - "//riva/utils:stamping", + "//nemotronspeech/utils:stamping", "@com_github_grpc_grpc//:grpc++", "@com_github_gflags_gflags//:gflags", - "@nvriva_common//riva/proto:riva_grpc_asr", - "//riva/utils:thread_pool", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", + "//nemotronspeech/utils:thread_pool", ], ) cc_binary( - name = "riva_asr_client", - srcs = ["riva_asr_client.cc"], + name = "nemotron_asr_client", + srcs = ["nemotron_asr_client.cc"], deps = [ ":asr_client_helper", ":client_call", - "@nvriva_common//riva/proto:riva_grpc_asr", - "//riva/utils:stamping", - "//riva/utils/files:files", - "//riva/utils/wav:reader", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", + "//nemotronspeech/utils:stamping", + "//nemotronspeech/utils/files:files", + "//nemotronspeech/utils/wav:reader", "@glog//:glog", "@com_github_grpc_grpc//:grpc++", "@com_github_gflags_gflags//:gflags", - "//riva/clients/utils:grpc", + "//nemotronspeech/clients/utils:grpc", ] ) cc_binary( - name = "riva_streaming_asr_client", - srcs = ["riva_streaming_asr_client.cc"], + name = "nemotron_streaming_asr_client", + srcs = ["nemotron_streaming_asr_client.cc"], deps = [ ":asr_client_helper", ":client_call", ":streaming_recognize_client", - "@nvriva_common//riva/proto:riva_grpc_asr", - "//riva/utils/files:files", - "//riva/utils/wav:reader", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", + "//nemotronspeech/utils/files:files", + "//nemotronspeech/utils/wav:reader", "@glog//:glog", - "//riva/clients/utils:grpc", + "//nemotronspeech/clients/utils:grpc", ] + select({ "@platforms//cpu:aarch64": [ "@alsa_aarch64//:libasound" @@ -122,7 +122,7 @@ cc_test( deps = [ ":streaming_recognize_client", "@googletest//:gtest_main", - "@nvriva_common//riva/proto:riva_grpc_asr", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", ], tags = ["needs_alsa"] ) diff --git a/riva/clients/asr/client_call.cc b/nemotronspeech/clients/asr/client_call.cc similarity index 100% rename from riva/clients/asr/client_call.cc rename to nemotronspeech/clients/asr/client_call.cc diff --git a/riva/clients/asr/client_call.h b/nemotronspeech/clients/asr/client_call.h similarity index 92% rename from riva/clients/asr/client_call.h rename to nemotronspeech/clients/asr/client_call.h index f639d07..d34b6d8 100644 --- a/riva/clients/asr/client_call.h +++ b/nemotronspeech/clients/asr/client_call.h @@ -24,9 +24,9 @@ #include #include -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva_asr_client_helper.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotron_asr_client_helper.h" using grpc::Status; using grpc::StatusCode; diff --git a/riva/clients/asr/riva_asr_client.cc b/nemotronspeech/clients/asr/nemotron_asr_client.cc similarity index 98% rename from riva/clients/asr/riva_asr_client.cc rename to nemotronspeech/clients/asr/nemotron_asr_client.cc index 8f82c9a..937a282 100644 --- a/riva/clients/asr/riva_asr_client.cc +++ b/nemotronspeech/clients/asr/nemotron_asr_client.cc @@ -22,12 +22,12 @@ #include #include -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/utils/files/files.h" -#include "riva/utils/stamping.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva_asr_client_helper.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotron_asr_client_helper.h" using grpc::Status; using grpc::StatusCode; @@ -448,7 +448,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_asr_client " << std::endl; + str_usage << "Usage: nemotron_asr_client " << std::endl; str_usage << " --audio_file= " << std::endl; str_usage << " --automatic_punctuation=" << std::endl; str_usage << " --max_alternatives=" << std::endl; diff --git a/riva/clients/asr/riva_asr_client_helper.cc b/nemotronspeech/clients/asr/nemotron_asr_client_helper.cc similarity index 99% rename from riva/clients/asr/riva_asr_client_helper.cc rename to nemotronspeech/clients/asr/nemotron_asr_client_helper.cc index 068a37f..2ddc942 100644 --- a/riva/clients/asr/riva_asr_client_helper.cc +++ b/nemotronspeech/clients/asr/nemotron_asr_client_helper.cc @@ -4,7 +4,7 @@ */ -#include "riva_asr_client_helper.h" +#include "nemotron_asr_client_helper.h" #include diff --git a/riva/clients/asr/riva_asr_client_helper.h b/nemotronspeech/clients/asr/nemotron_asr_client_helper.h similarity index 96% rename from riva/clients/asr/riva_asr_client_helper.h rename to nemotronspeech/clients/asr/nemotron_asr_client_helper.h index 9abfc33..6f43cc6 100644 --- a/riva/clients/asr/riva_asr_client_helper.h +++ b/nemotronspeech/clients/asr/nemotron_asr_client_helper.h @@ -15,7 +15,7 @@ #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" -#include "riva/proto/riva_asr.grpc.pb.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" namespace nr = nvidia::riva; namespace nr_asr = nvidia::riva::asr; diff --git a/riva/clients/asr/riva_streaming_asr_client.cc b/nemotronspeech/clients/asr/nemotron_streaming_asr_client.cc similarity index 97% rename from riva/clients/asr/riva_streaming_asr_client.cc rename to nemotronspeech/clients/asr/nemotron_streaming_asr_client.cc index 0790738..c4426f8 100644 --- a/riva/clients/asr/riva_streaming_asr_client.cc +++ b/nemotronspeech/clients/asr/nemotron_streaming_asr_client.cc @@ -25,12 +25,12 @@ #include #include "client_call.h" -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/utils/files/files.h" -#include "riva/utils/stamping.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva_asr_client_helper.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotron_asr_client_helper.h" #include "streaming_recognize_client.h" using grpc::Status; @@ -122,7 +122,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_streaming_asr_client " << std::endl; + str_usage << "Usage: nemotron_streaming_asr_client " << std::endl; str_usage << " --audio_file= " << std::endl; str_usage << " --audio_device= " << std::endl; str_usage << " --automatic_punctuation=" << std::endl; diff --git a/riva/clients/asr/streaming_recognize_client.cc b/nemotronspeech/clients/asr/streaming_recognize_client.cc similarity index 99% rename from riva/clients/asr/streaming_recognize_client.cc rename to nemotronspeech/clients/asr/streaming_recognize_client.cc index 84581af..b8a17ed 100644 --- a/riva/clients/asr/streaming_recognize_client.cc +++ b/nemotronspeech/clients/asr/streaming_recognize_client.cc @@ -6,7 +6,7 @@ #include "streaming_recognize_client.h" -#include "riva/utils/opus/opus_client_decoder.h" +#include "nemotronspeech/utils/opus/opus_client_decoder.h" #define clear_screen() printf("\033[H\033[J") #define gotoxy(x, y) printf("\033[%d;%dH", (y), (x)) diff --git a/riva/clients/asr/streaming_recognize_client.h b/nemotronspeech/clients/asr/streaming_recognize_client.h similarity index 95% rename from riva/clients/asr/streaming_recognize_client.h rename to nemotronspeech/clients/asr/streaming_recognize_client.h index 9232cff..0b0b77c 100644 --- a/riva/clients/asr/streaming_recognize_client.h +++ b/nemotronspeech/clients/asr/streaming_recognize_client.h @@ -27,10 +27,10 @@ #include #include "client_call.h" -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/utils/thread_pool.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva_asr_client_helper.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/utils/thread_pool.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotron_asr_client_helper.h" using grpc::Status; using grpc::StatusCode; diff --git a/riva/clients/asr/streaming_recognize_client_test.cc b/nemotronspeech/clients/asr/streaming_recognize_client_test.cc similarity index 100% rename from riva/clients/asr/streaming_recognize_client_test.cc rename to nemotronspeech/clients/asr/streaming_recognize_client_test.cc diff --git a/nemotronspeech/clients/nlp/BUILD b/nemotronspeech/clients/nlp/BUILD new file mode 100644 index 0000000..fe6a8e0 --- /dev/null +++ b/nemotronspeech/clients/nlp/BUILD @@ -0,0 +1,31 @@ +""" +SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +SPDX-License-Identifier: MIT +""" + +package( + default_visibility = ["//visibility:public"], +) + +cc_library( + name = "nemotron_nlp_client", + hdrs = ["nemotron_nlp_client.h"], + deps = [ + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nlp", + "@com_github_gflags_gflags//:gflags", + "@glog//:glog", + "@com_github_grpc_grpc//:grpc++" + ] +) + +cc_binary( + name = "nemotron_nlp_punct", + srcs = ["nemotron_nlp_punct.cc","nemotron_nlp_client.h"], + deps = [ + ":nemotron_nlp_client", + "//nemotronspeech/clients/utils:grpc", + "//nemotronspeech/utils:stamping", + "//nemotronspeech/utils/files:files" + ] +) + diff --git a/riva/clients/nlp/riva_nlp_client.h b/nemotronspeech/clients/nlp/nemotron_nlp_client.h similarity index 99% rename from riva/clients/nlp/riva_nlp_client.h rename to nemotronspeech/clients/nlp/nemotron_nlp_client.h index d937f13..27fcbe9 100644 --- a/riva/clients/nlp/riva_nlp_client.h +++ b/nemotronspeech/clients/nlp/nemotron_nlp_client.h @@ -23,7 +23,7 @@ #include #include -#include "riva/proto/riva_nlp.grpc.pb.h" +#include "nemotronspeech/proto/nemotron_nlp.grpc.pb.h" using grpc::Status; using grpc::StatusCode; diff --git a/riva/clients/nlp/riva_nlp_punct.cc b/nemotronspeech/clients/nlp/nemotron_nlp_punct.cc similarity index 97% rename from riva/clients/nlp/riva_nlp_punct.cc rename to nemotronspeech/clients/nlp/nemotron_nlp_punct.cc index 2212a1a..1c93c09 100644 --- a/riva/clients/nlp/riva_nlp_punct.cc +++ b/nemotronspeech/clients/nlp/nemotron_nlp_punct.cc @@ -21,10 +21,10 @@ #include #include -#include "riva/clients/utils/grpc.h" -#include "riva/utils/files/files.h" -#include "riva/utils/stamping.h" -#include "riva_nlp_client.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotron_nlp_client.h" using grpc::Status; using grpc::StatusCode; @@ -102,7 +102,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_nlp_punct" << std::endl; + str_usage << "Usage: nemotron_nlp_punct" << std::endl; str_usage << " --queries= " << std::endl; str_usage << " --riva_uri= " << std::endl; str_usage << " --num_iterations= " << std::endl; diff --git a/riva/clients/nmt/BUILD b/nemotronspeech/clients/nmt/BUILD similarity index 59% rename from riva/clients/nmt/BUILD rename to nemotronspeech/clients/nmt/BUILD index dd6b5ba..ab83f7b 100644 --- a/riva/clients/nmt/BUILD +++ b/nemotronspeech/clients/nmt/BUILD @@ -7,11 +7,11 @@ package( default_visibility = ["//visibility:public"], ) cc_binary( - name = "riva_nmt_t2t_client", - srcs = ["riva_nmt_t2t_client.cc"], + name = "nemotron_nmt_t2t_client", + srcs = ["nemotron_nmt_t2t_client.cc"], deps = [ - "//riva/clients/utils:grpc", - "@nvriva_common//riva/proto:riva_grpc_nmt", + "//nemotronspeech/clients/utils:grpc", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nmt", "@com_github_gflags_gflags//:gflags", "@glog//:glog", "@com_github_grpc_grpc//:grpc++" @@ -30,10 +30,10 @@ cc_library( "@alsa//:libasound" ], }) + [ - "//riva/clients/asr:asr_client_helper", + "//nemotronspeech/clients/asr:asr_client_helper", "@com_github_grpc_grpc//:grpc++", - "@nvriva_common//riva/proto:riva_grpc_nmt", - "//riva/utils/wav:reader", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nmt", + "//nemotronspeech/utils/wav:reader", ], ) @@ -43,11 +43,11 @@ cc_library( "streaming_s2s_client.cc" ], deps = [ - "//riva/clients/asr:asr_client_helper", + "//nemotronspeech/clients/asr:asr_client_helper", ":client_call", - "//riva/utils/wav:reader", - "//riva/utils/wav:writer", - "//riva/utils/opus", + "//nemotronspeech/utils/wav:reader", + "//nemotronspeech/utils/wav:writer", + "//nemotronspeech/utils/opus", "@glog//:glog", ] + select({ "@platforms//cpu:aarch64": [ @@ -57,11 +57,11 @@ cc_library( "@alsa//:libasound" ], }) + [ - "//riva/utils:stamping", + "//nemotronspeech/utils:stamping", "@com_github_grpc_grpc//:grpc++", "@com_github_gflags_gflags//:gflags", - "@nvriva_common//riva/proto:riva_grpc_nmt", - "//riva/utils:thread_pool", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nmt", + "//nemotronspeech/utils:thread_pool", ], ) cc_library( @@ -70,9 +70,9 @@ cc_library( "streaming_s2t_client.cc" ], deps = [ - "//riva/clients/asr:asr_client_helper", + "//nemotronspeech/clients/asr:asr_client_helper", ":client_call", - "//riva/utils/wav:reader", + "//nemotronspeech/utils/wav:reader", "@glog//:glog", ] + select({ "@platforms//cpu:aarch64": [ @@ -82,26 +82,26 @@ cc_library( "@alsa//:libasound" ], }) + [ - "//riva/utils:stamping", + "//nemotronspeech/utils:stamping", "@com_github_grpc_grpc//:grpc++", "@com_github_gflags_gflags//:gflags", - "@nvriva_common//riva/proto:riva_grpc_nmt", - "//riva/utils:thread_pool", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nmt", + "//nemotronspeech/utils:thread_pool", ], ) cc_binary( - name = "riva_nmt_streaming_s2t_client", - srcs = ["riva_nmt_streaming_s2t_client.cc"], + name = "nemotron_nmt_streaming_s2t_client", + srcs = ["nemotron_nmt_streaming_s2t_client.cc"], deps = [ - "//riva/clients/asr:asr_client_helper", + "//nemotronspeech/clients/asr:asr_client_helper", ":client_call", ":streaming_s2t_client", - "@nvriva_common//riva/proto:riva_grpc_nmt", - "//riva/utils/files:files", - "//riva/utils/wav:reader", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nmt", + "//nemotronspeech/utils/files:files", + "//nemotronspeech/utils/wav:reader", "@glog//:glog", - "//riva/clients/utils:grpc", + "//nemotronspeech/clients/utils:grpc", ] + select({ "@platforms//cpu:aarch64": [ "@alsa_aarch64//:libasound" @@ -115,16 +115,16 @@ cc_binary( ], ) cc_binary( - name = "riva_nmt_streaming_s2s_client", - srcs = ["riva_nmt_streaming_s2s_client.cc"], + name = "nemotron_nmt_streaming_s2s_client", + srcs = ["nemotron_nmt_streaming_s2s_client.cc"], deps = [ - "//riva/clients/asr:asr_client_helper", + "//nemotronspeech/clients/asr:asr_client_helper", ":client_call", ":streaming_s2s_client", - "@nvriva_common//riva/proto:riva_grpc_nmt", - "//riva/utils/files:files", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_nmt", + "//nemotronspeech/utils/files:files", "@glog//:glog", - "//riva/clients/utils:grpc", + "//nemotronspeech/clients/utils:grpc", ] + select({ "@platforms//cpu:aarch64": [ "@alsa_aarch64//:libasound" diff --git a/riva/clients/nmt/client_call.cc b/nemotronspeech/clients/nmt/client_call.cc similarity index 100% rename from riva/clients/nmt/client_call.cc rename to nemotronspeech/clients/nmt/client_call.cc diff --git a/riva/clients/nmt/client_call.h b/nemotronspeech/clients/nmt/client_call.h similarity index 96% rename from riva/clients/nmt/client_call.h rename to nemotronspeech/clients/nmt/client_call.h index 2daacc9..4ae6457 100644 --- a/riva/clients/nmt/client_call.h +++ b/nemotronspeech/clients/nmt/client_call.h @@ -23,10 +23,10 @@ #include #include -#include "riva/clients/asr/riva_asr_client_helper.h" -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/proto/riva_nmt.grpc.pb.h" -#include "riva/utils/wav/wav_reader.h" +#include "nemotronspeech/clients/asr/nemotron_asr_client_helper.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/proto/nemotron_nmt.grpc.pb.h" +#include "nemotronspeech/utils/wav/wav_reader.h" using grpc::Status; using grpc::StatusCode; diff --git a/riva/clients/nmt/riva_nmt_streaming_s2s_client.cc b/nemotronspeech/clients/nmt/nemotron_nmt_streaming_s2s_client.cc similarity index 97% rename from riva/clients/nmt/riva_nmt_streaming_s2s_client.cc rename to nemotronspeech/clients/nmt/nemotron_nmt_streaming_s2s_client.cc index 9659a62..19e87f9 100644 --- a/riva/clients/nmt/riva_nmt_streaming_s2s_client.cc +++ b/nemotronspeech/clients/nmt/nemotron_nmt_streaming_s2s_client.cc @@ -26,11 +26,11 @@ #include #include "client_call.h" -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_nmt.grpc.pb.h" -#include "riva/utils/files/files.h" -#include "riva/utils/stamping.h" -#include "riva/utils/wav/wav_reader.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_nmt.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotronspeech/utils/wav/wav_reader.h" #include "streaming_s2s_client.h" using grpc::Status; @@ -207,7 +207,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_nmt_streaming_s2s_client " << std::endl; + str_usage << "Usage: nemotron_nmt_streaming_s2s_client " << std::endl; str_usage << " --audio_file= " << std::endl; str_usage << " --audio_device= " << std::endl; str_usage << " --automatic_punctuation=" << std::endl; diff --git a/riva/clients/nmt/riva_nmt_streaming_s2t_client.cc b/nemotronspeech/clients/nmt/nemotron_nmt_streaming_s2t_client.cc similarity index 96% rename from riva/clients/nmt/riva_nmt_streaming_s2t_client.cc rename to nemotronspeech/clients/nmt/nemotron_nmt_streaming_s2t_client.cc index be783ff..975a9ce 100644 --- a/riva/clients/nmt/riva_nmt_streaming_s2t_client.cc +++ b/nemotronspeech/clients/nmt/nemotron_nmt_streaming_s2t_client.cc @@ -25,11 +25,11 @@ #include #include "client_call.h" -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_nmt.grpc.pb.h" -#include "riva/utils/files/files.h" -#include "riva/utils/stamping.h" -#include "riva/utils/wav/wav_reader.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_nmt.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotronspeech/utils/wav/wav_reader.h" #include "streaming_s2t_client.h" using grpc::Status; @@ -93,7 +93,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_nmt_streaming_s2t_client " << std::endl; + str_usage << "Usage: nemotron_nmt_streaming_s2t_client " << std::endl; str_usage << " --audio_file= " << std::endl; str_usage << " --audio_device= " << std::endl; str_usage << " --automatic_punctuation=" << std::endl; diff --git a/riva/clients/nmt/riva_nmt_t2t_client.cc b/nemotronspeech/clients/nmt/nemotron_nmt_t2t_client.cc similarity index 98% rename from riva/clients/nmt/riva_nmt_t2t_client.cc rename to nemotronspeech/clients/nmt/nemotron_nmt_t2t_client.cc index 47c2b30..1d496e2 100644 --- a/riva/clients/nmt/riva_nmt_t2t_client.cc +++ b/nemotronspeech/clients/nmt/nemotron_nmt_t2t_client.cc @@ -16,9 +16,9 @@ #include #include -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_nmt.grpc.pb.h" -#include "riva/utils/files/files.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_nmt.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" using grpc::Status; using grpc::StatusCode; @@ -176,7 +176,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_nmt_t2t_client" << std::endl; + str_usage << "Usage: nemotron_nmt_t2t_client" << std::endl; str_usage << " --text_file= " << std::endl; str_usage << " --riva_uri= " << std::endl; str_usage << " --num_iterations= " << std::endl; diff --git a/riva/clients/nmt/streaming_s2s_client.cc b/nemotronspeech/clients/nmt/streaming_s2s_client.cc similarity index 99% rename from riva/clients/nmt/streaming_s2s_client.cc rename to nemotronspeech/clients/nmt/streaming_s2s_client.cc index c0a56af..7cc88ef 100644 --- a/riva/clients/nmt/streaming_s2s_client.cc +++ b/nemotronspeech/clients/nmt/streaming_s2s_client.cc @@ -5,7 +5,7 @@ #include "streaming_s2s_client.h" -#include "riva/utils/opus/opus_client_decoder.h" +#include "nemotronspeech/utils/opus/opus_client_decoder.h" #define clear_screen() printf("\033[H\033[J") #define gotoxy(x, y) printf("\033[%d;%dH", (y), (x)) diff --git a/riva/clients/nmt/streaming_s2s_client.h b/nemotronspeech/clients/nmt/streaming_s2s_client.h similarity index 93% rename from riva/clients/nmt/streaming_s2s_client.h rename to nemotronspeech/clients/nmt/streaming_s2s_client.h index 5e7927f..895f963 100644 --- a/riva/clients/nmt/streaming_s2s_client.h +++ b/nemotronspeech/clients/nmt/streaming_s2s_client.h @@ -27,11 +27,11 @@ #include #include "client_call.h" -#include "riva/clients/asr/riva_asr_client_helper.h" -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/utils/thread_pool.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva/utils/wav/wav_writer.h" +#include "nemotronspeech/clients/asr/nemotron_asr_client_helper.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/utils/thread_pool.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotronspeech/utils/wav/wav_writer.h" using grpc::Status; using grpc::StatusCode; diff --git a/riva/clients/nmt/streaming_s2t_client.cc b/nemotronspeech/clients/nmt/streaming_s2t_client.cc similarity index 100% rename from riva/clients/nmt/streaming_s2t_client.cc rename to nemotronspeech/clients/nmt/streaming_s2t_client.cc diff --git a/riva/clients/nmt/streaming_s2t_client.h b/nemotronspeech/clients/nmt/streaming_s2t_client.h similarity index 93% rename from riva/clients/nmt/streaming_s2t_client.h rename to nemotronspeech/clients/nmt/streaming_s2t_client.h index 09747b9..3c47a8b 100644 --- a/riva/clients/nmt/streaming_s2t_client.h +++ b/nemotronspeech/clients/nmt/streaming_s2t_client.h @@ -27,10 +27,10 @@ #include #include "client_call.h" -#include "riva/clients/asr/riva_asr_client_helper.h" -#include "riva/proto/riva_asr.grpc.pb.h" -#include "riva/utils/thread_pool.h" -#include "riva/utils/wav/wav_reader.h" +#include "nemotronspeech/clients/asr/nemotron_asr_client_helper.h" +#include "nemotronspeech/proto/nemotron_asr.grpc.pb.h" +#include "nemotronspeech/utils/thread_pool.h" +#include "nemotronspeech/utils/wav/wav_reader.h" using grpc::Status; using grpc::StatusCode; diff --git a/nemotronspeech/clients/tts/BUILD b/nemotronspeech/clients/tts/BUILD new file mode 100644 index 0000000..04d61d0 --- /dev/null +++ b/nemotronspeech/clients/tts/BUILD @@ -0,0 +1,41 @@ +""" +SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +SPDX-License-Identifier: MIT +""" + +package( + default_visibility = ["//visibility:public"], +) + +cc_binary( + name = "nemotron_tts_client", + srcs = ["nemotron_tts_client.cc"], + deps = [ + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_tts", + "//nemotronspeech/utils:stamping", + "//nemotronspeech/utils/wav:writer", + "//nemotronspeech/utils/wav:reader", + "//nemotronspeech/utils/opus", + "@glog//:glog", + "@com_google_absl//absl/time", + "@com_github_gflags_gflags//:gflags", + "@com_github_grpc_grpc//:grpc++", + "//nemotronspeech/clients/utils:grpc", + ] +) + +cc_binary( + name = "nemotron_tts_perf_client", + srcs = ["nemotron_tts_perf_client.cc"], + deps = [ + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_tts", + "//nemotronspeech/utils:stamping", + "//nemotronspeech/utils/wav:writer", + "//nemotronspeech/utils/wav:reader", + "//nemotronspeech/utils/opus", + "@glog//:glog", + "@com_github_gflags_gflags//:gflags", + "@com_github_grpc_grpc//:grpc++", + "//nemotronspeech/clients/utils:grpc", + ] +) diff --git a/riva/clients/tts/riva_tts_client.cc b/nemotronspeech/clients/tts/nemotron_tts_client.cc similarity index 97% rename from riva/clients/tts/riva_tts_client.cc rename to nemotronspeech/clients/tts/nemotron_tts_client.cc index b7501f2..1d55e8a 100644 --- a/riva/clients/tts/riva_tts_client.cc +++ b/nemotronspeech/clients/tts/nemotron_tts_client.cc @@ -17,13 +17,13 @@ #include #include -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_tts.grpc.pb.h" -#include "riva/utils/files/files.h" -#include "riva/utils/opus/opus_client_decoder.h" -#include "riva/utils/stamping.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva/utils/wav/wav_writer.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_tts.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/opus/opus_client_decoder.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotronspeech/utils/wav/wav_writer.h" using grpc::Status; using grpc::StatusCode; @@ -132,7 +132,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_tts_client " << std::endl; + str_usage << "Usage: nemotron_tts_client " << std::endl; str_usage << " --text= " << std::endl; str_usage << " --text_file= " << std::endl; str_usage << " --audio_file= " << std::endl; diff --git a/riva/clients/tts/riva_tts_perf_client.cc b/nemotronspeech/clients/tts/nemotron_tts_perf_client.cc similarity index 98% rename from riva/clients/tts/riva_tts_perf_client.cc rename to nemotronspeech/clients/tts/nemotron_tts_perf_client.cc index 20bad2f..c424ca9 100644 --- a/riva/clients/tts/riva_tts_perf_client.cc +++ b/nemotronspeech/clients/tts/nemotron_tts_perf_client.cc @@ -20,13 +20,13 @@ #include #include -#include "riva/clients/utils/grpc.h" -#include "riva/proto/riva_tts.grpc.pb.h" -#include "riva/utils/files/files.h" -#include "riva/utils/opus/opus_client_decoder.h" -#include "riva/utils/stamping.h" -#include "riva/utils/wav/wav_reader.h" -#include "riva/utils/wav/wav_writer.h" +#include "nemotronspeech/clients/utils/grpc.h" +#include "nemotronspeech/proto/nemotron_tts.grpc.pb.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/opus/opus_client_decoder.h" +#include "nemotronspeech/utils/stamping.h" +#include "nemotronspeech/utils/wav/wav_reader.h" +#include "nemotronspeech/utils/wav/wav_writer.h" using grpc::Status; using grpc::StatusCode; @@ -389,7 +389,7 @@ main(int argc, char** argv) FLAGS_logtostderr = 1; std::stringstream str_usage; - str_usage << "Usage: riva_tts_perf_client " << std::endl; + str_usage << "Usage: nemotron_tts_perf_client " << std::endl; str_usage << " --text_file= " << std::endl; str_usage << " --write_output_audio= " << std::endl; str_usage << " --riva_uri= " << std::endl; diff --git a/riva/clients/utils/BUILD b/nemotronspeech/clients/utils/BUILD similarity index 85% rename from riva/clients/utils/BUILD rename to nemotronspeech/clients/utils/BUILD index 0e5abd7..d674e25 100644 --- a/riva/clients/utils/BUILD +++ b/nemotronspeech/clients/utils/BUILD @@ -12,8 +12,8 @@ cc_library( hdrs = ["grpc.h"], linkopts = ["-lm"], deps = [ - "//riva/utils/files:files", - "//riva/utils:string_processing", + "//nemotronspeech/utils/files:files", + "//nemotronspeech/utils:string_processing", "@com_github_gflags_gflags//:gflags", "@glog//:glog", "@com_github_grpc_grpc//:grpc++" diff --git a/riva/clients/utils/grpc.h b/nemotronspeech/clients/utils/grpc.h similarity index 97% rename from riva/clients/utils/grpc.h rename to nemotronspeech/clients/utils/grpc.h index 16e64a3..b2d74d0 100644 --- a/riva/clients/utils/grpc.h +++ b/nemotronspeech/clients/utils/grpc.h @@ -13,8 +13,8 @@ #include #include -#include "riva/utils/files/files.h" -#include "riva/utils/string_processing.h" +#include "nemotronspeech/utils/files/files.h" +#include "nemotronspeech/utils/string_processing.h" constexpr int MAX_GRPC_MESSAGE_SIZE = 128 * 1024 * 1024; diff --git a/riva/clients/utils/grpc_test.cc b/nemotronspeech/clients/utils/grpc_test.cc similarity index 100% rename from riva/clients/utils/grpc_test.cc rename to nemotronspeech/clients/utils/grpc_test.cc diff --git a/riva/utils/BUILD b/nemotronspeech/utils/BUILD similarity index 100% rename from riva/utils/BUILD rename to nemotronspeech/utils/BUILD diff --git a/riva/utils/files/BUILD b/nemotronspeech/utils/files/BUILD similarity index 100% rename from riva/utils/files/BUILD rename to nemotronspeech/utils/files/BUILD diff --git a/riva/utils/files/files.cc b/nemotronspeech/utils/files/files.cc similarity index 100% rename from riva/utils/files/files.cc rename to nemotronspeech/utils/files/files.cc diff --git a/riva/utils/files/files.h b/nemotronspeech/utils/files/files.h similarity index 100% rename from riva/utils/files/files.h rename to nemotronspeech/utils/files/files.h diff --git a/riva/utils/files/files_test.cc b/nemotronspeech/utils/files/files_test.cc similarity index 100% rename from riva/utils/files/files_test.cc rename to nemotronspeech/utils/files/files_test.cc diff --git a/riva/utils/opus/BUILD b/nemotronspeech/utils/opus/BUILD similarity index 94% rename from riva/utils/opus/BUILD rename to nemotronspeech/utils/opus/BUILD index dc08fde..6e9f843 100644 --- a/riva/utils/opus/BUILD +++ b/nemotronspeech/utils/opus/BUILD @@ -23,7 +23,7 @@ cc_library( "@glog//:glog", "@libopus", "@libopusfile", - "//riva/utils/wav:reader", + "//nemotronspeech/utils/wav:reader", ], linkopts = [ "-logg" diff --git a/riva/utils/opus/opus_client_decoder.cc b/nemotronspeech/utils/opus/opus_client_decoder.cc similarity index 100% rename from riva/utils/opus/opus_client_decoder.cc rename to nemotronspeech/utils/opus/opus_client_decoder.cc diff --git a/riva/utils/opus/opus_client_decoder.h b/nemotronspeech/utils/opus/opus_client_decoder.h similarity index 100% rename from riva/utils/opus/opus_client_decoder.h rename to nemotronspeech/utils/opus/opus_client_decoder.h diff --git a/riva/utils/stamping.cc b/nemotronspeech/utils/stamping.cc similarity index 100% rename from riva/utils/stamping.cc rename to nemotronspeech/utils/stamping.cc diff --git a/riva/utils/stamping.h b/nemotronspeech/utils/stamping.h similarity index 100% rename from riva/utils/stamping.h rename to nemotronspeech/utils/stamping.h diff --git a/riva/utils/string_processing.h b/nemotronspeech/utils/string_processing.h similarity index 100% rename from riva/utils/string_processing.h rename to nemotronspeech/utils/string_processing.h diff --git a/riva/utils/thread_pool.h b/nemotronspeech/utils/thread_pool.h similarity index 100% rename from riva/utils/thread_pool.h rename to nemotronspeech/utils/thread_pool.h diff --git a/riva/utils/wav/BUILD b/nemotronspeech/utils/wav/BUILD similarity index 92% rename from riva/utils/wav/BUILD rename to nemotronspeech/utils/wav/BUILD index ef12cdc..31f5724 100644 --- a/riva/utils/wav/BUILD +++ b/nemotronspeech/utils/wav/BUILD @@ -22,7 +22,7 @@ cc_library( srcs = ["wav_reader.cc"], hdrs = ["wav_reader.h", "wav_data.h"], deps = [ - "@nvriva_common//riva/proto:riva_grpc_asr", + "@nvriva_common//nemotronspeech/proto:nemotron_grpc_asr", "@rapidjson//:rapidjson", "@glog//:glog", ] diff --git a/riva/utils/wav/wav_data.h b/nemotronspeech/utils/wav/wav_data.h similarity index 96% rename from riva/utils/wav/wav_data.h rename to nemotronspeech/utils/wav/wav_data.h index 0b9350a..98bece4 100644 --- a/riva/utils/wav/wav_data.h +++ b/nemotronspeech/utils/wav/wav_data.h @@ -9,7 +9,7 @@ #include #include -#include "riva/proto/riva_asr.pb.h" +#include "nemotronspeech/proto/nemotron_asr.pb.h" namespace nr = nvidia::riva; namespace nr_asr = nvidia::riva::asr; diff --git a/riva/utils/wav/wav_reader.cc b/nemotronspeech/utils/wav/wav_reader.cc similarity index 99% rename from riva/utils/wav/wav_reader.cc rename to nemotronspeech/utils/wav/wav_reader.cc index 30bfed1..c6f1656 100644 --- a/riva/utils/wav/wav_reader.cc +++ b/nemotronspeech/utils/wav/wav_reader.cc @@ -15,7 +15,7 @@ #include #include "rapidjson/document.h" -#include "riva/proto/riva_asr.pb.h" +#include "nemotronspeech/proto/nemotron_asr.pb.h" namespace nr = nvidia::riva; namespace nr_asr = nvidia::riva::asr; diff --git a/riva/utils/wav/wav_reader.h b/nemotronspeech/utils/wav/wav_reader.h similarity index 100% rename from riva/utils/wav/wav_reader.h rename to nemotronspeech/utils/wav/wav_reader.h diff --git a/riva/utils/wav/wav_writer.cc b/nemotronspeech/utils/wav/wav_writer.cc similarity index 100% rename from riva/utils/wav/wav_writer.cc rename to nemotronspeech/utils/wav/wav_writer.cc diff --git a/riva/utils/wav/wav_writer.h b/nemotronspeech/utils/wav/wav_writer.h similarity index 100% rename from riva/utils/wav/wav_writer.h rename to nemotronspeech/utils/wav/wav_writer.h diff --git a/riva/clients/nlp/BUILD b/riva/clients/nlp/BUILD deleted file mode 100644 index 6673026..0000000 --- a/riva/clients/nlp/BUILD +++ /dev/null @@ -1,31 +0,0 @@ -""" -SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. -SPDX-License-Identifier: MIT -""" - -package( - default_visibility = ["//visibility:public"], -) - -cc_library( - name = "riva_nlp_client", - hdrs = ["riva_nlp_client.h"], - deps = [ - "@nvriva_common//riva/proto:riva_grpc_nlp", - "@com_github_gflags_gflags//:gflags", - "@glog//:glog", - "@com_github_grpc_grpc//:grpc++" - ] -) - -cc_binary( - name = "riva_nlp_punct", - srcs = ["riva_nlp_punct.cc","riva_nlp_client.h"], - deps = [ - ":riva_nlp_client", - "//riva/clients/utils:grpc", - "//riva/utils:stamping", - "//riva/utils/files:files" - ] -) - diff --git a/riva/clients/tts/BUILD b/riva/clients/tts/BUILD deleted file mode 100644 index b3e5df5..0000000 --- a/riva/clients/tts/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -""" -SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. -SPDX-License-Identifier: MIT -""" - -package( - default_visibility = ["//visibility:public"], -) - -cc_binary( - name = "riva_tts_client", - srcs = ["riva_tts_client.cc"], - deps = [ - "@nvriva_common//riva/proto:riva_grpc_tts", - "//riva/utils:stamping", - "//riva/utils/wav:writer", - "//riva/utils/wav:reader", - "//riva/utils/opus", - "@glog//:glog", - "@com_google_absl//absl/time", - "@com_github_gflags_gflags//:gflags", - "@com_github_grpc_grpc//:grpc++", - "//riva/clients/utils:grpc", - ] -) - -cc_binary( - name = "riva_tts_perf_client", - srcs = ["riva_tts_perf_client.cc"], - deps = [ - "@nvriva_common//riva/proto:riva_grpc_tts", - "//riva/utils:stamping", - "//riva/utils/wav:writer", - "//riva/utils/wav:reader", - "//riva/utils/opus", - "@glog//:glog", - "@com_github_gflags_gflags//:gflags", - "@com_github_grpc_grpc//:grpc++", - "//riva/clients/utils:grpc", - ] -)