From 8e8823be127b80ae6b1b70dbbd95bb4bbe5f5424 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 8 Apr 2013 17:05:48 +0000 Subject: Update ceres to current upstream version Brings fixes for BLAS. --- extern/libmv/third_party/ceres/ChangeLog | 60 +++++++++++----------- .../libmv/third_party/ceres/internal/ceres/blas.h | 12 ++--- .../ceres/internal/ceres/problem_impl.cc | 2 +- 3 files changed, 37 insertions(+), 37 deletions(-) (limited to 'extern/libmv') diff --git a/extern/libmv/third_party/ceres/ChangeLog b/extern/libmv/third_party/ceres/ChangeLog index 46c7b6ac291..062bc250617 100644 --- a/extern/libmv/third_party/ceres/ChangeLog +++ b/extern/libmv/third_party/ceres/ChangeLog @@ -1,3 +1,33 @@ +commit c290df85a40a8dd117b5eccc515bf22b0d9b1945 +Author: Sameer Agarwal +Date: Sun Apr 7 09:17:47 2013 -0700 + + Typo fix. + + (Thanks to Pieree Moulon for reporting this) + + Change-Id: I536724ab4b7e9c97768d5197aa86b41f37a04d38 + +commit dc3a27fa60ba7c6b152660afd5abe1c8b608dec3 +Author: Sameer Agarwal +Date: Sat Apr 6 19:32:47 2013 -0700 + + Fix MatrixVectorMultiply and incorrect DCHECKS. + + (Thanks to Serget Sharybin for reporting this) + + Change-Id: I6bbc41667308fc2932871cf25ad07b431f70801f + +commit 585607171f20d591033dfea43b6dd22fea755a6c +Author: Petter Strandmark +Date: Sun Apr 7 01:24:13 2013 +0200 + + needed for back_insert_iterator + + Adding this header was required to make Ceres compile with VS2010. + + Change-Id: I000c860da4fd385d625e70695564225bdfd433c7 + commit 520d35ef22dbcb05e344451c03ae64304e524a06 Author: Sameer Agarwal Date: Thu Apr 4 08:16:02 2013 -0700 @@ -589,33 +619,3 @@ Date: Fri Feb 15 18:28:11 2013 -0500 native libraries are installed to /usr/lib64 Change-Id: I71b4fae7b459c003cb5fac981278c668f2e29779 - -commit 70701745b85fef7eeba2c978ae849fd48927699c -Author: Taylor Braun-Jones -Date: Fri Feb 15 19:09:48 2013 -0500 - - Add RPM .spec file - - Tested on RHEL6.1 (with epel repository for dependencies). - - make_release checks that that the version string in the .spec file is in - sync with the rest of the project and reminds the user to bump the - release string if necessary and to build/upload the RPM package. - - Change-Id: I5f454f2a7301d1e0e120cb3c0e13a68d03bca917 - -commit d2a5195b512164fec286c6a52b40d7766977caa3 -Author: Sameer Agarwal -Date: Sun Feb 24 15:09:17 2013 -0800 - - Version history update. - - Change-Id: I477ec05a78ca4cd735a525253c9b6adfa3bddea7 - -commit 2160c5b757c44206c6face6ca62d381f1db7a291 -Author: Sameer Agarwal -Date: Sun Feb 24 14:15:45 2013 -0800 - - Minor release script fixes. - - Change-Id: Ifd0a7f4f584c85d4d9574eca46094b372a8d7aff diff --git a/extern/libmv/third_party/ceres/internal/ceres/blas.h b/extern/libmv/third_party/ceres/internal/ceres/blas.h index 12667d09e55..bacf1fff96a 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/blas.h +++ b/extern/libmv/third_party/ceres/internal/ceres/blas.h @@ -171,8 +171,8 @@ inline void MatrixMatrixMultiplyNaive(const double* A, const int NUM_ROW_C = NUM_ROW_A; const int NUM_COL_C = NUM_COL_B; - DCHECK_LT(start_row_c + NUM_ROW_C, row_stride_c); - DCHECK_LT(start_col_c + NUM_COL_C, col_stride_c); + DCHECK_LE(start_row_c + NUM_ROW_C, row_stride_c); + DCHECK_LE(start_col_c + NUM_COL_C, col_stride_c); for (int row = 0; row < NUM_ROW_C; ++row) { for (int col = 0; col < NUM_COL_C; ++col) { @@ -324,8 +324,8 @@ inline void MatrixTransposeMatrixMultiplyNaive(const double* A, const int NUM_ROW_C = NUM_COL_A; const int NUM_COL_C = NUM_COL_B; - DCHECK_LT(start_row_c + NUM_ROW_C, row_stride_c); - DCHECK_LT(start_col_c + NUM_COL_C, col_stride_c); + DCHECK_LE(start_row_c + NUM_ROW_C, row_stride_c); + DCHECK_LE(start_col_c + NUM_COL_C, col_stride_c); for (int row = 0; row < NUM_ROW_C; ++row) { for (int col = 0; col < NUM_COL_C; ++col) { @@ -401,7 +401,7 @@ inline void MatrixVectorMultiply(const double* A, } else if (kOperation < 0) { cref -= Aref.lazyProduct(bref); } else { - cref -= Aref.lazyProduct(bref); + cref = Aref.lazyProduct(bref); } #else @@ -459,7 +459,7 @@ inline void MatrixTransposeVectorMultiply(const double* A, } else if (kOperation < 0) { cref -= Aref.transpose().lazyProduct(bref); } else { - cref -= Aref.transpose().lazyProduct(bref); + cref = Aref.transpose().lazyProduct(bref); } #else diff --git a/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc b/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc index 69d672ed9c6..f4615f94768 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc +++ b/extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc @@ -84,7 +84,7 @@ void CheckForNoAliasing(double* existing_block, << "Aliasing detected between existing parameter block at memory " << "location " << existing_block << " and has size " << existing_block_size << " with new parameter " - << "block that has memory adderss " << new_block << " and would have " + << "block that has memory address " << new_block << " and would have " << "size " << new_block_size << "."; } -- cgit v1.2.3