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. --- .../cmake/cmake_consistency_check_config.py | 3 - build_files/cmake/macros.cmake | 2 +- extern/CMakeLists.txt | 1 - extern/Eigen3/CMakeLists.txt | 43 ------------- extern/Eigen3/SConscript | 35 ----------- extern/Eigen3/eigen3_capi.h | 33 ---------- extern/Eigen3/intern/eigenvalues.cc | 70 --------------------- extern/Eigen3/intern/eigenvalues.h | 40 ------------ extern/Eigen3/intern/svd.cc | 72 ---------------------- extern/Eigen3/intern/svd.h | 40 ------------ extern/SConscript | 1 - intern/CMakeLists.txt | 1 + intern/SConscript | 1 + 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 ++++++++++++ source/blender/blenlib/CMakeLists.txt | 2 +- source/blender/blenlib/SConscript | 2 +- source/blender/blenlib/intern/math_solvers.c | 2 +- source/blender/physics/CMakeLists.txt | 2 +- source/blenderplayer/CMakeLists.txt | 2 +- tests/gtests/blenlib/CMakeLists.txt | 4 +- 26 files changed, 344 insertions(+), 346 deletions(-) delete mode 100644 extern/Eigen3/CMakeLists.txt delete mode 100644 extern/Eigen3/SConscript delete mode 100644 extern/Eigen3/eigen3_capi.h delete mode 100644 extern/Eigen3/intern/eigenvalues.cc delete mode 100644 extern/Eigen3/intern/eigenvalues.h delete mode 100644 extern/Eigen3/intern/svd.cc delete mode 100644 extern/Eigen3/intern/svd.h 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 diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py index 1f75b9884bc..5345f682f58 100644 --- a/build_files/cmake/cmake_consistency_check_config.py +++ b/build_files/cmake/cmake_consistency_check_config.py @@ -10,9 +10,6 @@ IGNORE = ( "/ik_glut_test/", # specific source files - "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp", - "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp", - "extern/Eigen2/Eigen/src/QR/QrInstantiations.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp", "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp", diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 74ef7b18de1..39c12f2c4d9 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -626,12 +626,12 @@ function(SETUP_BLENDER_SORTED_LIBS) cycles_subd bf_intern_raskter bf_intern_opencolorio + bf_intern_eigen extern_rangetree extern_wcwidth extern_libmv extern_glog extern_sdlew - extern_eigen3 bf_intern_glew_mx ) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 93f57b04d4e..d0c587b80e4 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -29,7 +29,6 @@ remove_strict_flags() add_subdirectory(rangetree) add_subdirectory(wcwidth) add_subdirectory(libmv) -add_subdirectory(Eigen3) if(WITH_OPENNL) add_subdirectory(colamd) diff --git a/extern/Eigen3/CMakeLists.txt b/extern/Eigen3/CMakeLists.txt deleted file mode 100644 index e3b63881aca..00000000000 --- a/extern/Eigen3/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# ***** 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 -) - -set(SRC - eigen3_capi.h - - intern/eigenvalues.cc - intern/svd.cc - - intern/eigenvalues.h - intern/svd.h -) - -blender_add_lib(extern_eigen3 "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/Eigen3/SConscript b/extern/Eigen3/SConscript deleted file mode 100644 index 2dc2d623768..00000000000 --- a/extern/Eigen3/SConscript +++ /dev/null @@ -1,35 +0,0 @@ -#!/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 = '.' -defs = [] - -env.BlenderLib('extern_eigen3', sources, Split(incs), defs, libtype=['extern','player'], priority=[10, 185]) diff --git a/extern/Eigen3/eigen3_capi.h b/extern/Eigen3/eigen3_capi.h deleted file mode 100644 index f8a7b3cbb77..00000000000 --- a/extern/Eigen3/eigen3_capi.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * ***** 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_C_API_H__ -#define __EIGEN3_C_API_H__ - -#include "intern/eigenvalues.h" -#include "intern/svd.h" - -#endif /* __EIGEN3_C_API_H__ */ diff --git a/extern/Eigen3/intern/eigenvalues.cc b/extern/Eigen3/intern/eigenvalues.cc deleted file mode 100644 index dcaaee8e9c2..00000000000 --- a/extern/Eigen3/intern/eigenvalues.cc +++ /dev/null @@ -1,70 +0,0 @@ -/* - * ***** 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/extern/Eigen3/intern/eigenvalues.h b/extern/Eigen3/intern/eigenvalues.h deleted file mode 100644 index 93fc06c2339..00000000000 --- a/extern/Eigen3/intern/eigenvalues.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * ***** 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/extern/Eigen3/intern/svd.cc b/extern/Eigen3/intern/svd.cc deleted file mode 100644 index e39a8261edb..00000000000 --- a/extern/Eigen3/intern/svd.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* - * ***** 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/extern/Eigen3/intern/svd.h b/extern/Eigen3/intern/svd.h deleted file mode 100644 index 0ac51108977..00000000000 --- a/extern/Eigen3/intern/svd.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * ***** 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__ */ diff --git a/extern/SConscript b/extern/SConscript index 484c0e959c2..46c177c5bcb 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -11,7 +11,6 @@ SConscript(['colamd/SConscript']) SConscript(['rangetree/SConscript']) SConscript(['wcwidth/SConscript']) SConscript(['libmv/SConscript']) -SConscript(['Eigen3/SConscript']) if env['WITH_BF_GAMEENGINE']: SConscript(['recastnavigation/SConscript']) diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 4ee3dff7695..9b0f2de22f2 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -32,6 +32,7 @@ add_subdirectory(opencolorio) add_subdirectory(mikktspace) add_subdirectory(raskter) add_subdirectory(glew-mx) +add_subdirectory(eigen) if(WITH_AUDASPACE) add_subdirectory(audaspace) diff --git a/intern/SConscript b/intern/SConscript index 124afd4bbb9..3b855d60ac8 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -35,6 +35,7 @@ SConscript(['string/SConscript', 'memutil/SConscript/', 'iksolver/SConscript', 'itasc/SConscript', + 'eigen/SConscript', 'opencolorio/SConscript', 'opennl/SConscript', 'mikktspace/SConscript', 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__ */ diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 45b41a4a098..944ba60eb58 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -29,13 +29,13 @@ set(INC ../makesdna ../../../intern/guardedalloc ../../../intern/atomic + ../../../intern/eigen ../../../extern/wcwidth ) set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} - ../../../extern/Eigen3 ) set(SRC diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 0e4b9bf4efd..5f92741fde2 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -34,9 +34,9 @@ cflags='' incs = [ '.', '#/extern/wcwidth', - '#/extern/Eigen3', '#/intern/guardedalloc', '#/intern/atomic', + '#/intern/eigen', '../makesdna', env['BF_FREETYPE_INC'], env['BF_ZLIB_INC'], diff --git a/source/blender/blenlib/intern/math_solvers.c b/source/blender/blenlib/intern/math_solvers.c index d1dad9a6269..c27c6bea160 100644 --- a/source/blender/blenlib/intern/math_solvers.c +++ b/source/blender/blenlib/intern/math_solvers.c @@ -34,7 +34,7 @@ #include "BLI_strict_flags.h" -#include "eigen3_capi.h" +#include "eigen_capi.h" /********************************** Eigen Solvers *********************************/ diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/physics/CMakeLists.txt index 855449ca0f3..0a4ff3fe0f0 100644 --- a/source/blender/physics/CMakeLists.txt +++ b/source/blender/physics/CMakeLists.txt @@ -34,7 +34,7 @@ set(INC ) set(INC_SYS - ../../../extern/Eigen3 + ${EIGEN3_INCLUDE_DIRS} ) set(SRC diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 11055ab77bd..f3a65c4d75e 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -171,12 +171,12 @@ endif() bf_intern_opencolorio bf_intern_opennl bf_intern_glew_mx + bf_intern_eigen extern_rangetree extern_wcwidth extern_libmv extern_glog extern_sdlew - extern_eigen3 ) if(WITH_MOD_CLOTH_ELTOPO) diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt index e10d6b13b59..443d9b0e84b 100644 --- a/tests/gtests/blenlib/CMakeLists.txt +++ b/tests/gtests/blenlib/CMakeLists.txt @@ -37,11 +37,11 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LIN BLENDER_TEST(BLI_stack "bf_blenlib") BLENDER_TEST(BLI_math_color "bf_blenlib") -BLENDER_TEST(BLI_math_geom "bf_blenlib;extern_eigen3") +BLENDER_TEST(BLI_math_geom "bf_blenlib;bf_intern_eigen") BLENDER_TEST(BLI_math_base "bf_blenlib") BLENDER_TEST(BLI_string "bf_blenlib") BLENDER_TEST(BLI_path_util "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}") -BLENDER_TEST(BLI_polyfill2d "bf_blenlib;extern_eigen3") +BLENDER_TEST(BLI_polyfill2d "bf_blenlib;bf_intern_eigen") BLENDER_TEST(BLI_listbase "bf_blenlib") BLENDER_TEST(BLI_hash_mm2a "bf_blenlib") BLENDER_TEST(BLI_ghash "bf_blenlib") -- cgit v1.2.3