Commit 18057466 authored by Vijayaditya Peddinti's avatar Vijayaditya Peddinti
Browse files

Minor changes.

parent 03934435
......@@ -51,7 +51,6 @@ int32 Nnet::LeftContext() const {
// non-negative left context. In addition, the NnetExample also stores data
// left context as positive integer. To be compatible with these other classes
// Nnet::LeftContext() returns a non-negative left context.
}
int32 Nnet::RightContext() const {
......@@ -66,8 +65,8 @@ int32 Nnet::RightContext() const {
void Nnet::ComputeChunkInfo(int32 input_chunk_size,
int32 num_chunks,
std::vector<ChunkInfo> *chunk_info_out) const {
// First compute the output-chunk indices for the last component in the network.
// we assume that the numbering of the input starts from zero.
// First compute the output-chunk indices for the last component in the
// network. we assume that the numbering of the input starts from zero.
int32 output_chunk_size = input_chunk_size - LeftContext() - RightContext();
KALDI_ASSERT(output_chunk_size > 0);
std::vector<int32> current_output_inds;
......@@ -137,7 +136,6 @@ void Nnet::ComputeChunkInfo(int32 input_chunk_size,
(*chunk_info_out)[i].Check();
// (*chunk_info_out)[i].ToString();
}
}
const Component& Nnet::GetComponent(int32 component) const {
......@@ -359,7 +357,8 @@ void Nnet::ResizeOutputLayer(int32 new_num_pdfs) {
KALDI_ASSERT(new_num_pdfs > 0);
KALDI_ASSERT(NumComponents() > 2);
int32 nc = NumComponents();
SumGroupComponent *sgc = dynamic_cast<SumGroupComponent*>(components_[nc - 1]);
SumGroupComponent *sgc =
dynamic_cast<SumGroupComponent*>(components_[nc - 1]);
if (sgc != NULL) {
// Remove it. We'll resize things later.
delete sgc;
......@@ -367,7 +366,6 @@ void Nnet::ResizeOutputLayer(int32 new_num_pdfs) {
components_.begin() + nc);
nc--;
}
SoftmaxComponent *sc;
if ((sc = dynamic_cast<SoftmaxComponent*>(components_[nc - 1])) == NULL)
KALDI_ERR << "Expected last component to be SoftmaxComponent.";
......@@ -385,7 +383,6 @@ void Nnet::ResizeOutputLayer(int32 new_num_pdfs) {
fixed_scale_component_index = nc - 2;
final_affine_component_index = nc - 3;
}
// note: it could be child class of AffineComponent.
AffineComponent *ac = dynamic_cast<AffineComponent*>(
components_[final_affine_component_index]);
......@@ -394,7 +391,8 @@ void Nnet::ResizeOutputLayer(int32 new_num_pdfs) {
<< "AffineComponent).";
if (has_fixed_scale_component) {
// collapse the fixed_scale_component with the affine_component before it
AffineComponent *ac_new = dynamic_cast<AffineComponent*>(ac->CollapseWithNext(*fsc));
AffineComponent *ac_new =
dynamic_cast<AffineComponent*>(ac->CollapseWithNext(*fsc));
KALDI_ASSERT(ac_new != NULL);
delete fsc;
delete ac;
......@@ -404,11 +402,11 @@ void Nnet::ResizeOutputLayer(int32 new_num_pdfs) {
ac = ac_new;
softmax_component_index = softmax_component_index - 1;
}
ac->Resize(ac->InputDim(), new_num_pdfs);
// Remove the softmax component, and replace it with a new one
delete components_[softmax_component_index];
components_[softmax_component_index] = new SoftmaxComponent(new_num_pdfs);
this->SetIndexes(); // used for debugging
this->Check();
}
......@@ -682,7 +680,8 @@ void Nnet::Vectorize(VectorBase<BaseFloat> *params) const {
KALDI_ASSERT(offset == GetParameterDim());
}
void Nnet::ResetGenerators() { // resets random-number generators for all random
void Nnet::ResetGenerators() {
// resets random-number generators for all random
// components.
for (int32 c = 0; c < NumComponents(); c++) {
RandomComponent *rc = dynamic_cast<RandomComponent*>(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment