[Bf-blender-cvs] [f9047c3] master: Eigen: fold remaining OpenNL code into intern/eigen.
Brecht Van Lommel
noreply at git.blender.org
Thu Dec 10 02:02:32 CET 2015
Commit: f9047c3f8c72f1a15a4c051b507306d308f44646
Author: Brecht Van Lommel
Date: Tue Nov 24 20:42:10 2015 +0100
Branches: master
https://developer.blender.org/rBf9047c3f8c72f1a15a4c051b507306d308f44646
Eigen: fold remaining OpenNL code into intern/eigen.
Differential Revision: https://developer.blender.org/D1662
===================================================================
M CMakeLists.txt
M SConstruct
M build_files/cmake/cmake_static_check_clang_array.py
M build_files/cmake/cmake_static_check_cppcheck.py
M build_files/cmake/cmake_static_check_smatch.py
M build_files/cmake/cmake_static_check_sparse.py
M build_files/cmake/cmake_static_check_splint.py
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_lite.cmake
M build_files/cmake/macros.cmake
M doc/doxygen/doxygen.intern.h
M extern/CMakeLists.txt
M extern/SConscript
D extern/colamd/CMakeLists.txt
D extern/colamd/Doc/ChangeLog
D extern/colamd/Doc/lesser.txt
D extern/colamd/Include/UFconfig.h
D extern/colamd/Include/colamd.h
D extern/colamd/README.txt
D extern/colamd/SConscript
D extern/colamd/Source/colamd.c
D extern/colamd/Source/colamd_global.c
M intern/CMakeLists.txt
M intern/SConscript
M intern/eigen/CMakeLists.txt
M intern/eigen/eigen_capi.h
M intern/eigen/intern/eigenvalues.cc
M intern/eigen/intern/eigenvalues.h
A intern/eigen/intern/linear_solver.cc
A intern/eigen/intern/linear_solver.h
M intern/eigen/intern/svd.cc
M intern/eigen/intern/svd.h
D intern/opennl/CMakeLists.txt
D intern/opennl/SConscript
D intern/opennl/extern/ONL_opennl.h
D intern/opennl/intern/opennl.cpp
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/math_solvers.c
M source/blender/bmesh/CMakeLists.txt
M source/blender/bmesh/SConscript
M source/blender/bmesh/operators/bmo_smooth_laplacian.c
M source/blender/editors/armature/CMakeLists.txt
M source/blender/editors/armature/SConscript
M source/blender/editors/armature/armature_skinning.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/reeb.c
M source/blender/editors/uvedit/CMakeLists.txt
M source/blender/editors/uvedit/SConscript
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/SConscript
M source/blender/modifiers/intern/MOD_laplaciandeform.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/modifiers/intern/MOD_util.h
M source/blenderplayer/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26e0a3f..1cf5d1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -362,7 +362,6 @@ if(WIN32)
endif()
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ${_init_INPUT_NDOF})
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
-option(WITH_OPENNL "Enable use of Open Numerical Library" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
@@ -2983,9 +2982,6 @@ if(FIRST_RUN)
info_cfg_option(WITH_GL_ANGLE)
endif()
- info_cfg_text("Other:")
- info_cfg_option(WITH_OPENNL)
-
# debug
message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
diff --git a/SConstruct b/SConstruct
index a5efed5..de265df 100644
--- a/SConstruct
+++ b/SConstruct
@@ -555,7 +555,6 @@ else:
# TODO, make optional (as with CMake)
env['CPPFLAGS'].append('-DWITH_AVI')
-env['CPPFLAGS'].append('-DWITH_OPENNL')
if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
env['CPPFLAGS'].append('-DHAVE_STDBOOL_H')
diff --git a/build_files/cmake/cmake_static_check_clang_array.py b/build_files/cmake/cmake_static_check_clang_array.py
index 45b262a..597d1d2 100644
--- a/build_files/cmake/cmake_static_check_clang_array.py
+++ b/build_files/cmake/cmake_static_check_clang_array.py
@@ -32,7 +32,6 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None)
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
- "blender/intern/opennl",
]
CHECKER_BIN = "python2"
diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py
index 9f012cb..3504b00 100644
--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -32,7 +32,6 @@ USE_QUIET = (os.environ.get("QUIET", None) is not None)
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
- "blender/intern/opennl",
]
CHECKER_BIN = "cppcheck"
diff --git a/build_files/cmake/cmake_static_check_smatch.py b/build_files/cmake/cmake_static_check_smatch.py
index de13d14..f525187 100644
--- a/build_files/cmake/cmake_static_check_smatch.py
+++ b/build_files/cmake/cmake_static_check_smatch.py
@@ -25,7 +25,6 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
- "blender/intern/opennl",
]
CHECKER_BIN = "smatch"
diff --git a/build_files/cmake/cmake_static_check_sparse.py b/build_files/cmake/cmake_static_check_sparse.py
index 2ee9992..6d1c4e3 100644
--- a/build_files/cmake/cmake_static_check_sparse.py
+++ b/build_files/cmake/cmake_static_check_sparse.py
@@ -25,7 +25,6 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
- "blender/intern/opennl",
]
CHECKER_BIN = "sparse"
diff --git a/build_files/cmake/cmake_static_check_splint.py b/build_files/cmake/cmake_static_check_splint.py
index 5a967ec..46d8808 100644
--- a/build_files/cmake/cmake_static_check_splint.py
+++ b/build_files/cmake/cmake_static_check_splint.py
@@ -25,7 +25,6 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
- "blender/intern/opennl",
]
CHECKER_BIN = "splint"
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 0ca9800..ad8a681 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -43,7 +43,6 @@ set(WITH_OPENAL ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE)
set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE)
set(WITH_OPENMP ON CACHE BOOL "" FORCE)
-set(WITH_OPENNL ON CACHE BOOL "" FORCE)
set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE)
set(WITH_RAYOPTIMIZATION ON CACHE BOOL "" FORCE)
set(WITH_SDL ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 9e7b4dc..99e90ca 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -47,7 +47,6 @@ set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE)
set(WITH_OPENCOLORIO OFF CACHE BOOL "" FORCE)
set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE)
set(WITH_OPENMP OFF CACHE BOOL "" FORCE)
-set(WITH_OPENNL OFF CACHE BOOL "" FORCE)
set(WITH_RAYOPTIMIZATION OFF CACHE BOOL "" FORCE)
set(WITH_SDL OFF CACHE BOOL "" FORCE)
set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 39c12f2..4ba15c7 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -596,7 +596,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
ge_phys_bullet
bf_intern_smoke
extern_lzma
- extern_colamd
ge_logic_ketsji
extern_recastnavigation
ge_logic
@@ -698,10 +697,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
endif()
- if(WITH_OPENNL)
- list_insert_after(BLENDER_SORTED_LIBS "bf_render" "bf_intern_opennl")
- endif()
-
if(WITH_BULLET)
list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
endif()
diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h
index 2c8ecae..e3cc11b 100644
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -38,7 +38,7 @@
* \ingroup intern
*/
-/** \defgroup opennl opennl
+/** \defgroup eigen eigen
* \ingroup intern
*/
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index d0c587b..640de9d 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -30,10 +30,6 @@ add_subdirectory(rangetree)
add_subdirectory(wcwidth)
add_subdirectory(libmv)
-if(WITH_OPENNL)
- add_subdirectory(colamd)
-endif()
-
if(WITH_BULLET)
if(NOT WITH_SYSTEM_BULLET)
add_subdirectory(bullet2)
diff --git a/extern/SConscript b/extern/SConscript
index 46c177c..a5d8c1f 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -7,7 +7,6 @@ if env['WITH_BF_GLEW_ES']:
else:
SConscript(['glew/SConscript'])
-SConscript(['colamd/SConscript'])
SConscript(['rangetree/SConscript'])
SConscript(['wcwidth/SConscript'])
SConscript(['libmv/SConscript'])
diff --git a/extern/colamd/CMakeLists.txt b/extern/colamd/CMakeLists.txt
deleted file mode 100644
index 3019ee5..0000000
--- a/extern/colamd/CMakeLists.txt
+++ /dev/null
@@ -1,41 +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) 2011, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Blender Foundation,
-# Sergey Sharybin
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
- Include
-)
-
-set(INC_SYS
-
-)
-
-set(SRC
- Source/colamd.c
- Source/colamd_global.c
-
- Include/colamd.h
- Include/UFconfig.h
-)
-
-blender_add_lib(extern_colamd "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/colamd/Doc/ChangeLog b/extern/colamd/Doc/ChangeLog
deleted file mode 100644
index 29308e9..0000000
--- a/extern/colamd/Doc/ChangeLog
+++ /dev/null
@@ -1,129 +0,0 @@
-May 31, 2007: version 2.7.0
-
- * ported to 64-bit MATLAB
-
- * subdirectories added (Source/, Include/, Lib/, Doc/, MATLAB/, Demo/)
-
-Dec 12, 2006, version 2.5.2
-
- * minor MATLAB cleanup. MATLAB functions renamed colamd2 and symamd2,
- so that they do not conflict with the built-in versions. Note that
- the MATLAB built-in functions colamd and symamd are identical to
- the colamd and symamd functions here.
-
-Aug 31, 2006: Version 2.5.1
-
- * minor change to colamd.m and symamd.m, to use etree instead
- of sparsfun.
-
-Apr. 30, 2006: Version 2.5
-
- * colamd_recommended modified, to do more careful integer overflow
- checking. It now returns size_t, not int. colamd_l_recommended
- also returns size_t. A zero is returned if an error occurs. A
- postive return value denotes success. In v2.4 and earlier,
- -1 was returned on error (an int or long).
-
- * long replaced with UF_long integer, which is long except on WIN64.
-
-Nov 15, 2005:
-
- * minor editting of comments; version number (2.4) unchanged.
-
-Changes from Version 2.3 to 2.4 (Aug 30, 2005)
-
- * Makefile now relies on ../UFconfig/UFconfig.mk
-
- * changed the dense row/col detection. The meaning of the knobs
- has thus changed.
-
- * added an option to turn off aggressive absorption. It was
- always on in versions 2.3 and earlier.
-
- * added a #define'd version number
-
- * added a function pointer (colamd_printf) for COLAMD's printing.
-
- * added a -DNPRINT option, to turn off printing at compile-time.
-
- * added a check for integer overflow in colamd_recommended
-
- * minor changes to allow for more simpler 100% test coverage
-
- * bug fix. If symamd v2.3 fails to allocate its copy of the input
- matrix, then it erroneously frees a calloc'd workspace twice.
- This bug has no effect on the MATLAB symamd mexFunction, since
- mxCalloc terminates the mexFunction if it fails to allocate
- memory. Similarly, UMFPACK is not affected because it does not
- use symamd. The bug has no effect on the colamd ordering
- routine in v2.3.
-
-Changes from Version 2.2 to 2.3 (Sept. 8, 2003)
-
- * removed the call to the MATLAB spparms ('spumoni') function.
- This can take a lot of ti
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list