Solver::FullReport now reports build config.
The header of Summary::FullReport now looks like
Solver Summary (v 1.10.0-suitesparse-cxsparse-lapack-no_openmp)
Original Reduced
Parameter blocks 22122 22122
Parameters 66462 66462
Residual blocks 83718 83718
Residual 167436 167436
Change-Id: Id1b81bbf90ba412d19e2dd3687eeb9d372b72c1b
diff --git a/cmake/config.h.in b/cmake/config.h.in
index 2828ab8..2b61142 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -76,10 +76,6 @@
@CERES_TR1_UNORDERED_MAP@
@CERES_NO_UNORDERED_MAP@
-// If defined Ceres was compiled for Android with noalias() removed from
-// matrix-matrix multiplies to work around a bug in the Android NDK.
-@CERES_WORK_AROUND_ANDROID_NDK_COMPILER_BUG@
-
// If defined, the memory header is in <tr1/memory>, otherwise <memory>.
@CERES_TR1_MEMORY_HEADER@
diff --git a/internal/ceres/solver.cc b/internal/ceres/solver.cc
index f62ab5d..2c5be80 100644
--- a/internal/ceres/solver.cc
+++ b/internal/ceres/solver.cc
@@ -441,6 +441,44 @@
}
}
+string VersionString() {
+ string value = string(CERES_VERSION_STRING);
+
+#ifdef CERES_NO_LAPACK
+ value += "-no_lapack";
+#else
+ value += "-lapack";
+#endif
+
+#ifndef CERES_NO_SUITESPARSE
+ value += "-suitesparse";
+#endif
+
+#ifndef CERES_NO_CXSPARSE
+ value += "-cxsparse";
+#endif
+
+#ifdef CERES_USE_EIGEN_SPARSE
+ value += "-eigensparse";
+#endif
+
+#ifdef CERES_RESTRUCT_SCHUR_SPECIALIZATIONS
+ value += "-no_schur_specializations";
+#endif
+
+#ifdef CERES_USE_OPENMP
+ value += "-openmp";
+#else
+ value += "-no_openmp";
+#endif
+
+#ifdef CERES_NO_CUSTOM_BLAS
+ value += "-no_custom_blas";
+#endif
+
+ return value;
+}
+
} // namespace
bool Solver::Options::IsValid(string* error) const {
@@ -602,10 +640,7 @@
};
string Solver::Summary::FullReport() const {
- string report =
- "\n"
- "Ceres Solver v" CERES_VERSION_STRING " Solve Report\n"
- "----------------------------------\n";
+ string report = string("\nSolver Summary (v " + VersionString() + ")\n\n");
StringAppendF(&report, "%45s %21s\n", "Original", "Reduced");
StringAppendF(&report, "Parameter blocks % 25d% 25d\n",
