Commit f7c16adc authored by Dan Povey's avatar Dan Povey
Browse files

trunk: minor commit (compiler bug workaround)

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@2823 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
parent 70fb8495
......@@ -345,8 +345,8 @@ void OptimizeLbfgs<Real>::StepSizeIteration(Real function_value,
<< "will restart computation.";
iteration_action = kRestart;
}
if (new_x_.ApproxEqual(temp_, 1.0e-04) &&
std::abs(f_ - function_value) < 1.0e-04 *
if (new_x_.ApproxEqual(temp_, 1.0e-08) &&
std::abs(f_ - function_value) < 1.0e-08 *
std::abs(f_) && iteration_action == kDecreaseStep) {
// This is common and due to roundoff.
KALDI_VLOG(3) << "We appear to be backtracking while we are extremely "
......
......@@ -514,8 +514,7 @@ void SpMatrix<Real>::TopEigs(VectorBase<Real> *s, MatrixBase<Real> *P,
}
// Instantiate the templates for Eig and TopEig; this will instantiate the
// other templates defined here because they call the others.
// Instantiate the templates for Eig and TopEig.
template
void SpMatrix<float>::Eig(VectorBase<float>*, MatrixBase<float>*) const;
template
......@@ -526,6 +525,13 @@ void SpMatrix<float>::TopEigs(VectorBase<float>*, MatrixBase<float>*, MatrixInde
template
void SpMatrix<double>::TopEigs(VectorBase<double>*, MatrixBase<double>*, MatrixIndexT) const;
// Someone had a problem with the Intel compiler with -O3, with Qr not being
// defined for some strange reason (should automatically happen when
// we instantiate Eig and TopEigs), so we explicitly instantiate it here.
template
void SpMatrix<float>::Qr(MatrixBase<float> *Q);
template
void SpMatrix<double>::Qr(MatrixBase<double> *Q);
......
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