svn commit: r425677 - in head/math/ceres-solver: . files
Jan Beich
jbeich at FreeBSD.org
Tue Nov 8 03:54:31 UTC 2016
Author: jbeich
Date: Tue Nov 8 03:54:30 2016
New Revision: 425677
URL: https://svnweb.freebsd.org/changeset/ports/425677
Log:
math/ceres-solver: unbreak OPENMP=off on 10.0+ i386
In file included from examples/helloworld.cc:36:
In file included from include/ceres/ceres.h:37:
In file included from include/ceres/autodiff_cost_function.h:132:
In file included from include/ceres/internal/autodiff.h:145:
include/ceres/jet.h:246:3: error: requested alignment is less than minimum alignment of 4 for type 'Eigen::Matrix<double, 1, 1, kAlignHint>'
alignas(kAlignment) Eigen::Matrix<T, N, 1, kAlignHint> v;
^
include/ceres/internal/autodiff.h:232:34: note: in instantiation of template class 'ceres::Jet<double, 1>' requested here
FixedArray<JetT, (256 * 7) / sizeof(JetT)> x(
^
include/ceres/autodiff_cost_function.h:211:53: note: in instantiation of member function 'ceres::internal::AutoDiff<CostFunctor, double, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0>::Differentiate' requested here
N0, N1, N2, N3, N4, N5, N6, N7, N8, N9>::Differentiate(
^
examples/helloworld.cc:70:11: note: in instantiation of member function 'ceres::AutoDiffCostFunction<CostFunctor, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0>::Evaluate' requested here
new AutoDiffCostFunction<CostFunctor, 1, 1>(new CostFunctor);
^
Tested by: cmp before.o after.o # GCC 4.8 / 6.2
Added:
head/math/ceres-solver/files/
head/math/ceres-solver/files/patch-include_ceres_jet.h (contents, props changed)
Modified:
head/math/ceres-solver/Makefile (contents, props changed)
Modified: head/math/ceres-solver/Makefile
==============================================================================
--- head/math/ceres-solver/Makefile Tue Nov 8 03:45:22 2016 (r425676)
+++ head/math/ceres-solver/Makefile Tue Nov 8 03:54:30 2016 (r425677)
@@ -2,7 +2,7 @@
PORTNAME= ceres-solver
DISTVERSION= 1.12.0rc1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MAINTAINER= jbeich at FreeBSD.org
Added: head/math/ceres-solver/files/patch-include_ceres_jet.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/ceres-solver/files/patch-include_ceres_jet.h Tue Nov 8 03:54:30 2016 (r425677)
@@ -0,0 +1,13 @@
+https://github.com/ceres-solver/ceres-solver/issues/235
+
+--- include/ceres/jet.h.orig 2016-10-13 16:52:02 UTC
++++ include/ceres/jet.h
+@@ -242,7 +242,7 @@ struct Jet {
+ 16 <= ::ceres::port_constants::kMaxAlignBytes;
+ static constexpr int kAlignHint = kShouldAlignMatrix ?
+ Eigen::AutoAlign : Eigen::DontAlign;
+- static constexpr size_t kAlignment = kShouldAlignMatrix ? 16 : 1;
++ static constexpr size_t kAlignment = kShouldAlignMatrix ? 16 : 4;
+ alignas(kAlignment) Eigen::Matrix<T, N, 1, kAlignHint> v;
+ #endif
+ };
More information about the svn-ports-head
mailing list