Fix broken build.

Fix broken build and verbosity issues.

1. While cleaning up the last CL, I broke a macro.
2. cholmod_common_print was being called too often.

Change-Id: Ia76d8863c72f31b0c02977094b22035ceef835cf
This commit is contained in:
Sameer Agarwal
2012-06-06 22:26:09 -07:00
parent 7a3c43b847
commit cb83b2801e
4 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -287,10 +287,10 @@ bool SparseSchurComplementSolver::SolveReducedLinearSystemUsingSuiteSparse(
} else {
factor_ = ss_.AnalyzeCholesky(cholmod_lhs);
}
}
if (VLOG_IS_ON(2)) {
cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
if (VLOG_IS_ON(2)) {
cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
}
}
CHECK_NOTNULL(factor_);
@@ -189,10 +189,10 @@ LinearSolver::Summary SparseNormalCholeskySolver::SolveImplUsingSuiteSparse(
} else {
factor_ = ss_.AnalyzeCholesky(lhs.get());
}
}
if (VLOG_IS_ON(2)) {
cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
if (VLOG_IS_ON(2)) {
cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
}
}
CHECK_NOTNULL(factor_);
+1 -1
View File
@@ -135,7 +135,7 @@ TEST(SuiteSparse, ScalarMatrixToBlockMatrix) {
fill(tsm.mutable_values(), tsm.mutable_values() + 15, 1.0);
int offset = 0;
#define CERES_TEST_FILL_BLOCK(r, c) \
#define CERES_TEST_FILL_BLOCK(row_block_id, col_block_id) \
offset += FillBlock(row_blocks, col_blocks, \
row_block_id, col_block_id, \
rows + offset, cols + offset);
@@ -453,10 +453,10 @@ bool VisibilityBasedPreconditioner::Factorize() {
} else {
factor_ = ss_.AnalyzeCholesky(lhs);
}
}
if (VLOG_IS_ON(2)) {
cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
if (VLOG_IS_ON(2)) {
cholmod_print_common("Symbolic Analysis", ss_.mutable_cc());
}
}
CHECK_NOTNULL(factor_);