From 858b680a50888a071d5d37af261b0c89b47aea8c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 10 Dec 2015 01:18:01 +0100 Subject: Eigen: move C API into intern/eigen. --- intern/eigen/CMakeLists.txt | 44 +++++++++++++++++++++++ intern/eigen/SConscript | 35 ++++++++++++++++++ intern/eigen/eigen_capi.h | 33 +++++++++++++++++ intern/eigen/intern/eigenvalues.cc | 70 ++++++++++++++++++++++++++++++++++++ intern/eigen/intern/eigenvalues.h | 40 +++++++++++++++++++++ intern/eigen/intern/svd.cc | 72 ++++++++++++++++++++++++++++++++++++++ intern/eigen/intern/svd.h | 40 +++++++++++++++++++++ 7 files changed, 334 insertions(+) create mode 100644 intern/eigen/CMakeLists.txt create mode 100644 intern/eigen/SConscript create mode 100644 intern/eigen/eigen_capi.h create mode 100644 intern/eigen/intern/eigenvalues.cc create mode 100644 intern/eigen/intern/eigenvalues.h create mode 100644 intern/eigen/intern/svd.cc create mode 100644 intern/eigen/intern/svd.h (limited to 'intern/eigen') diff --git a/intern/eigen/CMakeLists.txt b/intern/eigen/CMakeLists.txt new file mode 100644 index 00000000000..58964e43224 --- /dev/null +++ b/intern/eigen/CMakeLists.txt @@ -0,0 +1,44 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2015, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Bastien Montagne. +# +# ***** END GPL LICENSE BLOCK ***** + +set(INC + . +) + +set(INC_SYS + ${EIGEN3_INCLUDE_DIRS} +) + +set(SRC + eigen_capi.h + + intern/eigenvalues.cc + intern/svd.cc + + intern/eigenvalues.h + intern/svd.h +) + +blender_add_lib(bf_intern_eigen "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/eigen/SConscript b/intern/eigen/SConscript new file mode 100644 index 00000000000..0c98ec1837d --- /dev/null +++ b/intern/eigen/SConscript @@ -0,0 +1,35 @@ +#!/usr/bin/env python +# +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2015, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Bastien Montagne. +# +# ***** END GPL LICENSE BLOCK ***** + +Import('env') + +sources = env.Glob('intern/*.cc') + +incs = '. #/extern/Eigen3' +defs = [] + +env.BlenderLib('bf_intern_eigen', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) diff --git a/intern/eigen/eigen_capi.h b/intern/eigen/eigen_capi.h new file mode 100644 index 00000000000..45ee1c015ec --- /dev/null +++ b/intern/eigen/eigen_capi.h @@ -0,0 +1,33 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN_C_API_H__ +#define __EIGEN_C_API_H__ + +#include "intern/eigenvalues.h" +#include "intern/svd.h" + +#endif /* __EIGEN_C_API_H__ */ diff --git a/intern/eigen/intern/eigenvalues.cc b/intern/eigen/intern/eigenvalues.cc new file mode 100644 index 00000000000..dcaaee8e9c2 --- /dev/null +++ b/intern/eigen/intern/eigenvalues.cc @@ -0,0 +1,70 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN3_EIGENVALUES_C_API_CC__ +#define __EIGEN3_EIGENVALUES_C_API_CC__ + +/* Eigen gives annoying huge amount of warnings here, silence them! */ +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wlogical-op" +#endif + +#include +#include + +#include "eigenvalues.h" + +using Eigen::SelfAdjointEigenSolver; + +using Eigen::MatrixXf; +using Eigen::VectorXf; +using Eigen::Map; + +using Eigen::Success; + +bool EG3_self_adjoint_eigen_solve(const int size, const float *matrix, float *r_eigen_values, float *r_eigen_vectors) +{ + SelfAdjointEigenSolver eigen_solver; + + /* Blender and Eigen matrices are both column-major. */ + eigen_solver.compute(Map((float *)matrix, size, size)); + + if (eigen_solver.info() != Success) { + return false; + } + + if (r_eigen_values) { + Map(r_eigen_values, size) = eigen_solver.eigenvalues().transpose(); + } + + if (r_eigen_vectors) { + Map(r_eigen_vectors, size, size) = eigen_solver.eigenvectors(); + } + + return true; +} + +#endif /* __EIGEN3_EIGENVALUES_C_API_CC__ */ diff --git a/intern/eigen/intern/eigenvalues.h b/intern/eigen/intern/eigenvalues.h new file mode 100644 index 00000000000..93fc06c2339 --- /dev/null +++ b/intern/eigen/intern/eigenvalues.h @@ -0,0 +1,40 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN3_EIGENVALUES_C_API_H__ +#define __EIGEN3_EIGENVALUES_C_API_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +bool EG3_self_adjoint_eigen_solve(const int size, const float *matrix, float *r_eigen_values, float *r_eigen_vectors); + +#ifdef __cplusplus +} +#endif + +#endif /* __EIGEN3_EIGENVALUES_C_API_H__ */ diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc new file mode 100644 index 00000000000..e39a8261edb --- /dev/null +++ b/intern/eigen/intern/svd.cc @@ -0,0 +1,72 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN3_SVD_C_API_CC__ +#define __EIGEN3_SVD_C_API_CC__ + +/* Eigen gives annoying huge amount of warnings here, silence them! */ +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wlogical-op" +#endif + +#include +#include + +#include "svd.h" + +using Eigen::JacobiSVD; + +using Eigen::NoQRPreconditioner; + +using Eigen::ComputeThinU; +using Eigen::ComputeThinV; + +using Eigen::MatrixXf; +using Eigen::VectorXf; +using Eigen::Map; + +void EG3_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V) +{ + /* Since our matrix is squared, we can use thinU/V. */ + unsigned int flags = (r_U ? ComputeThinU : 0) | (r_V ? ComputeThinV : 0); + + /* Blender and Eigen matrices are both column-major. */ + JacobiSVD svd(Map((float *)matrix, size, size), flags); + + if (r_U) { + Map(r_U, size, size) = svd.matrixU(); + } + + if (r_S) { + Map(r_S, size) = svd.singularValues(); + } + + if (r_V) { + Map(r_V, size, size) = svd.matrixV(); + } +} + +#endif /* __EIGEN3_SVD_C_API_CC__ */ diff --git a/intern/eigen/intern/svd.h b/intern/eigen/intern/svd.h new file mode 100644 index 00000000000..0ac51108977 --- /dev/null +++ b/intern/eigen/intern/svd.h @@ -0,0 +1,40 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2015 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation, + * Bastien Montagne + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __EIGEN3_SVD_C_API_H__ +#define __EIGEN3_SVD_C_API_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +void EG3_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V); + +#ifdef __cplusplus +} +#endif + +#endif /* __EIGEN3_SVD_C_API_H__ */ -- cgit v1.2.3