Merge commit '660e37537636b000eda180f74b3bbaf53e52613b' into master
Upgrade ceres to the 2.0.0 release before starting to use it seriously
Change-Id: I89dd4bb1c1044d9034a254f9e2c4c03952f958a2
diff --git a/third_party/ceres/bazel/ceres.bzl b/third_party/ceres/bazel/ceres.bzl
index b33aeb3..fff9c30 100644
--- a/third_party/ceres/bazel/ceres.bzl
+++ b/third_party/ceres/bazel/ceres.bzl
@@ -137,9 +137,7 @@
# like SuiteSparse or not, threading or not, glog or not, and so on.
# See https://github.com/ceres-solver/ceres-solver/issues/335.
def ceres_library(name,
- restrict_schur_specializations=False,
- extra_copts=[],
- gflags_namespace="gflags"):
+ restrict_schur_specializations=False):
# The path to internal/ depends on whether Ceres is the main workspace or
# an external repository.
if native.repository_name() != '@':
@@ -184,10 +182,9 @@
copts = [
"-I" + internal,
"-Wno-sign-compare",
- "-Wno-ignored-qualifiers",
- "-Wno-unused-parameter",
"-Wno-format-nonliteral",
- ] + schur_eliminator_copts + extra_copts,
+ "-Wno-unused-parameter",
+ ] + schur_eliminator_copts,
# These include directories and defines are propagated to other targets
# depending on Ceres.
@@ -201,8 +198,7 @@
"CERES_NO_ACCELERATE_SPARSE",
"CERES_NO_LAPACK",
"CERES_USE_EIGEN_SPARSE",
- "CERES_USE_CXX11_THREADS",
- "CERES_GFLAGS_NAMESPACE=" + gflags_namespace,
+ "CERES_USE_CXX_THREADS",
],
includes = [
"config",
diff --git a/third_party/ceres/bazel/eigen.BUILD b/third_party/ceres/bazel/eigen.BUILD
deleted file mode 100644
index 2733d48..0000000
--- a/third_party/ceres/bazel/eigen.BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Ceres Solver - A fast non-linear least squares minimizer
-# Copyright 2018 Google Inc. All rights reserved.
-# http://ceres-solver.org/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-# * Neither the name of Google Inc. nor the names of its contributors may be
-# used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: mierle@gmail.com (Keir Mierle)
-
-# TODO(keir): Replace this with a better version, like from TensorFlow.
-# See https://github.com/ceres-solver/ceres-solver/issues/337.
-cc_library(
- name = "eigen",
- srcs = [],
- hdrs = glob(["Eigen/**"]),
- includes = ["."],
- visibility = ["//visibility:public"],
-)