commit c6cf24cb1bfe205173fb9f41b7cf929c57745113
author Sameer Agarwal <sameeragarwal@google.com> Sun Apr 22 13:37:59 2018 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Sat Apr 28 17:17:32 2018 +0000
tree 3ddf7ad332ff09872a013cba348d60de754f9e8e
parent 7c037647faf6a737e52f03934fe5429dd98bff95

Update Android.mk

1. Add some missing files.
2. Add support for EIGEN_SPARSE.
3. Enable OpenMP threading by default.

https://github.com/ceres-solver/ceres-solver/issues/362

Change-Id: I68c6369d0176a2f48c3d036400b5b0675f2e4abb

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 80861dd..d179406 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -108,17 +108,8 @@
                 -DCERES_NO_LAPACK \
                 -DCERES_NO_SUITESPARSE \
                 -DCERES_NO_CXSPARSE \
-                -DCERES_STD_UNORDERED_MAP
-
-
-# If the user did not enable threads in CERES_EXTRA_DEFINES, then add
-# CERES_NO_THREADS.
-#
-# TODO(sameeragarwal): Update comments here and in the docs to
-# demonstrate how OpenMP can be used by the user.
-ifeq (,$(findstring CERES_HAVE_PTHREAD, $(LOCAL_CFLAGS)))
-  LOCAL_CFLAGS += -DCERES_NO_THREADS
-endif
+                -DCERES_USE_EIGEN_SPARSE \
+                -DCERES_USE_OPENMP
 
 LOCAL_SRC_FILES := $(CERES_SRC_PATH)/array_utils.cc \
                    $(CERES_SRC_PATH)/blas.cc \
@@ -163,6 +154,7 @@
                    $(CERES_SRC_PATH)/is_close.cc \
                    $(CERES_SRC_PATH)/implicit_schur_complement.cc \
                    $(CERES_SRC_PATH)/inner_product_computer.cc \
+                   $(CERES_SRC_PATH)/iterative_refiner.cc \
                    $(CERES_SRC_PATH)/iterative_schur_complement_solver.cc \
                    $(CERES_SRC_PATH)/lapack.cc \
                    $(CERES_SRC_PATH)/levenberg_marquardt_strategy.cc \
@@ -178,6 +170,7 @@
                    $(CERES_SRC_PATH)/low_rank_inverse_hessian.cc \
                    $(CERES_SRC_PATH)/minimizer.cc \
                    $(CERES_SRC_PATH)/normal_prior.cc \
+                   $(CERES_SRC_PATH)/parallel_utils.cc \
                    $(CERES_SRC_PATH)/parallel_for_openmp.cc \
                    $(CERES_SRC_PATH)/parameter_block_ordering.cc \
                    $(CERES_SRC_PATH)/partitioned_matrix_view.cc \
@@ -205,6 +198,7 @@
                    $(CERES_SRC_PATH)/stringprintf.cc \
                    $(CERES_SRC_PATH)/subset_preconditioner.cc \
                    $(CERES_SRC_PATH)/suitesparse.cc \
+                   $(CERES_SRC_PATH)/thread_token_provider.cc \
                    $(CERES_SRC_PATH)/triplet_sparse_matrix.cc \
                    $(CERES_SRC_PATH)/trust_region_minimizer.cc \
                    $(CERES_SRC_PATH)/trust_region_preprocessor.cc \