Eigen: move C API into intern/eigen.

7 files changed, 0 insertions, 333 deletions

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 <Eigen/Core>
-#include <Eigen/Eigenvalues>
-
-#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<MatrixXf> eigen_solver;
-
-	/* Blender and Eigen matrices are both column-major. */
-	eigen_solver.compute(Map<MatrixXf>((float *)matrix, size, size));
-
-	if (eigen_solver.info() != Success) {
-		return false;
-	}
-
-	if (r_eigen_values) {
-		Map<VectorXf>(r_eigen_values, size) = eigen_solver.eigenvalues().transpose();
-	}
-
-	if (r_eigen_vectors) {
-		Map<MatrixXf>(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 <Eigen/Core>
-#include <Eigen/SVD>
-
-#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<MatrixXf, NoQRPreconditioner> svd(Map<MatrixXf>((float *)matrix, size, size), flags);
-
-	if (r_U) {
-		Map<MatrixXf>(r_U, size, size) = svd.matrixU();
-	}
-
-	if (r_S) {
-		Map<VectorXf>(r_S, size) = svd.singularValues();
-	}
-
-	if (r_V) {
-		Map<MatrixXf>(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__ */