rename, test=doc

speechx/speechx/decoder/param.h

@@ -81,8 +81,8 @@ FeaturePipelineOptions InitFeaturePipelineOptions() {
         frame_opts.preemph_coeff = 0.0;
         opts.linear_spectrogram_opts.frame_opts = frame_opts;
     }
-    opts.dispenser_opts.frame_chunk_size = FLAGS_receptive_field_length;
+    opts.assembler_opts.frame_chunk_size = FLAGS_receptive_field_length;
-    opts.dispenser_opts.frame_chunk_stride = FLAGS_downsampling_rate;
+    opts.assembler_opts.frame_chunk_stride = FLAGS_downsampling_rate;
     return opts;
 }
 
@@ -115,4 +115,4 @@ RecognizerResource InitRecognizerResoure() {
     resource.tlg_opts = InitDecoderOptions();
     return resource;
 }
-}
+}

speechx/speechx/frontend/audio/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library(frontend STATIC
   feature_cache.cc
   feature_pipeline.cc
   fbank.cc
-  dispenser.cc
+  assembler.cc
 )
 target_link_libraries(frontend PUBLIC kaldi-matrix kaldi-feat-common kaldi-fbank)
 

speechx/speechx/frontend/audio/assembler.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "frontend/audio/dispenser.h"
+#include "frontend/audio/assembler.h"
 
 namespace ppspeech {
 
@@ -21,7 +21,7 @@ using kaldi::VectorBase;
 using kaldi::BaseFloat;
 using std::unique_ptr;
 
-Dispenser::Dispenser(DispenserOptions opts,
+Assembler::Assembler(AssemblerOptions opts,
                      unique_ptr<FrontendInterface> base_extractor) {
     frame_chunk_stride_ = opts.frame_chunk_stride;
     frame_chunk_size_ = opts.frame_chunk_size;
@@ -29,20 +29,20 @@ Dispenser::Dispenser(DispenserOptions opts,
     dim_ = base_extractor_->Dim();
 }
 
-void Dispenser::Accept(const kaldi::VectorBase<kaldi::BaseFloat>& inputs) {
+void Assembler::Accept(const kaldi::VectorBase<kaldi::BaseFloat>& inputs) {
     // read inputs
     base_extractor_->Accept(inputs);
 }
 
 // pop feature chunk
-bool Dispenser::Read(kaldi::Vector<kaldi::BaseFloat>* feats) {
+bool Assembler::Read(kaldi::Vector<kaldi::BaseFloat>* feats) {
     feats->Resize(dim_ * frame_chunk_size_);
     bool result = Compute(feats);
     return result;
 }
 
 // read all data from base_feature_extractor_ into cache_
-bool Dispenser::Compute(Vector<BaseFloat>* feats) {
+bool Assembler::Compute(Vector<BaseFloat>* feats) {
     // compute and feed
     bool result = false;
     while (feature_cache_.size() < frame_chunk_size_) {
@@ -69,4 +69,4 @@ bool Dispenser::Compute(Vector<BaseFloat>* feats) {
     return result;
 }
 
-}  // namespace ppspeech
+}  // namespace ppspeech

speechx/speechx/frontend/audio/assembler.h

@@ -19,19 +19,19 @@
 
 namespace ppspeech {
 
-struct DispenserOptions {
+struct AssemblerOptions {
     int32 frame_chunk_size;
     int32 frame_chunk_stride;
     
-    DispenserOptions()
+    AssemblerOptions()
         : frame_chunk_size(1),
           frame_chunk_stride(1) {}
 };
 
-class Dispenser : public FrontendInterface {
+class Assembler : public FrontendInterface {
   public:
-    explicit Dispenser(
+    explicit Assembler(
-        DispenserOptions opts,
+        AssemblerOptions opts,
         std::unique_ptr<FrontendInterface> base_extractor = NULL);
 
     // Feed feats or waves
@@ -61,7 +61,7 @@ class Dispenser : public FrontendInterface {
     int32 frame_chunk_stride_;  // stride
     std::queue<kaldi::Vector<kaldi::BaseFloat>> feature_cache_;
     std::unique_ptr<FrontendInterface> base_extractor_;
-    DISALLOW_COPY_AND_ASSIGN(Dispenser);
+    DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace ppspeech

speechx/speechx/frontend/audio/feature_pipeline.cc

@@ -39,7 +39,7 @@ FeaturePipeline::FeaturePipeline(const FeaturePipelineOptions& opts) {
         new ppspeech::FeatureCache(opts.feature_cache_opts, std::move(cmvn)));
 
     base_extractor_.reset(
-        new ppspeech::Dispenser(opts.dispenser_opts, std::move(cache)));
+        new ppspeech::Assembler(opts.assembler_opts, std::move(cache)));
 }
 
-}  // ppspeech
+}  // ppspeech

speechx/speechx/frontend/audio/feature_pipeline.h

@@ -23,7 +23,7 @@
 #include "frontend/audio/frontend_itf.h"
 #include "frontend/audio/linear_spectrogram.h"
 #include "frontend/audio/normalizer.h"
-#include "frontend/audio/dispenser.h"
+#include "frontend/audio/assembler.h"
 
 namespace ppspeech {
 
@@ -34,7 +34,7 @@ struct FeaturePipelineOptions {
     LinearSpectrogramOptions linear_spectrogram_opts;
     FbankOptions fbank_opts;
     FeatureCacheOptions feature_cache_opts;
-    DispenserOptions dispenser_opts;
+    AssemblerOptions assembler_opts;
 
     FeaturePipelineOptions()
         : cmvn_file(""),
@@ -43,7 +43,7 @@ struct FeaturePipelineOptions {
           linear_spectrogram_opts(),
           fbank_opts(),
           feature_cache_opts(),
-          dispenser_opts() {}
+          assembler_opts() {}
 };
 
 class FeaturePipeline : public FrontendInterface {
@@ -63,4 +63,4 @@ class FeaturePipeline : public FrontendInterface {
   private:
     std::unique_ptr<FrontendInterface> base_extractor_;
 };
-}
+}