bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Eigen: fold remaining OpenNL code into intern/eigen.

Browse Source 
Differential Revision: https://developer.blender.org/D1662
This commit is contained in:
Brecht Van Lommel 2015-11-24 20:42:10 +01:00
parent 858b680a50
commit f9047c3f8c
56 changed files with 681 additions and 6064 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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}")

1
SConstruct
View File

@ -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')

1
build_files/cmake/cmake_static_check_clang_array.py
View File

@ -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"

1
build_files/cmake/cmake_static_check_cppcheck.py
View File

@ -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"

1
build_files/cmake/cmake_static_check_smatch.py
View File

@ -25,7 +25,6 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
"blender/intern/opennl",
]
CHECKER_BIN = "smatch"

1
build_files/cmake/cmake_static_check_sparse.py
View File

@ -25,7 +25,6 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
"blender/intern/opennl",
]
CHECKER_BIN = "sparse"

1
build_files/cmake/cmake_static_check_splint.py
View File

@ -25,7 +25,6 @@
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
"blender/intern/opennl",
]
CHECKER_BIN = "splint"

1
build_files/cmake/config/blender_full.cmake
View File

@ -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)

1
build_files/cmake/config/blender_lite.cmake
View File

@ -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)

5
build_files/cmake/macros.cmake
View File

@ -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()

2
doc/doxygen/doxygen.intern.h
View File

@ -38,7 +38,7 @@
* \ingroup intern
*/
/** \defgroup opennl opennl
/** \defgroup eigen eigen
* \ingroup intern
*/

4
extern/CMakeLists.txt vendored
View File

@ -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)

1
extern/SConscript vendored
View File

@ -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'])

41
extern/colamd/CMakeLists.txt vendored
View File

@ -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}")

129
extern/colamd/Doc/ChangeLog vendored
View File

@ -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 time if you are ordering many small
matrices. Only affects the MATLAB interface (colamdmex.c,
symamdmex.c, colamdtestmex.c, and symamdtestmex.c). The
usage of the optional 2nd argument to the colamd and symamd
mexFunctions was changed accordingly.
Changes from Version 2.1 to 2.2 (Sept. 23, 2002)
* extensive testing routines added (colamd_test.m, colamdtestmex.c,
and symamdtestmex.c), and the Makefile modified accordingly.
* a few typos in the comments corrected
* use of the MATLAB "flops" command removed from colamd_demo, and an
m-file routine luflops.m added.
* an explicit typecast from unsigned to int added, for COLAMD_C and
COLAMD_R in colamd.h.
* #include <stdio.h> added to colamd_example.c
Changes from Version 2.0 to 2.1 (May 4, 2001)
* TRUE and FALSE are predefined on some systems, so they are defined
here only if not already defined.
* web site changed
* UNIX Makefile modified, to handle the case if "." is not in your path.
Changes from Version 1.0 to 2.0 (January 31, 2000)
No bugs were found in version 1.1. These changes merely add new
functionality.
* added the COLAMD_RECOMMENDED (nnz, n_row, n_col) macro.
* moved the output statistics, from A, to a separate output argument.
The arguments changed for the C-callable routines.
* added colamd_report and symamd_report.
* added a C-callable symamd routine. Formerly, symamd was only
available as a mexFunction from MATLAB.
* added error-checking to symamd. Formerly, it assumed its input
was error-free.
* added the optional stats and knobs arguments to the symamd mexFunction
* deleted colamd_help. A help message is still available from
"help colamd" and "help symamd" in MATLAB.
* deleted colamdtree.m and symamdtree.m. Now, colamd.m and symamd.m
also do the elimination tree post-ordering. The Version 1.1
colamd and symamd mexFunctions, which do not do the post-
ordering, are now visible as colamdmex and symamdmex from
MATLAB. Essentialy, the post-ordering is now the default
behavior of colamd.m and symamd.m, to match the behavior of
colmmd and symmmd. The post-ordering is only available in the
MATLAB interface, not the C-callable interface.
* made a slight change to the dense row/column detection in symamd,
to match the stated specifications.

504
extern/colamd/Doc/lesser.txt vendored
View File

@ -1,504 +0,0 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

118
extern/colamd/Include/UFconfig.h vendored
View File

@ -1,118 +0,0 @@
/* ========================================================================== */
/* === UFconfig.h =========================================================== */
/* ========================================================================== */
/* Configuration file for SuiteSparse: a Suite of Sparse matrix packages
* (AMD, COLAMD, CCOLAMD, CAMD, CHOLMOD, UMFPACK, CXSparse, and others).
*
* UFconfig.h provides the definition of the long integer. On most systems,
* a C program can be compiled in LP64 mode, in which long's and pointers are
* both 64-bits, and int's are 32-bits. Windows 64, however, uses the LLP64
* model, in which int's and long's are 32-bits, and long long's and pointers
* are 64-bits.
*
* SuiteSparse packages that include long integer versions are
* intended for the LP64 mode. However, as a workaround for Windows 64
* (and perhaps other systems), the long integer can be redefined.
*
* If _WIN64 is defined, then the __int64 type is used instead of long.
*
* The long integer can also be defined at compile time. For example, this
* could be added to UFconfig.mk:
*
* CFLAGS = -O -D'UF_long=long long' -D'UF_long_max=9223372036854775801' \
* -D'UF_long_id="%lld"'
*
* This file defines UF_long as either long (on all but _WIN64) or
* __int64 on Windows 64. The intent is that a UF_long is always a 64-bit
* integer in a 64-bit code. ptrdiff_t might be a better choice than long;
* it is always the same size as a pointer.
*
* This file also defines the SUITESPARSE_VERSION and related definitions.
*
* Copyright (c) 2007, University of Florida. No licensing restrictions
* apply to this file or to the UFconfig directory. Author: Timothy A. Davis.
*/
#ifndef _UFCONFIG_H
#define _UFCONFIG_H
#ifdef __cplusplus
extern "C" {
#endif
#include <limits.h>
/* ========================================================================== */
/* === UF_long ============================================================== */
/* ========================================================================== */
#ifndef UF_long
#ifdef _WIN64
#define UF_long __int64
#define UF_long_max _I64_MAX
#define UF_long_id "%I64d"
#else
#define UF_long long
#define UF_long_max LONG_MAX
#define UF_long_id "%ld"
#endif
#endif
/* ========================================================================== */
/* === SuiteSparse version ================================================== */
/* ========================================================================== */
/* SuiteSparse is not a package itself, but a collection of packages, some of
* which must be used together (UMFPACK requires AMD, CHOLMOD requires AMD,
* COLAMD, CAMD, and CCOLAMD, etc). A version number is provided here for the
* collection itself. The versions of packages within each version of
* SuiteSparse are meant to work together. Combining one packge from one
* version of SuiteSparse, with another package from another version of
* SuiteSparse, may or may not work.
*
* SuiteSparse Version 3.4.0 contains the following packages:
*
* AMD version 2.2.0
* CAMD version 2.2.0
* COLAMD version 2.7.1
* CCOLAMD version 2.7.1
* CHOLMOD version 1.7.1
* CSparse version 2.2.3
* CXSparse version 2.2.3
* KLU version 1.1.0
* BTF version 1.1.0
* LDL version 2.0.1
* UFconfig version number is the same as SuiteSparse
* UMFPACK version 5.4.0
* RBio version 1.1.2
* UFcollection version 1.2.0
* LINFACTOR version 1.1.0
* MESHND version 1.1.1
* SSMULT version 2.0.0
* MATLAB_Tools no specific version number
* SuiteSparseQR version 1.1.2
*
* Other package dependencies:
* BLAS required by CHOLMOD and UMFPACK
* LAPACK required by CHOLMOD
* METIS 4.0.1 required by CHOLMOD (optional) and KLU (optional)
*/
#define SUITESPARSE_DATE "May 20, 2009"
#define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
#define SUITESPARSE_MAIN_VERSION 3
#define SUITESPARSE_SUB_VERSION 4
#define SUITESPARSE_SUBSUB_VERSION 0
#define SUITESPARSE_VERSION \
SUITESPARSE_VER_CODE(SUITESPARSE_MAIN_VERSION,SUITESPARSE_SUB_VERSION)
#ifdef __cplusplus
}
#endif
#endif

255
extern/colamd/Include/colamd.h vendored
View File

@ -1,255 +0,0 @@
/* ========================================================================== */
/* === colamd/symamd prototypes and definitions ============================= */
/* ========================================================================== */
/* COLAMD / SYMAMD include file
You must include this file (colamd.h) in any routine that uses colamd,
symamd, or the related macros and definitions.
Authors:
The authors of the code itself are Stefan I. Larimore and Timothy A.
Davis (davis at cise.ufl.edu), University of Florida. The algorithm was
developed in collaboration with John Gilbert, Xerox PARC, and Esmond
Ng, Oak Ridge National Laboratory.
Acknowledgements:
This work was supported by the National Science Foundation, under
grants DMS-9504974 and DMS-9803599.
Notice:
Copyright (c) 1998-2007, Timothy A. Davis, All Rights Reserved.
THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
Permission is hereby granted to use, copy, modify, and/or distribute
this program, provided that the Copyright, this License, and the
Availability of the original version is retained on all copies and made
accessible to the end-user of any code or package that includes COLAMD
or any modified version of COLAMD.
Availability:
The colamd/symamd library is available at
http://www.cise.ufl.edu/research/sparse/colamd/
This is the http://www.cise.ufl.edu/research/sparse/colamd/colamd.h
file. It is required by the colamd.c, colamdmex.c, and symamdmex.c
files, and by any C code that calls the routines whose prototypes are
listed below, or that uses the colamd/symamd definitions listed below.
*/
#ifndef COLAMD_H
#define COLAMD_H
/* make it easy for C++ programs to include COLAMD */
#ifdef __cplusplus
extern "C" {
#endif
/* ========================================================================== */
/* === Include files ======================================================== */
/* ========================================================================== */
#include <stdlib.h>
/* ========================================================================== */
/* === COLAMD version ======================================================= */
/* ========================================================================== */
/* COLAMD Version 2.4 and later will include the following definitions.
* As an example, to test if the version you are using is 2.4 or later:
*
* #ifdef COLAMD_VERSION
* if (COLAMD_VERSION >= COLAMD_VERSION_CODE (2,4)) ...
* #endif
*
* This also works during compile-time:
*
* #if defined(COLAMD_VERSION) && (COLAMD_VERSION >= COLAMD_VERSION_CODE (2,4))
* printf ("This is version 2.4 or later\n") ;
* #else
* printf ("This is an early version\n") ;
* #endif
*
* Versions 2.3 and earlier of COLAMD do not include a #define'd version number.
*/
#define COLAMD_DATE "Nov 1, 2007"
#define COLAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
#define COLAMD_MAIN_VERSION 2
#define COLAMD_SUB_VERSION 7
#define COLAMD_SUBSUB_VERSION 1
#define COLAMD_VERSION \
COLAMD_VERSION_CODE(COLAMD_MAIN_VERSION,COLAMD_SUB_VERSION)
/* ========================================================================== */
/* === Knob and statistics definitions ====================================== */
/* ========================================================================== */
/* size of the knobs [ ] array. Only knobs [0..1] are currently used. */
#define COLAMD_KNOBS 20
/* number of output statistics. Only stats [0..6] are currently used. */
#define COLAMD_STATS 20
/* knobs [0] and stats [0]: dense row knob and output statistic. */
#define COLAMD_DENSE_ROW 0
/* knobs [1] and stats [1]: dense column knob and output statistic. */
#define COLAMD_DENSE_COL 1
/* knobs [2]: aggressive absorption */
#define COLAMD_AGGRESSIVE 2
/* stats [2]: memory defragmentation count output statistic */
#define COLAMD_DEFRAG_COUNT 2
/* stats [3]: colamd status: zero OK, > 0 warning or notice, < 0 error */
#define COLAMD_STATUS 3
/* stats [4..6]: error info, or info on jumbled columns */
#define COLAMD_INFO1 4
#define COLAMD_INFO2 5
#define COLAMD_INFO3 6
/* error codes returned in stats [3]: */
#define COLAMD_OK (0)
#define COLAMD_OK_BUT_JUMBLED (1)
#define COLAMD_ERROR_A_not_present (-1)
#define COLAMD_ERROR_p_not_present (-2)
#define COLAMD_ERROR_nrow_negative (-3)
#define COLAMD_ERROR_ncol_negative (-4)
#define COLAMD_ERROR_nnz_negative (-5)
#define COLAMD_ERROR_p0_nonzero (-6)
#define COLAMD_ERROR_A_too_small (-7)
#define COLAMD_ERROR_col_length_negative (-8)
#define COLAMD_ERROR_row_index_out_of_bounds (-9)
#define COLAMD_ERROR_out_of_memory (-10)
#define COLAMD_ERROR_internal_error (-999)
/* ========================================================================== */
/* === Prototypes of user-callable routines ================================= */
/* ========================================================================== */
/* define UF_long */
#include "UFconfig.h"
size_t colamd_recommended /* returns recommended value of Alen, */
/* or 0 if input arguments are erroneous */
(
int nnz, /* nonzeros in A */
int n_row, /* number of rows in A */
int n_col /* number of columns in A */
) ;
size_t colamd_l_recommended /* returns recommended value of Alen, */
/* or 0 if input arguments are erroneous */
(
UF_long nnz, /* nonzeros in A */
UF_long n_row, /* number of rows in A */
UF_long n_col /* number of columns in A */
) ;
void colamd_set_defaults /* sets default parameters */
( /* knobs argument is modified on output */
double knobs [COLAMD_KNOBS] /* parameter settings for colamd */
) ;
void colamd_l_set_defaults /* sets default parameters */
( /* knobs argument is modified on output */
double knobs [COLAMD_KNOBS] /* parameter settings for colamd */
) ;
int colamd /* returns (1) if successful, (0) otherwise*/
( /* A and p arguments are modified on output */
int n_row, /* number of rows in A */
int n_col, /* number of columns in A */
int Alen, /* size of the array A */
int A [], /* row indices of A, of size Alen */
int p [], /* column pointers of A, of size n_col+1 */
double knobs [COLAMD_KNOBS],/* parameter settings for colamd */
int stats [COLAMD_STATS] /* colamd output statistics and error codes */
) ;
UF_long colamd_l /* returns (1) if successful, (0) otherwise*/
( /* A and p arguments are modified on output */
UF_long n_row, /* number of rows in A */
UF_long n_col, /* number of columns in A */
UF_long Alen, /* size of the array A */
UF_long A [], /* row indices of A, of size Alen */
UF_long p [], /* column pointers of A, of size n_col+1 */
double knobs [COLAMD_KNOBS],/* parameter settings for colamd */
UF_long stats [COLAMD_STATS]/* colamd output statistics and error codes */
) ;
int symamd /* return (1) if OK, (0) otherwise */
(
int n, /* number of rows and columns of A */
int A [], /* row indices of A */
int p [], /* column pointers of A */
int perm [], /* output permutation, size n_col+1 */
double knobs [COLAMD_KNOBS], /* parameters (uses defaults if NULL) */
int stats [COLAMD_STATS], /* output statistics and error codes */
void * (*allocate) (size_t, size_t),
/* pointer to calloc (ANSI C) or */
/* mxCalloc (for MATLAB mexFunction) */
void (*release) (void *)
/* pointer to free (ANSI C) or */
/* mxFree (for MATLAB mexFunction) */
) ;
UF_long symamd_l /* return (1) if OK, (0) otherwise */
(
UF_long n, /* number of rows and columns of A */
UF_long A [], /* row indices of A */
UF_long p [], /* column pointers of A */
UF_long perm [], /* output permutation, size n_col+1 */
double knobs [COLAMD_KNOBS], /* parameters (uses defaults if NULL) */
UF_long stats [COLAMD_STATS], /* output statistics and error codes */
void * (*allocate) (size_t, size_t),
/* pointer to calloc (ANSI C) or */
/* mxCalloc (for MATLAB mexFunction) */
void (*release) (void *)
/* pointer to free (ANSI C) or */
/* mxFree (for MATLAB mexFunction) */
) ;
void colamd_report
(
int stats [COLAMD_STATS]
) ;
void colamd_l_report
(
UF_long stats [COLAMD_STATS]
) ;
void symamd_report
(
int stats [COLAMD_STATS]
) ;
void symamd_l_report
(
UF_long stats [COLAMD_STATS]
) ;
#ifndef EXTERN
#define EXTERN extern
#endif
EXTERN int (*colamd_printf) (const char *, ...) ;
#ifdef __cplusplus
}
#endif
#endif /* COLAMD_H */

127
extern/colamd/README.txt vendored
View File

@ -1,127 +0,0 @@
The COLAMD ordering method - Version 2.7
-------------------------------------------------------------------------------
The COLAMD column approximate minimum degree ordering algorithm computes
a permutation vector P such that the LU factorization of A (:,P)
tends to be sparser than that of A. The Cholesky factorization of
(A (:,P))'*(A (:,P)) will also tend to be sparser than that of A'*A.
SYMAMD is a symmetric minimum degree ordering method based on COLAMD,
available as a MATLAB-callable function. It constructs a matrix M such
that M'*M has the same pattern as A, and then uses COLAMD to compute a column
ordering of M. Colamd and symamd tend to be faster and generate better
orderings than their MATLAB counterparts, colmmd and symmmd.
To compile and test the colamd m-files and mexFunctions, just unpack the
COLAMD/ directory from the COLAMD.tar.gz file, and run MATLAB from
within that directory. Next, type colamd_test to compile and test colamd
and symamd. This will work on any computer with MATLAB (Unix, PC, or Mac).
Alternatively, type "make" (in Unix) to compile and run a simple example C
code, without using MATLAB.
To compile and install the colamd m-files and mexFunctions, just cd to
COLAMD/MATLAB and type colamd_install in the MATLAB command window.
A short demo will run. Optionally, type colamd_test to run an extensive tests.
Type "make" in Unix in the COLAMD directory to compile the C-callable
library and to run a short demo.
If you have MATLAB 7.2 or earlier, you must first edit UFconfig/UFconfig.h to
remove the "-largeArrayDims" option from the MEX command (or just use
colamd_make.m inside MATLAB).
Colamd is a built-in routine in MATLAB, available from The
Mathworks, Inc. Under most cases, the compiled COLAMD from Versions 2.0 to the
current version do not differ. Colamd Versions 2.2 and 2.3 differ only in their
mexFunction interaces to MATLAB. v2.4 fixes a bug in the symamd routine in
v2.3. The bug (in v2.3 and earlier) has no effect on the MATLAB symamd
mexFunction. v2.5 adds additional checks for integer overflow, so that
the "int" version can be safely used with 64-bit pointers. Refer to the
ChangeLog for more details.
To use colamd and symamd within an application written in C, all you need are
colamd.c, colamd_global.c, and colamd.h, which are the C-callable
colamd/symamd codes. See colamd.c for more information on how to call
colamd from a C program.
Requires UFconfig, in the ../UFconfig directory relative to this directory.
Copyright (c) 1998-2007, Timothy A. Davis, All Rights Reserved.
See http://www.cise.ufl.edu/research/sparse/colamd (the colamd.c
file) for the License.
Related papers:
T. A. Davis, J. R. Gilbert, S. Larimore, E. Ng, An approximate column
minimum degree ordering algorithm, ACM Transactions on Mathematical
Software, vol. 30, no. 3., pp. 353-376, 2004.
T. A. Davis, J. R. Gilbert, S. Larimore, E. Ng, Algorithm 836: COLAMD,
an approximate column minimum degree ordering algorithm, ACM
Transactions on Mathematical Software, vol. 30, no. 3., pp. 377-380,
2004.
"An approximate minimum degree column ordering algorithm",
S. I. Larimore, MS Thesis, Dept. of Computer and Information
Science and Engineering, University of Florida, Gainesville, FL,
1998. CISE Tech Report TR-98-016. Available at
ftp://ftp.cise.ufl.edu/cis/tech-reports/tr98/tr98-016.ps
via anonymous ftp.
Approximate Deficiency for Ordering the Columns of a Matrix,
J. L. Kern, Senior Thesis, Dept. of Computer and Information
Science and Engineering, University of Florida, Gainesville, FL,
1999. Available at http://www.cise.ufl.edu/~davis/Kern/kern.ps
Authors: Stefan I. Larimore and Timothy A. Davis, University of Florida,
in collaboration with John Gilbert, Xerox PARC (now at UC Santa Barbara),
and Esmong Ng, Lawrence Berkeley National Laboratory (much of this work
he did while at Oak Ridge National Laboratory).
COLAMD files:
Demo simple demo
Doc additional documentation (see colamd.c for more)
Include include file
Lib compiled C-callable library
Makefile primary Unix Makefile
MATLAB MATLAB functions
README.txt this file
Source C source code
./Demo:
colamd_example.c simple example
colamd_example.out output of colamd_example.c
colamd_l_example.c simple example, long integers
colamd_l_example.out output of colamd_l_example.c
Makefile Makefile for C demos
./Doc:
ChangeLog change log
lesser.txt license
./Include:
colamd.h include file
./Lib:
Makefile Makefile for C-callable library
./MATLAB:
colamd2.m MATLAB interface for colamd2
colamd_demo.m simple demo
colamd_install.m compile and install colamd2 and symamd2
colamd_make.m compile colamd2 and symamd2
colamdmex.ca MATLAB mexFunction for colamd2
colamd_test.m extensive test
colamdtestmex.c test function for colamd
Contents.m contents of the MATLAB directory
luflops.m test code
Makefile Makefile for MATLAB functions
symamd2.m MATLAB interface for symamd2
symamdmex.c MATLAB mexFunction for symamd2
symamdtestmex.c test function for symamd
./Source:
colamd.c primary source code
colamd_global.c globally defined function pointers (malloc, free, ...)

14
extern/colamd/SConscript vendored
View File

@ -1,14 +0,0 @@
#!/usr/bin/python
import sys
import os
Import('env')
defs = ''
cflags = []
src = env.Glob('Source/*.c')
incs = './Include'
env.BlenderLib ( libname = 'extern_colamd', sources=src, includes=Split(incs), defines=Split(defs), libtype=['extern', 'player'], priority=[20,137], compileflags=cflags )

3611
extern/colamd/Source/colamd.c vendored
View File

File diff suppressed because it is too large Load Diff

24
extern/colamd/Source/colamd_global.c vendored
View File

@ -1,24 +0,0 @@
/* ========================================================================== */
/* === colamd_global.c ====================================================== */
/* ========================================================================== */
/* ----------------------------------------------------------------------------
* COLAMD, Copyright (C) 2007, Timothy A. Davis.
* See License.txt for the Version 2.1 of the GNU Lesser General Public License
* http://www.cise.ufl.edu/research/sparse
* -------------------------------------------------------------------------- */
/* Global variables for COLAMD */
#ifndef NPRINT
#ifdef MATLAB_MEX_FILE
#include "mex.h"
int (*colamd_printf) (const char *, ...) = mexPrintf ;
#else
#include <stdio.h>
int (*colamd_printf) (const char *, ...) = printf ;
#endif
#else
int (*colamd_printf) (const char *, ...) = ((void *) 0) ;
#endif

4
intern/CMakeLists.txt
View File

@ -74,10 +74,6 @@ if(WITH_BULLET)
add_subdirectory(rigidbody)
endif()
if(WITH_OPENNL)
add_subdirectory(opennl)
endif()
if(WITH_OPENSUBDIV)
add_subdirectory(opensubdiv)
endif()

1
intern/SConscript
View File

@ -37,7 +37,6 @@ SConscript(['string/SConscript',
'itasc/SConscript',
'eigen/SConscript',
'opencolorio/SConscript',
'opennl/SConscript',
'mikktspace/SConscript',
'smoke/SConscript',
'raskter/SConscript'])

2
intern/eigen/CMakeLists.txt
View File

@ -35,9 +35,11 @@ set(SRC
eigen_capi.h
intern/eigenvalues.cc
intern/linear_solver.cc
intern/svd.cc
intern/eigenvalues.h
intern/linear_solver.h
intern/svd.h
)

1
intern/eigen/eigen_capi.h
View File

@ -28,6 +28,7 @@
#define __EIGEN_C_API_H__
#include "intern/eigenvalues.h"
#include "intern/linear_solver.h"
#include "intern/svd.h"
#endif /* __EIGEN_C_API_H__ */

2
intern/eigen/intern/eigenvalues.cc
View File

@ -45,7 +45,7 @@ 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)
bool EIG_self_adjoint_eigen_solve(const int size, const float *matrix, float *r_eigen_values, float *r_eigen_vectors)
{
SelfAdjointEigenSolver<MatrixXf> eigen_solver;

2
intern/eigen/intern/eigenvalues.h
View File

@ -31,7 +31,7 @@
extern "C" {
#endif
bool EG3_self_adjoint_eigen_solve(const int size, const float *matrix, float *r_eigen_values, float *r_eigen_vectors);
bool EIG_self_adjoint_eigen_solve(const int size, const float *matrix, float *r_eigen_values, float *r_eigen_vectors);
#ifdef __cplusplus
}

354
intern/eigen/intern/linear_solver.cc Normal file
View File

@ -0,0 +1,354 @@
/*
* Sparse linear solver.
* Copyright (C) 2004 Bruno Levy
* Copyright (C) 2005-2015 Blender Foundation
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
* and the reason for such modification.
*/
#include "linear_solver.h"
#include <Eigen/Sparse>
#include <algorithm>
#include <cassert>
#include <cstdlib>
#include <iostream>
#include <vector>
/* Eigen data structures */
typedef Eigen::SparseMatrix<double, Eigen::ColMajor> EigenSparseMatrix;
typedef Eigen::SparseLU<EigenSparseMatrix> EigenSparseLU;
typedef Eigen::VectorXd EigenVectorX;
typedef Eigen::Triplet<double> EigenTriplet;
/* Linear Solver data structure */
struct LinearSolver
{
struct Coeff
{
Coeff()
{
index = 0;
value = 0.0;
}
int index;
double value;
};
struct Variable
{
Variable()
{
memset(value, 0, sizeof(value));
locked = false;
index = 0;
}
double value[4];
bool locked;
int index;
std::vector<Coeff> a;
};
enum State
{
STATE_VARIABLES_CONSTRUCT,
STATE_MATRIX_CONSTRUCT,
STATE_MATRIX_SOLVED
};
LinearSolver(int num_rows_, int num_variables_, int num_rhs_, bool lsq_)
{
assert(num_variables_ > 0);
assert(num_rhs_ <= 4);
state = STATE_VARIABLES_CONSTRUCT;
m = 0;
n = 0;
sparseLU = NULL;
num_variables = num_variables_;
num_rhs = num_rhs_;
num_rows = num_rows_;
least_squares = lsq_;
variable.resize(num_variables);
}
~LinearSolver()
{
delete sparseLU;
}
State state;
int n;
int m;
std::vector<EigenTriplet> Mtriplets;
EigenSparseMatrix M;
EigenSparseMatrix MtM;
std::vector<EigenVectorX> b;
std::vector<EigenVectorX> x;
EigenSparseLU *sparseLU;
int num_variables;
std::vector<Variable> variable;
int num_rows;
int num_rhs;
bool least_squares;
};
LinearSolver *EIG_linear_solver_new(int num_rows, int num_columns, int num_rhs)
{
return new LinearSolver(num_rows, num_columns, num_rhs, false);
}
LinearSolver *EIG_linear_least_squares_solver_new(int num_rows, int num_columns, int num_rhs)
{
return new LinearSolver(num_rows, num_columns, num_rhs, true);
}
void EIG_linear_solver_delete(LinearSolver *solver)
{
delete solver;
}
/* Variables */
void EIG_linear_solver_variable_set(LinearSolver *solver, int rhs, int index, double value)
{
solver->variable[index].value[rhs] = value;
}
double EIG_linear_solver_variable_get(LinearSolver *solver, int rhs, int index)
{
return solver->variable[index].value[rhs];
}
void EIG_linear_solver_variable_lock(LinearSolver *solver, int index)
{
if (!solver->variable[index].locked) {
assert(solver->state == LinearSolver::STATE_VARIABLES_CONSTRUCT);
solver->variable[index].locked = true;
}
}
static void linear_solver_variables_to_vector(LinearSolver *solver)
{
int num_rhs = solver->num_rhs;
for (int i = 0; i < solver->num_variables; i++) {
LinearSolver::Variable* v = &solver->variable[i];
if (!v->locked) {
for (int j = 0; j < num_rhs; j++)
solver->x[j][v->index] = v->value[j];
}
}
}
static void linear_solver_vector_to_variables(LinearSolver *solver)
{
int num_rhs = solver->num_rhs;
for (int i = 0; i < solver->num_variables; i++) {
LinearSolver::Variable* v = &solver->variable[i];
if (!v->locked) {
for (int j = 0; j < num_rhs; j++)
v->value[j] = solver->x[j][v->index];
}
}
}
/* Matrix */
static void linear_solver_ensure_matrix_construct(LinearSolver *solver)
{
/* transition to matrix construction if necessary */
if (solver->state == LinearSolver::STATE_VARIABLES_CONSTRUCT) {
int n = 0;
for (int i = 0; i < solver->num_variables; i++) {
if (solver->variable[i].locked)
solver->variable[i].index = ~0;
else
solver->variable[i].index = n++;
}
int m = (solver->num_rows == 0)? n: solver->num_rows;
solver->m = m;
solver->n = n;
assert(solver->least_squares || m == n);
/* reserve reasonable estimate */
solver->Mtriplets.clear();
solver->Mtriplets.reserve(std::max(m, n)*3);
solver->b.resize(solver->num_rhs);
solver->x.resize(solver->num_rhs);
for (int i = 0; i < solver->num_rhs; i++) {
solver->b[i].setZero(m);
solver->x[i].setZero(n);
}
linear_solver_variables_to_vector(solver);
solver->state = LinearSolver::STATE_MATRIX_CONSTRUCT;
}
}
void EIG_linear_solver_matrix_add(LinearSolver *solver, int row, int col, double value)
{
if (solver->state == LinearSolver::STATE_MATRIX_SOLVED)
return;
linear_solver_ensure_matrix_construct(solver);
if (!solver->least_squares && solver->variable[row].locked);
else if (solver->variable[col].locked) {
if (!solver->least_squares)
row = solver->variable[row].index;
LinearSolver::Coeff coeff;
coeff.index = row;
coeff.value = value;
solver->variable[col].a.push_back(coeff);
}
else {
if (!solver->least_squares)
row = solver->variable[row].index;
col = solver->variable[col].index;
/* direct insert into matrix is too slow, so use triplets */
EigenTriplet triplet(row, col, value);
solver->Mtriplets.push_back(triplet);
}
}
/* Right hand side */
void EIG_linear_solver_right_hand_side_add(LinearSolver *solver, int rhs, int index, double value)
{
linear_solver_ensure_matrix_construct(solver);
if (solver->least_squares) {
solver->b[rhs][index] += value;
}
else if (!solver->variable[index].locked) {
index = solver->variable[index].index;
solver->b[rhs][index] += value;
}
}
/* Solve */
bool EIG_linear_solver_solve(LinearSolver *solver)
{
bool result = true;
assert(solver->state != LinearSolver::STATE_VARIABLES_CONSTRUCT);
if (solver->state == LinearSolver::STATE_MATRIX_CONSTRUCT) {
/* create matrix from triplets */
solver->M.resize(solver->m, solver->n);
solver->M.setFromTriplets(solver->Mtriplets.begin(), solver->Mtriplets.end());
solver->Mtriplets.clear();
/* create least squares matrix */
if (solver->least_squares)
solver->MtM = solver->M.transpose() * solver->M;
/* convert M to compressed column format */
EigenSparseMatrix& M = (solver->least_squares)? solver->MtM: solver->M;
M.makeCompressed();
/* perform sparse LU factorization */
EigenSparseLU *sparseLU = new EigenSparseLU();
solver->sparseLU = sparseLU;
sparseLU->compute(M);
result = (sparseLU->info() == Eigen::Success);
solver->state = LinearSolver::STATE_MATRIX_SOLVED;
}
if (result) {
/* solve for each right hand side */
for (int rhs = 0; rhs < solver->num_rhs; rhs++) {
/* modify for locked variables */
EigenVectorX& b = solver->b[rhs];
for (int i = 0; i < solver->num_variables; i++) {
LinearSolver::Variable *variable = &solver->variable[i];
if (variable->locked) {
std::vector<LinearSolver::Coeff>& a = variable->a;
for (int j = 0; j < a.size(); j++)
b[a[j].index] -= a[j].value*variable->value[rhs];
}
}
/* solve */
if (solver->least_squares) {
EigenVectorX Mtb = solver->M.transpose() * b;
solver->x[rhs] = solver->sparseLU->solve(Mtb);
}
else {
EigenVectorX& b = solver->b[rhs];
solver->x[rhs] = solver->sparseLU->solve(b);
}
if (solver->sparseLU->info() != Eigen::Success)
result = false;
}
if (result)
linear_solver_vector_to_variables(solver);
}
/* clear for next solve */
for (int rhs = 0; rhs < solver->num_rhs; rhs++)
solver->b[rhs].setZero(solver->m);
return result;
}
/* Debugging */
void EIG_linear_solver_print_matrix(LinearSolver *solver)
{
std::cout << "A:" << solver->M << std::endl;
for (int rhs = 0; rhs < solver->num_rhs; rhs++)
std::cout << "b " << rhs << ":" << solver->b[rhs] << std::endl;
if (solver->MtM.rows() && solver->MtM.cols())
std::cout << "AtA:" << solver->MtM << std::endl;
}

71
intern/eigen/intern/linear_solver.h Normal file
View File

@ -0,0 +1,71 @@
/*
* Sparse linear solver.
* Copyright (C) 2004 Bruno Levy
* Copyright (C) 2005-2015 Blender Foundation
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
* and the reason for such modification.
*/
#pragma once
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
/* Solvers for Ax = b and AtAx = Atb */
typedef struct LinearSolver LinearSolver;
LinearSolver *EIG_linear_solver_new(
int num_rows,
int num_columns,
int num_right_hand_sides);
LinearSolver *EIG_linear_least_squares_solver_new(
int num_rows,
int num_columns,
int num_right_hand_sides);
void EIG_linear_solver_delete(LinearSolver *solver);
/* Variables (x). Any locking must be done before matrix construction. */
void EIG_linear_solver_variable_set(LinearSolver *solver, int rhs, int index, double value);
double EIG_linear_solver_variable_get(LinearSolver *solver, int rhs, int index);
void EIG_linear_solver_variable_lock(LinearSolver *solver, int index);
/* Matrix (A) and right hand side (b) */
void EIG_linear_solver_matrix_add(LinearSolver *solver, int row, int col, double value);
void EIG_linear_solver_right_hand_side_add(LinearSolver *solver, int rhs, int index, double value);
/* Solve. Repeated solves are supported, by changing b between solves. */
bool EIG_linear_solver_solve(LinearSolver *solver);
/* Debugging */
void EIG_linear_solver_print_matrix(LinearSolver *solver);
#ifdef __cplusplus
}
#endif

2
intern/eigen/intern/svd.cc
View File

@ -48,7 +48,7 @@ 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)
void EIG_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);

2
intern/eigen/intern/svd.h
View File

@ -31,7 +31,7 @@
extern "C" {
#endif
void EG3_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V);
void EIG_svd_square_matrix(const int size, const float *matrix, float *r_U, float *r_S, float *r_V);
#ifdef __cplusplus
}

58
intern/opennl/CMakeLists.txt
View File

@ -1,58 +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) 2006, Blender Foundation
# All rights reserved.
#
# The Original Code is: all of this file.
#
# Contributor(s): Jacques Beaurain.
#
# ***** END GPL LICENSE BLOCK *****
# External project, better not fix warnings.
remove_strict_flags()
# remove debug flag here since this is not a blender maintained library
# and debug gives a lot of prints on UV unwrapping. developers can enable if they need to.
if(MSVC)
remove_definitions(-DDEBUG)
else()
add_definitions(-UDEBUG)
endif()
# quiet compiler warnings about undefined defines
add_definitions(
-DDEBUGlevel=0
-DPRNTlevel=0
)
set(INC
extern
)
set(INC_SYS
../../extern/colamd/Include
../../extern/Eigen3
)
set(SRC
intern/opennl.cpp
extern/ONL_opennl.h
)
blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}")

35
intern/opennl/SConscript
View File

@ -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) 2006, Blender Foundation
# All rights reserved.
#
# The Original Code is: all of this file.
#
# Contributor(s): Nathan Letwory.
#
# ***** END GPL LICENSE BLOCK *****
Import ('env')
sources = env.Glob('intern/*.cpp')
incs = 'extern ../../extern/colamd/Include ../../extern/Eigen3'
env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )

113
intern/opennl/extern/ONL_opennl.h vendored
View File

@ -1,113 +0,0 @@
/** \file opennl/extern/ONL_opennl.h
* \ingroup opennlextern
*/
/*
* OpenNL: Numerical Library
* Copyright (C) 2004 Bruno Levy
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
* and the reason for such modification.
*
* Contact: Bruno Levy
*
* levy@loria.fr
*
* ISA Project
* LORIA, INRIA Lorraine,
* Campus Scientifique, BP 239
* 54506 VANDOEUVRE LES NANCY CEDEX
* FRANCE
*
* Note that the GNU General Public License does not permit incorporating
* the Software into proprietary programs.
*/
#ifndef nlOPENNL_H
#define nlOPENNL_H
#ifdef __cplusplus
extern "C" {
#endif
/* Datatypes */
typedef unsigned int NLenum;
typedef unsigned char NLboolean;
typedef int NLint; /* 4-byte signed */
typedef unsigned int NLuint; /* 4-byte unsigned */
typedef double NLdouble; /* double precision float */
typedef struct NLContext NLContext;
/* Constants */
#define NL_FALSE 0x0
#define NL_TRUE 0x1
/* Primitives */
#define NL_SYSTEM 0x0
#define NL_MATRIX 0x1
/* Solver Parameters */
#define NL_SOLVER 0x100
#define NL_NB_VARIABLES 0x101
#define NL_LEAST_SQUARES 0x102
#define NL_ERROR 0x108
#define NL_NB_ROWS 0x110
#define NL_NB_RIGHT_HAND_SIDES 0x112 /* 4 max */
/* Contexts */
NLContext *nlNewContext(void);
void nlDeleteContext(NLContext *context);
/* State get/set */
void nlSolverParameteri(NLContext *context, NLenum pname, NLint param);
/* Variables */
void nlSetVariable(NLContext *context, NLuint rhsindex, NLuint index, NLdouble value);
NLdouble nlGetVariable(NLContext *context, NLuint rhsindex, NLuint index);
void nlLockVariable(NLContext *context, NLuint index);
void nlUnlockVariable(NLContext *context, NLuint index);
/* Begin/End */
void nlBegin(NLContext *context, NLenum primitive);
void nlEnd(NLContext *context, NLenum primitive);
/* Setting elements in matrix/vector */
void nlMatrixAdd(NLContext *context, NLuint row, NLuint col, NLdouble value);
void nlRightHandSideAdd(NLContext *context, NLuint rhsindex, NLuint index, NLdouble value);
void nlRightHandSideSet(NLContext *context, NLuint rhsindex, NLuint index, NLdouble value);
/* Solve */
void nlPrintMatrix(NLContext *context);
NLboolean nlSolve(NLContext *context, NLboolean solveAgain);
#ifdef __cplusplus
}
#endif
#endif

492
intern/opennl/intern/opennl.cpp
View File

@ -1,492 +0,0 @@
/** \file opennl/intern/opennl.c
* \ingroup opennlintern
*/
/*
*
* OpenNL: Numerical Library
* Copyright (C) 2004 Bruno Levy
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
* and the reason for such modification.
*
* Contact: Bruno Levy
*
* levy@loria.fr
*
* ISA Project
* LORIA, INRIA Lorraine,
* Campus Scientifique, BP 239
* 54506 VANDOEUVRE LES NANCY CEDEX
* FRANCE
*
* Note that the GNU General Public License does not permit incorporating
* the Software into proprietary programs.
*/
#include "ONL_opennl.h"
#include <Eigen/Sparse>
#include <algorithm>
#include <cassert>
#include <cstdlib>
#include <iostream>
#include <vector>
/* Eigen data structures */
typedef Eigen::SparseMatrix<double, Eigen::ColMajor> EigenSparseMatrix;
typedef Eigen::SparseLU<EigenSparseMatrix> EigenSparseSolver;
typedef Eigen::VectorXd EigenVectorX;
typedef Eigen::Triplet<double> EigenTriplet;
/* NLContext data structure */
struct NLCoeff {
NLCoeff()
{
index = 0;
value = 0.0;
}
NLuint index;
NLdouble value;
};
struct NLVariable {
NLVariable()
{
memset(value, 0, sizeof(value));
locked = false;
index = 0;
}
NLdouble value[4];
NLboolean locked;
NLuint index;
std::vector<NLCoeff> a;
};
#define NL_STATE_INITIAL 0
#define NL_STATE_SYSTEM 1
#define NL_STATE_MATRIX 2
#define NL_STATE_MATRIX_CONSTRUCTED 3
#define NL_STATE_SYSTEM_CONSTRUCTED 4
#define NL_STATE_SYSTEM_SOLVED 5
struct NLContext {
NLContext()
{
state = NL_STATE_INITIAL;
n = 0;
m = 0;
sparse_solver = NULL;
nb_variables = 0;
nb_rhs = 1;
nb_rows = 0;
least_squares = false;
solve_again = false;
}
~NLContext()
{
delete sparse_solver;
}
NLenum state;
NLuint n;
NLuint m;
std::vector<EigenTriplet> Mtriplets;
EigenSparseMatrix M;
EigenSparseMatrix MtM;
std::vector<EigenVectorX> b;
std::vector<EigenVectorX> Mtb;
std::vector<EigenVectorX> x;
EigenSparseSolver *sparse_solver;
NLuint nb_variables;
std::vector<NLVariable> variable;
NLuint nb_rows;
NLuint nb_rhs;
NLboolean least_squares;
NLboolean solve_again;
};
NLContext *nlNewContext(void)
{
return new NLContext();
}
void nlDeleteContext(NLContext *context)
{
delete context;
}
static void __nlCheckState(NLContext *context, NLenum state)
{
assert(context->state == state);
}
static void __nlTransition(NLContext *context, NLenum from_state, NLenum to_state)
{
__nlCheckState(context, from_state);
context->state = to_state;
}
/* Get/Set parameters */
void nlSolverParameteri(NLContext *context, NLenum pname, NLint param)
{
__nlCheckState(context, NL_STATE_INITIAL);
switch(pname) {
case NL_NB_VARIABLES: {
assert(param > 0);
context->nb_variables = (NLuint)param;
} break;
case NL_NB_ROWS: {
assert(param > 0);
context->nb_rows = (NLuint)param;
} break;
case NL_LEAST_SQUARES: {
context->least_squares = (NLboolean)param;
} break;
case NL_NB_RIGHT_HAND_SIDES: {
context->nb_rhs = (NLuint)param;
} break;
default: {
assert(0);
} break;
}
}
/* Get/Set Lock/Unlock variables */
void nlSetVariable(NLContext *context, NLuint rhsindex, NLuint index, NLdouble value)
{
__nlCheckState(context, NL_STATE_SYSTEM);
context->variable[index].value[rhsindex] = value;
}
NLdouble nlGetVariable(NLContext *context, NLuint rhsindex, NLuint index)
{
assert(context->state != NL_STATE_INITIAL);
return context->variable[index].value[rhsindex];
}
void nlLockVariable(NLContext *context, NLuint index)
{
__nlCheckState(context, NL_STATE_SYSTEM);
context->variable[index].locked = true;
}
void nlUnlockVariable(NLContext *context, NLuint index)
{
__nlCheckState(context, NL_STATE_SYSTEM);
context->variable[index].locked = false;
}
/* System construction */
static void __nlVariablesToVector(NLContext *context)
{
NLuint i, j, nb_rhs;
nb_rhs= context->nb_rhs;
for(i=0; i<context->nb_variables; i++) {
NLVariable* v = &(context->variable[i]);
if(!v->locked) {
for(j=0; j<nb_rhs; j++)
context->x[j][v->index] = v->value[j];
}
}
}
static void __nlVectorToVariables(NLContext *context)
{
NLuint i, j, nb_rhs;
nb_rhs= context->nb_rhs;
for(i=0; i<context->nb_variables; i++) {
NLVariable* v = &(context->variable[i]);
if(!v->locked) {
for(j=0; j<nb_rhs; j++)
v->value[j] = context->x[j][v->index];
}
}
}
static void __nlBeginSystem(NLContext *context)
{
assert(context->nb_variables > 0);
if (context->solve_again)
__nlTransition(context, NL_STATE_SYSTEM_SOLVED, NL_STATE_SYSTEM);
else {
__nlTransition(context, NL_STATE_INITIAL, NL_STATE_SYSTEM);
context->variable.resize(context->nb_variables);
}
}
static void __nlEndSystem(NLContext *context)
{
__nlTransition(context, NL_STATE_MATRIX_CONSTRUCTED, NL_STATE_SYSTEM_CONSTRUCTED);
}
static void __nlBeginMatrix(NLContext *context)
{
NLuint i;
NLuint m = 0, n = 0;
__nlTransition(context, NL_STATE_SYSTEM, NL_STATE_MATRIX);
if (!context->solve_again) {
for(i=0; i<context->nb_variables; i++) {
if(context->variable[i].locked)
context->variable[i].index = ~0;
else
context->variable[i].index = n++;
}
m = (context->nb_rows == 0)? n: context->nb_rows;
context->m = m;
context->n = n;
/* reserve reasonable estimate */
context->Mtriplets.clear();
context->Mtriplets.reserve(std::max(m, n)*3);
context->b.resize(context->nb_rhs);
context->x.resize(context->nb_rhs);
for (i=0; i<context->nb_rhs; i++) {
context->b[i].setZero(m);
context->x[i].setZero(n);
}
}
else {
/* need to recompute b only, A is not constructed anymore */
for (i=0; i<context->nb_rhs; i++)
context->b[i].setZero(context->m);
}
__nlVariablesToVector(context);
}
static void __nlEndMatrixRHS(NLContext *context, NLuint rhs)
{
NLVariable *variable;
NLuint i, j;
EigenVectorX& b = context->b[rhs];
for(i=0; i<context->nb_variables; i++) {
variable = &(context->variable[i]);
if(variable->locked) {
std::vector<NLCoeff>& a = variable->a;
for(j=0; j<a.size(); j++) {
b[a[j].index] -= a[j].value*variable->value[rhs];
}
}
}
if(context->least_squares)
context->Mtb[rhs] = context->M.transpose() * b;
}
static void __nlEndMatrix(NLContext *context)
{
__nlTransition(context, NL_STATE_MATRIX, NL_STATE_MATRIX_CONSTRUCTED);
if(!context->solve_again) {
context->M.resize(context->m, context->n);
context->M.setFromTriplets(context->Mtriplets.begin(), context->Mtriplets.end());
context->Mtriplets.clear();
if(context->least_squares) {
context->MtM = context->M.transpose() * context->M;
context->Mtb.resize(context->nb_rhs);
for (NLuint rhs=0; rhs<context->nb_rhs; rhs++)
context->Mtb[rhs].setZero(context->n);
}
}
for (NLuint rhs=0; rhs<context->nb_rhs; rhs++)
__nlEndMatrixRHS(context, rhs);
}
void nlMatrixAdd(NLContext *context, NLuint row, NLuint col, NLdouble value)
{
__nlCheckState(context, NL_STATE_MATRIX);
if(context->solve_again)
return;
if (!context->least_squares && context->variable[row].locked);
else if (context->variable[col].locked) {
if(!context->least_squares)
row = context->variable[row].index;
NLCoeff coeff;
coeff.index = row;
coeff.value = value;
context->variable[col].a.push_back(coeff);
}
else {
if(!context->least_squares)
row = context->variable[row].index;
col = context->variable[col].index;
// direct insert into matrix is too slow, so use triplets
EigenTriplet triplet(row, col, value);
context->Mtriplets.push_back(triplet);
}
}
void nlRightHandSideAdd(NLContext *context, NLuint rhsindex, NLuint index, NLdouble value)
{
__nlCheckState(context, NL_STATE_MATRIX);
if(context->least_squares) {
context->b[rhsindex][index] += value;
}
else {
if(!context->variable[index].locked) {
index = context->variable[index].index;
context->b[rhsindex][index] += value;
}
}
}
void nlRightHandSideSet(NLContext *context, NLuint rhsindex, NLuint index, NLdouble value)
{
__nlCheckState(context, NL_STATE_MATRIX);
if(context->least_squares) {
context->b[rhsindex][index] = value;
}
else {
if(!context->variable[index].locked) {
index = context->variable[index].index;
context->b[rhsindex][index] = value;
}
}
}
void nlBegin(NLContext *context, NLenum prim)
{
switch(prim) {
case NL_SYSTEM: {
__nlBeginSystem(context);
} break;
case NL_MATRIX: {
__nlBeginMatrix(context);
} break;
default: {
assert(0);
}
}
}
void nlEnd(NLContext *context, NLenum prim)
{
switch(prim) {
case NL_SYSTEM: {
__nlEndSystem(context);
} break;
case NL_MATRIX: {
__nlEndMatrix(context);
} break;
default: {
assert(0);
}
}
}
void nlPrintMatrix(NLContext *context)
{
std::cout << "A:" << context->M << std::endl;
for(NLuint rhs=0; rhs<context->nb_rhs; rhs++)
std::cout << "b " << rhs << ":" << context->b[rhs] << std::endl;
if (context->MtM.rows() && context->MtM.cols())
std::cout << "AtA:" << context->MtM << std::endl;
}
/* Solving */
NLboolean nlSolve(NLContext *context, NLboolean solveAgain)
{
NLboolean result = true;
__nlCheckState(context, NL_STATE_SYSTEM_CONSTRUCTED);
if (!context->solve_again) {
EigenSparseMatrix& M = (context->least_squares)? context->MtM: context->M;
assert(M.rows() == M.cols());
/* Convert M to compressed column format */
M.makeCompressed();
/* Perform sparse LU factorization */
EigenSparseSolver *sparse_solver = new EigenSparseSolver();
context->sparse_solver = sparse_solver;
sparse_solver->analyzePattern(M);
sparse_solver->factorize(M);
result = (sparse_solver->info() == Eigen::Success);
/* Free M, don't need it anymore at this point */
M.resize(0, 0);
}
if (result) {
/* Solve each right hand side */
for(NLuint rhs=0; rhs<context->nb_rhs; rhs++) {
EigenVectorX& b = (context->least_squares)? context->Mtb[rhs]: context->b[rhs];
context->x[rhs] = context->sparse_solver->solve(b);
if (context->sparse_solver->info() != Eigen::Success)
result = false;
}
if (result) {
__nlVectorToVariables(context);
if (solveAgain)
context->solve_again = true;
__nlTransition(context, NL_STATE_SYSTEM_CONSTRUCTED, NL_STATE_SYSTEM_SOLVED);
}
}
return result;
}

9
source/blender/blenkernel/intern/softbody.c
View File

@ -81,7 +81,6 @@ variables on the UI for now
#include "BKE_scene.h"
#include "PIL_time.h"
// #include "ONL_opennl.h" remove linking to ONL for now
/* callbacks for errors and interrupts and some goo */
static int (*SB_localInterruptCallBack)(void) = NULL;
@ -1811,14 +1810,14 @@ static void dfdx_spring(int ia, int ic, int op, float dir[3], float L, float len
for (j=0;j<3;j++) {
delta_ij = (i==j ? (1.0f): (0.0f));
m=factor*(dir[i]*dir[j] + (1-L/len)*(delta_ij - dir[i]*dir[j]));
nlMatrixAdd(ia+i, op+ic+j, m);
EIG_linear_solver_matrix_add(ia+i, op+ic+j, m);
}
}
else {
for (i=0;i<3;i++)
for (j=0;j<3;j++) {
m=factor*dir[i]*dir[j];
nlMatrixAdd(ia+i, op+ic+j, m);
EIG_linear_solver_matrix_add(ia+i, op+ic+j, m);
}
}
}
@ -1827,13 +1826,13 @@ static void dfdx_spring(int ia, int ic, int op, float dir[3], float L, float len
static void dfdx_goal(int ia, int ic, int op, float factor)
{
int i;
for (i=0;i<3;i++) nlMatrixAdd(ia+i, op+ic+i, factor);
for (i=0;i<3;i++) EIG_linear_solver_matrix_add(ia+i, op+ic+i, factor);
}
static void dfdv_goal(int ia, int ic, float factor)
{
int i;
for (i=0;i<3;i++) nlMatrixAdd(ia+i, ic+i, factor);
for (i=0;i<3;i++) EIG_linear_solver_matrix_add(ia+i, ic+i, factor);
}
*/
static void sb_spring_force(Object *ob, int bpi, BodySpring *bs, float iks, float UNUSED(forcetime))

4
source/blender/blenlib/intern/math_solvers.c
View File

@ -57,7 +57,7 @@ bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], float r_eigen_values[3
}
#endif
return EG3_self_adjoint_eigen_solve(3, (const float *)m3, r_eigen_values, (float *)r_eigen_vectors);
return EIG_self_adjoint_eigen_solve(3, (const float *)m3, r_eigen_values, (float *)r_eigen_vectors);
}
/**
@ -70,5 +70,5 @@ bool BLI_eigen_solve_selfadjoint_m3(const float m3[3][3], float r_eigen_values[3
*/
void BLI_svd_m3(const float m3[3][3], float r_U[3][3], float r_S[3], float r_V[3][3])
{
EG3_svd_square_matrix(3, (const float *)m3, (float *)r_U, (float *)r_S, (float *)r_V);
EIG_svd_square_matrix(3, (const float *)m3, (float *)r_U, (float *)r_S, (float *)r_V);
}

8
source/blender/bmesh/CMakeLists.txt
View File

@ -30,6 +30,7 @@ set(INC
../blentranslation
../makesdna
../../../intern/guardedalloc
../../../intern/eigen
../../../extern/rangetree
)
@ -176,13 +177,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_OPENNL)
add_definitions(-DWITH_OPENNL)
list(APPEND INC_SYS
../../../intern/opennl/extern
)
endif()
if(WITH_FREESTYLE)
add_definitions(-DWITH_FREESTYLE)
endif()

2
source/blender/bmesh/SConscript
View File

@ -40,9 +40,9 @@ incs = [
'../makesdna',
'../blenkernel',
'#/intern/guardedalloc',
'#/intern/eigen',
'#/extern/bullet2/src',
'#/extern/rangetree',
'#/intern/opennl/extern'
]
defs = []

95
source/blender/bmesh/operators/bmo_smooth_laplacian.c
View File

@ -28,18 +28,15 @@
#include "MEM_guardedalloc.h"
#include "BLI_math.h"
#include "eigen_capi.h"
#include "bmesh.h"
#include "intern/bmesh_operators_private.h" /* own include */
#ifdef WITH_OPENNL
#include "ONL_opennl.h"
// #define SMOOTH_LAPLACIAN_AREA_FACTOR 4.0f /* UNUSED */
// #define SMOOTH_LAPLACIAN_EDGE_FACTOR 2.0f /* UNUSED */
#define SMOOTH_LAPLACIAN_MAX_EDGE_PERCENTAGE 1.8f
@ -59,7 +56,7 @@ struct BLaplacianSystem {
/* Pointers to data*/
BMesh *bm;
BMOperator *op;
NLContext *context;
LinearSolver *context;
/*Data*/
float min_area;
@ -92,7 +89,7 @@ static void delete_laplacian_system(LaplacianSystem *sys)
delete_void_pointer(sys->vweights);
delete_void_pointer(sys->zerola);
if (sys->context) {
nlDeleteContext(sys->context);
EIG_linear_solver_delete(sys->context);
}
sys->bm = NULL;
sys->op = NULL;
@ -333,9 +330,9 @@ static void fill_laplacian_matrix(LaplacianSystem *sys)
w4 = w4 / 4.0f;
if (!vert_is_boundary(vf[j]) && sys->zerola[idv1] == 0) {
nlMatrixAdd(sys->context, idv1, idv2, w2 * sys->vweights[idv1]);
nlMatrixAdd(sys->context, idv1, idv3, w3 * sys->vweights[idv1]);
nlMatrixAdd(sys->context, idv1, idv4, w4 * sys->vweights[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv2, w2 * sys->vweights[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv3, w3 * sys->vweights[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv4, w4 * sys->vweights[idv1]);
}
}
}
@ -346,16 +343,16 @@ static void fill_laplacian_matrix(LaplacianSystem *sys)
/* Is ring if number of faces == number of edges around vertice*/
i = BM_elem_index_get(f);
if (!vert_is_boundary(vf[0]) && sys->zerola[idv1] == 0) {
nlMatrixAdd(sys->context, idv1, idv2, sys->fweights[i][2] * sys->vweights[idv1]);
nlMatrixAdd(sys->context, idv1, idv3, sys->fweights[i][1] * sys->vweights[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv2, sys->fweights[i][2] * sys->vweights[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv3, sys->fweights[i][1] * sys->vweights[idv1]);
}
if (!vert_is_boundary(vf[1]) && sys->zerola[idv2] == 0) {
nlMatrixAdd(sys->context, idv2, idv1, sys->fweights[i][2] * sys->vweights[idv2]);
nlMatrixAdd(sys->context, idv2, idv3, sys->fweights[i][0] * sys->vweights[idv2]);
EIG_linear_solver_matrix_add(sys->context, idv2, idv1, sys->fweights[i][2] * sys->vweights[idv2]);
EIG_linear_solver_matrix_add(sys->context, idv2, idv3, sys->fweights[i][0] * sys->vweights[idv2]);
}
if (!vert_is_boundary(vf[2]) && sys->zerola[idv3] == 0) {
nlMatrixAdd(sys->context, idv3, idv1, sys->fweights[i][1] * sys->vweights[idv3]);
nlMatrixAdd(sys->context, idv3, idv2, sys->fweights[i][0] * sys->vweights[idv3]);
EIG_linear_solver_matrix_add(sys->context, idv3, idv1, sys->fweights[i][1] * sys->vweights[idv3]);
EIG_linear_solver_matrix_add(sys->context, idv3, idv2, sys->fweights[i][0] * sys->vweights[idv3]);
}
}
}
@ -368,8 +365,8 @@ static void fill_laplacian_matrix(LaplacianSystem *sys)
idv2 = BM_elem_index_get(e->v2);
if (sys->zerola[idv1] == 0 && sys->zerola[idv2] == 0) {
i = BM_elem_index_get(e);
nlMatrixAdd(sys->context, idv1, idv2, sys->eweights[i] * sys->vlengths[idv1]);
nlMatrixAdd(sys->context, idv2, idv1, sys->eweights[i] * sys->vlengths[idv2]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv2, sys->eweights[i] * sys->vlengths[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv2, idv1, sys->eweights[i] * sys->vlengths[idv2]);
}
}
}
@ -434,12 +431,12 @@ static void validate_solution(LaplacianSystem *sys, int usex, int usey, int usez
idv2 = BM_elem_index_get(e->v2);
vi1 = e->v1->co;
vi2 = e->v2->co;
ve1[0] = nlGetVariable(sys->context, 0, idv1);
ve1[1] = nlGetVariable(sys->context, 1, idv1);
ve1[2] = nlGetVariable(sys->context, 2, idv1);
ve2[0] = nlGetVariable(sys->context, 0, idv2);
ve2[1] = nlGetVariable(sys->context, 1, idv2);
ve2[2] = nlGetVariable(sys->context, 2, idv2);
ve1[0] = EIG_linear_solver_variable_get(sys->context, 0, idv1);
ve1[1] = EIG_linear_solver_variable_get(sys->context, 1, idv1);
ve1[2] = EIG_linear_solver_variable_get(sys->context, 2, idv1);
ve2[0] = EIG_linear_solver_variable_get(sys->context, 0, idv2);
ve2[1] = EIG_linear_solver_variable_get(sys->context, 1, idv2);
ve2[2] = EIG_linear_solver_variable_get(sys->context, 2, idv2);
leni = len_v3v3(vi1, vi2);
lene = len_v3v3(ve1, ve2);
if (lene > leni * SMOOTH_LAPLACIAN_MAX_EDGE_PERCENTAGE || lene < leni * SMOOTH_LAPLACIAN_MIN_EDGE_PERCENTAGE) {
@ -455,13 +452,13 @@ static void validate_solution(LaplacianSystem *sys, int usex, int usey, int usez
m_vertex_id = BM_elem_index_get(v);
if (sys->zerola[m_vertex_id] == 0) {
if (usex) {
v->co[0] = nlGetVariable(sys->context, 0, m_vertex_id);
v->co[0] = EIG_linear_solver_variable_get(sys->context, 0, m_vertex_id);
}
if (usey) {
v->co[1] = nlGetVariable(sys->context, 1, m_vertex_id);
v->co[1] = EIG_linear_solver_variable_get(sys->context, 1, m_vertex_id);
}
if (usez) {
v->co[2] = nlGetVariable(sys->context, 2, m_vertex_id);
v->co[2] = EIG_linear_solver_variable_get(sys->context, 2, m_vertex_id);
}
}
}
@ -501,32 +498,24 @@ void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op)
preserve_volume = BMO_slot_bool_get(op->slots_in, "preserve_volume");
sys->context = nlNewContext();
sys->context = EIG_linear_least_squares_solver_new(bm->totvert, bm->totvert, 3);
nlSolverParameteri(sys->context, NL_NB_VARIABLES, bm->totvert);
nlSolverParameteri(sys->context, NL_LEAST_SQUARES, NL_TRUE);
nlSolverParameteri(sys->context, NL_NB_ROWS, bm->totvert);
nlSolverParameteri(sys->context, NL_NB_RIGHT_HAND_SIDES, 3);
nlBegin(sys->context, NL_SYSTEM);
for (i = 0; i < bm->totvert; i++) {
nlLockVariable(sys->context, i);
EIG_linear_solver_variable_lock(sys->context, i);
}
BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
m_vertex_id = BM_elem_index_get(v);
nlUnlockVariable(sys->context, m_vertex_id);
nlSetVariable(sys->context, 0, m_vertex_id, v->co[0]);
nlSetVariable(sys->context, 1, m_vertex_id, v->co[1]);
nlSetVariable(sys->context, 2, m_vertex_id, v->co[2]);
EIG_linear_solver_variable_set(sys->context, 0, m_vertex_id, v->co[0]);
EIG_linear_solver_variable_set(sys->context, 1, m_vertex_id, v->co[1]);
EIG_linear_solver_variable_set(sys->context, 2, m_vertex_id, v->co[2]);
}
nlBegin(sys->context, NL_MATRIX);
init_laplacian_matrix(sys);
BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
m_vertex_id = BM_elem_index_get(v);
nlRightHandSideAdd(sys->context, 0, m_vertex_id, v->co[0]);
nlRightHandSideAdd(sys->context, 1, m_vertex_id, v->co[1]);
nlRightHandSideAdd(sys->context, 2, m_vertex_id, v->co[2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, m_vertex_id, v->co[0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, m_vertex_id, v->co[1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, m_vertex_id, v->co[2]);
i = m_vertex_id;
if (sys->zerola[i] == 0) {
w = sys->vweights[i] * sys->ring_areas[i];
@ -535,34 +524,22 @@ void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op)
sys->vlengths[i] = (w == 0.0f) ? 0.0f : -lambda_border * 2.0f / w;
if (!vert_is_boundary(v)) {
nlMatrixAdd(sys->context, i, i, 1.0f + lambda_factor / (4.0f * sys->ring_areas[i]));
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f + lambda_factor / (4.0f * sys->ring_areas[i]));
}
else {
nlMatrixAdd(sys->context, i, i, 1.0f + lambda_border * 2.0f);
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f + lambda_border * 2.0f);
}
}
else {
nlMatrixAdd(sys->context, i, i, 1.0f);
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f);
}
}
fill_laplacian_matrix(sys);
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
if (nlSolve(sys->context, NL_TRUE) ) {
if (EIG_linear_solver_solve(sys->context) ) {
validate_solution(sys, usex, usey, usez, preserve_volume);
}
delete_laplacian_system(sys);
}
#else /* WITH_OPENNL */
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op) {}
#endif /* WITH_OPENNL */

8
source/blender/editors/armature/CMakeLists.txt
View File

@ -28,6 +28,7 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/eigen
../../../../intern/glew-mx
)
@ -68,13 +69,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_OPENNL)
add_definitions(-DWITH_OPENNL)
list(APPEND INC_SYS
../../../../intern/opennl/extern
)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")

2
source/blender/editors/armature/SConscript
View File

@ -31,9 +31,9 @@ sources = env.Glob('*.c')
incs = [
'#/intern/guardedalloc',
'#/intern/eigen',
env['BF_GLEW_INC'],
'#/intern/glew-mx',
'#/intern/opennl/extern',
'../include',
'../../blenkernel',
'../../blenlib',

10
source/blender/editors/armature/armature_skinning.c
View File

@ -51,12 +51,10 @@
#include "ED_armature.h"
#include "ED_mesh.h"
#include "eigen_capi.h"
#include "armature_intern.h"
#ifdef WITH_OPENNL
# include "meshlaplacian.h"
#endif
#include "meshlaplacian.h"
#if 0
#include "reeb.h"
@ -401,12 +399,8 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob,
if (heat) {
const char *error = NULL;
#ifdef WITH_OPENNL
heat_bone_weighting(ob, mesh, verts, numbones, dgrouplist, dgroupflip,
root, tip, selected, &error);
#else
error = "Built without OpenNL";
#endif
if (error) {
BKE_report(reports, RPT_WARNING, error);
}

110
source/blender/editors/armature/meshlaplacian.c
View File

@ -46,12 +46,10 @@
#include "ED_mesh.h"
#include "ED_armature.h"
#include "eigen_capi.h"
#include "meshlaplacian.h"
#ifdef WITH_OPENNL
#include "ONL_opennl.h"
/* ************* XXX *************** */
static void waitcursor(int UNUSED(val)) {}
static void progress_bar(int UNUSED(dummy_val), const char *UNUSED(dummy)) {}
@ -64,7 +62,7 @@ static void error(const char *str) { printf("error: %s\n", str); }
/************************** Laplacian System *****************************/
struct LaplacianSystem {
NLContext *context; /* opennl context */
LinearSolver *context; /* linear solver */
int totvert, totface;
@ -76,7 +74,7 @@ struct LaplacianSystem {
int areaweights; /* use area in cotangent weights? */
int storeweights; /* store cotangent weights in fweights */
int nlbegun; /* nlBegin(NL_SYSTEM/NL_MATRIX) done */
bool variablesdone; /* variables set in linear system */
EdgeHash *edgehash; /* edge hash for construction */
@ -182,18 +180,18 @@ static void laplacian_triangle_weights(LaplacianSystem *sys, int f, int i1, int
t2 = cotangent_tri_weight_v3(v2, v3, v1) / laplacian_edge_count(sys->edgehash, i3, i1);
t3 = cotangent_tri_weight_v3(v3, v1, v2) / laplacian_edge_count(sys->edgehash, i1, i2);
nlMatrixAdd(sys->context, i1, i1, (t2 + t3) * varea[i1]);
nlMatrixAdd(sys->context, i2, i2, (t1 + t3) * varea[i2]);
nlMatrixAdd(sys->context, i3, i3, (t1 + t2) * varea[i3]);
EIG_linear_solver_matrix_add(sys->context, i1, i1, (t2 + t3) * varea[i1]);
EIG_linear_solver_matrix_add(sys->context, i2, i2, (t1 + t3) * varea[i2]);
EIG_linear_solver_matrix_add(sys->context, i3, i3, (t1 + t2) * varea[i3]);
nlMatrixAdd(sys->context, i1, i2, -t3 * varea[i1]);
nlMatrixAdd(sys->context, i2, i1, -t3 * varea[i2]);
EIG_linear_solver_matrix_add(sys->context, i1, i2, -t3 * varea[i1]);
EIG_linear_solver_matrix_add(sys->context, i2, i1, -t3 * varea[i2]);
nlMatrixAdd(sys->context, i2, i3, -t1 * varea[i2]);
nlMatrixAdd(sys->context, i3, i2, -t1 * varea[i3]);
EIG_linear_solver_matrix_add(sys->context, i2, i3, -t1 * varea[i2]);
EIG_linear_solver_matrix_add(sys->context, i3, i2, -t1 * varea[i3]);
nlMatrixAdd(sys->context, i3, i1, -t2 * varea[i3]);
nlMatrixAdd(sys->context, i1, i3, -t2 * varea[i1]);
EIG_linear_solver_matrix_add(sys->context, i3, i1, -t2 * varea[i3]);
EIG_linear_solver_matrix_add(sys->context, i1, i3, -t2 * varea[i1]);
if (sys->storeweights) {
sys->fweights[f][0] = t1 * varea[i1];
@ -218,11 +216,11 @@ static LaplacianSystem *laplacian_system_construct_begin(int totvert, int totfac
sys->areaweights = 1;
sys->storeweights = 0;
/* create opennl context */
sys->context = nlNewContext();
nlSolverParameteri(sys->context, NL_NB_VARIABLES, totvert);
/* create linear solver */
if (lsq)
nlSolverParameteri(sys->context, NL_LEAST_SQUARES, NL_TRUE);
sys->context = EIG_linear_least_squares_solver_new(0, totvert, 1);
else
sys->context = EIG_linear_solver_new(0, totvert, 1);
return sys;
}
@ -272,7 +270,7 @@ static void laplacian_system_construct_end(LaplacianSystem *sys)
/* for heat weighting */
if (sys->heat.H)
nlMatrixAdd(sys->context, a, a, sys->heat.H[a]);
EIG_linear_solver_matrix_add(sys->context, a, a, sys->heat.H[a]);
}
if (sys->storeweights)
@ -301,7 +299,7 @@ static void laplacian_system_delete(LaplacianSystem *sys)
if (sys->faces) MEM_freeN(sys->faces);
if (sys->fweights) MEM_freeN(sys->fweights);
nlDeleteContext(sys->context);
EIG_linear_solver_delete(sys->context);
MEM_freeN(sys);
}
@ -309,42 +307,37 @@ void laplacian_begin_solve(LaplacianSystem *sys, int index)
{
int a;
if (!sys->nlbegun) {
nlBegin(sys->context, NL_SYSTEM);
if (!sys->variablesdone) {
if (index >= 0) {
for (a = 0; a < sys->totvert; a++) {
if (sys->vpinned[a]) {
nlSetVariable(sys->context, 0, a, sys->verts[a][index]);
nlLockVariable(sys->context, a);
EIG_linear_solver_variable_set(sys->context, 0, a, sys->verts[a][index]);
EIG_linear_solver_variable_lock(sys->context, a);
}
}
}
nlBegin(sys->context, NL_MATRIX);
sys->nlbegun = 1;
sys->variablesdone = true;
}
}
void laplacian_add_right_hand_side(LaplacianSystem *sys, int v, float value)
{
nlRightHandSideAdd(sys->context, 0, v, value);
EIG_linear_solver_right_hand_side_add(sys->context, 0, v, value);
}
int laplacian_system_solve(LaplacianSystem *sys)
{
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
sys->nlbegun = 0;
sys->variablesdone = false;
//nlPrintMatrix(sys->context, );
//EIG_linear_solver_print_matrix(sys->context, );
return nlSolve(sys->context, NL_TRUE);
return EIG_linear_solver_solve(sys->context);
}
float laplacian_system_get_solution(LaplacianSystem *sys, int v)
{
return nlGetVariable(sys->context, 0, v);
return EIG_linear_solver_variable_get(sys->context, 0, v);
}
/************************* Heat Bone Weighting ******************************/
@ -1284,7 +1277,7 @@ static float meshdeform_boundary_total_weight(MeshDeformBind *mdb, int x, int y,
return totweight;
}
static void meshdeform_matrix_add_cell(MeshDeformBind *mdb, NLContext *context, int x, int y, int z)
static void meshdeform_matrix_add_cell(MeshDeformBind *mdb, LinearSolver *context, int x, int y, int z)
{
MDefBoundIsect *isect;
float weight, totweight;
@ -1294,7 +1287,7 @@ static void meshdeform_matrix_add_cell(MeshDeformBind *mdb, NLContext *context,
if (mdb->tag[acenter] == MESHDEFORM_TAG_EXTERIOR)
return;
nlMatrixAdd(context, mdb->varidx[acenter], mdb->varidx[acenter], 1.0f);
EIG_linear_solver_matrix_add(context, mdb->varidx[acenter], mdb->varidx[acenter], 1.0f);
totweight = meshdeform_boundary_total_weight(mdb, x, y, z);
for (i = 1; i <= 6; i++) {
@ -1305,12 +1298,12 @@ static void meshdeform_matrix_add_cell(MeshDeformBind *mdb, NLContext *context,
isect = mdb->boundisect[acenter][i - 1];
if (!isect) {
weight = (1.0f / mdb->width[0]) / totweight;
nlMatrixAdd(context, mdb->varidx[acenter], mdb->varidx[a], -weight);
EIG_linear_solver_matrix_add(context, mdb->varidx[acenter], mdb->varidx[a], -weight);
}
}
}
static void meshdeform_matrix_add_rhs(MeshDeformBind *mdb, NLContext *context, int x, int y, int z, int cagevert)
static void meshdeform_matrix_add_rhs(MeshDeformBind *mdb, LinearSolver *context, int x, int y, int z, int cagevert)
{
MDefBoundIsect *isect;
float rhs, weight, totweight;
@ -1331,7 +1324,7 @@ static void meshdeform_matrix_add_rhs(MeshDeformBind *mdb, NLContext *context, i
if (isect) {
weight = (1.0f / isect->len) / totweight;
rhs = weight * meshdeform_boundary_phi(mdb, isect, cagevert);
nlRightHandSideAdd(context, 0, mdb->varidx[acenter], rhs);
EIG_linear_solver_right_hand_side_add(context, 0, mdb->varidx[acenter], rhs);
}
}
}
@ -1386,7 +1379,7 @@ static void meshdeform_matrix_add_exterior_phi(MeshDeformBind *mdb, int x, int y
static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind *mdb)
{
NLContext *context;
LinearSolver *context;
float vec[3], gridvec[3];
int a, b, x, y, z, totvar;
char message[256];
@ -1403,15 +1396,8 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
progress_bar(0, "Starting mesh deform solve");
/* setup opennl solver */
context = nlNewContext();
nlSolverParameteri(context, NL_NB_VARIABLES, totvar);
nlSolverParameteri(context, NL_NB_ROWS, totvar);
nlSolverParameteri(context, NL_NB_RIGHT_HAND_SIDES, 1);
nlBegin(context, NL_SYSTEM);
nlBegin(context, NL_MATRIX);
/* setup linear solver */
context = EIG_linear_solver_new(totvar, totvar, 1);
/* build matrix */
for (z = 0; z < mdb->size; z++)
@ -1421,21 +1407,13 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
/* solve for each cage vert */
for (a = 0; a < mdb->totcagevert; a++) {
if (a != 0) {
nlBegin(context, NL_SYSTEM);
nlBegin(context, NL_MATRIX);
}
/* fill in right hand side and solve */
for (z = 0; z < mdb->size; z++)
for (y = 0; y < mdb->size; y++)
for (x = 0; x < mdb->size; x++)
meshdeform_matrix_add_rhs(mdb, context, x, y, z, a);
nlEnd(context, NL_MATRIX);
nlEnd(context, NL_SYSTEM);
if (nlSolve(context, NL_TRUE)) {
if (EIG_linear_solver_solve(context)) {
for (z = 0; z < mdb->size; z++)
for (y = 0; y < mdb->size; y++)
for (x = 0; x < mdb->size; x++)
@ -1448,7 +1426,7 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
for (b = 0; b < mdb->size3; b++) {
if (mdb->tag[b] != MESHDEFORM_TAG_EXTERIOR)
mdb->phi[b] = nlGetVariable(context, 0, mdb->varidx[b]);
mdb->phi[b] = EIG_linear_solver_variable_get(context, 0, mdb->varidx[b]);
mdb->totalphi[b] += mdb->phi[b];
}
@ -1502,7 +1480,7 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind
/* free */
MEM_freeN(mdb->varidx);
nlDeleteContext(context);
EIG_linear_solver_delete(context);
}
static void harmonic_coordinates_bind(Scene *UNUSED(scene), MeshDeformModifierData *mmd, MeshDeformBind *mdb)
@ -1705,13 +1683,3 @@ void mesh_deform_bind(Scene *scene, MeshDeformModifierData *mmd, float *vertexco
waitcursor(0);
}
#else /* WITH_OPENNL */
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
void mesh_deform_bind(Scene *scene, MeshDeformModifierData *mmd, float *vertexcos, int totvert, float cagemat[4][4]) {}
void *modifier_mdef_compact_influences_link_kludge = modifier_mdef_compact_influences;
#endif /* WITH_OPENNL */

46
source/blender/editors/armature/reeb.c
View File

@ -2497,7 +2497,7 @@ int weightFromLoc(EditMesh *em, int axis)
return 1;
}
static void addTriangle(NLContext *context, EditVert *v1, EditVert *v2, EditVert *v3, int e1, int e2, int e3)
static void addTriangle(LinearSolver *context, EditVert *v1, EditVert *v2, EditVert *v3, int e1, int e2, int e3)
{
/* Angle opposite e1 */
float t1 = cotangent_tri_weight_v3(v1->co, v2->co, v3->co) / e2;
@ -2512,23 +2512,23 @@ static void addTriangle(NLContext *context, EditVert *v1, EditVert *v2, EditVert
int i2 = indexData(v2);
int i3 = indexData(v3);
nlMatrixAdd(context, i1, i1, t2 + t3);
nlMatrixAdd(context, i2, i2, t1 + t3);
nlMatrixAdd(context, i3, i3, t1 + t2);
EIG_linear_solver_matrix_add(context, i1, i1, t2 + t3);
EIG_linear_solver_matrix_add(context, i2, i2, t1 + t3);
EIG_linear_solver_matrix_add(context, i3, i3, t1 + t2);
nlMatrixAdd(context, i1, i2, -t3);
nlMatrixAdd(context, i2, i1, -t3);
EIG_linear_solver_matrix_add(context, i1, i2, -t3);
EIG_linear_solver_matrix_add(context, i2, i1, -t3);
nlMatrixAdd(context, i2, i3, -t1);
nlMatrixAdd(context, i3, i2, -t1);
EIG_linear_solver_matrix_add(context, i2, i3, -t1);
EIG_linear_solver_matrix_add(context, i3, i2, -t1);
nlMatrixAdd(context, i3, i1, -t2);
nlMatrixAdd(context, i1, i3, -t2);
EIG_linear_solver_matrix_add(context, i3, i1, -t2);
EIG_linear_solver_matrix_add(context, i1, i3, -t2);
}
int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges)
{
NLContext *context;
LinearSolver *context;
NLboolean success;
EditVert *eve;
EditEdge *eed;
@ -2542,14 +2542,10 @@ int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges)
totvert++;
}
/* Solve with openNL */
/* Solve */
context = nlNewContext();
context = EIG_linear_solver_new(, 0, totvert, 1);
nlSolverParameteri(context, NL_NB_VARIABLES, totvert);
nlBegin(context, NL_SYSTEM);
/* Find local extrema */
for (index = 0, eve = em->verts.first; eve; index++, eve = eve->next) {
if (eve->h == 0) {
@ -2583,8 +2579,8 @@ int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges)
if (maximum || minimum) {
float w = weightData(eve);
eve->f1 = 0;
nlSetVariable(context, 0, index, w);
nlLockVariable(context, index);
EIG_linear_solver_variable_set(context, 0, index, w);
EIG_linear_solver_variable_lock(context, index);
}
else {
eve->f1 = 1;
@ -2592,8 +2588,6 @@ int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges)
}
}
nlBegin(context, NL_MATRIX);
/* Zero edge weight */
for (eed = em->edges.first; eed; eed = eed->next) {
eed->tmp.l = 0;
@ -2625,23 +2619,19 @@ int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges)
}
}
nlEnd(context, NL_MATRIX);
nlEnd(context, NL_SYSTEM);
success = nlSolve(context, NL_TRUE);
success = EIG_linear_solver_solve(context);
if (success) {
rval = 1;
for (index = 0, eve = em->verts.first; eve; index++, eve = eve->next) {
weightSetData(eve, nlGetVariable(context, 0, index));
weightSetData(eve, EIG_linear_solver_variable_get(context, 0, index));
}
}
else {
rval = 0;
}
nlDeleteContext(context);
EIG_linear_solver_delete(context);
return rval;
}

8
source/blender/editors/uvedit/CMakeLists.txt
View File

@ -29,6 +29,7 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/eigen
../../../../intern/glew-mx
)
@ -52,13 +53,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_OPENNL)
add_definitions(-DWITH_OPENNL)
list(APPEND INC_SYS
../../../../intern/opennl/extern
)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}")

2
source/blender/editors/uvedit/SConscript
View File

@ -34,9 +34,9 @@ sources = env.Glob('*.c')
incs = [
'#/intern/guardedalloc',
'#/intern/eigen',
env['BF_GLEW_INC'],
'#/intern/glew-mx',
'#/intern/opennl/extern',
'../include',
'../../blenkernel',
'../../blenlib',

167
source/blender/editors/uvedit/uvedit_parametrizer.c
View File

@ -44,9 +44,7 @@
#include "BLI_sys_types.h" /* for intptr_t support */
#ifdef WITH_OPENNL
#include "ONL_opennl.h"
#include "eigen_capi.h"
/* Utils */
@ -193,7 +191,7 @@ typedef struct PChart {
union PChartUnion {
struct PChartLscm {
NLContext *context;
LinearSolver *context;
float *abf_alpha;
PVert *pin1, *pin2;
} lscm;
@ -2471,17 +2469,12 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
PEdge *e;
int i, j, ninterior = sys->ninterior, nvar = 2 * sys->ninterior;
PBool success;
NLContext *context;
LinearSolver *context;
context = nlNewContext();
nlSolverParameteri(context, NL_NB_VARIABLES, nvar);
nlBegin(context, NL_SYSTEM);
nlBegin(context, NL_MATRIX);
context = EIG_linear_solver_new(0, nvar, 1);
for (i = 0; i < nvar; i++)
nlRightHandSideAdd(context, 0, i, sys->bInterior[i]);
EIG_linear_solver_right_hand_side_add(context, 0, i, sys->bInterior[i]);
for (f = chart->faces; f; f = f->nextlink) {
float wi1, wi2, wi3, b, si, beta[3], j2[3][3], W[3][3];
@ -2527,8 +2520,8 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
sys->J2dt[e2->u.id][0] = j2[1][0] = p_abf_compute_sin_product(sys, v1, e2->u.id) * wi2;
sys->J2dt[e3->u.id][0] = j2[2][0] = p_abf_compute_sin_product(sys, v1, e3->u.id) * wi3;
nlRightHandSideAdd(context, 0, v1->u.id, j2[0][0] * beta[0]);
nlRightHandSideAdd(context, 0, ninterior + v1->u.id, j2[1][0] * beta[1] + j2[2][0] * beta[2]);
EIG_linear_solver_right_hand_side_add(context, 0, v1->u.id, j2[0][0] * beta[0]);
EIG_linear_solver_right_hand_side_add(context, 0, ninterior + v1->u.id, j2[1][0] * beta[1] + j2[2][0] * beta[2]);
row1[0] = j2[0][0] * W[0][0];
row2[0] = j2[0][0] * W[1][0];
@ -2547,8 +2540,8 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
sys->J2dt[e2->u.id][1] = j2[1][1] = 1.0f * wi2;
sys->J2dt[e3->u.id][1] = j2[2][1] = p_abf_compute_sin_product(sys, v2, e3->u.id) * wi3;
nlRightHandSideAdd(context, 0, v2->u.id, j2[1][1] * beta[1]);
nlRightHandSideAdd(context, 0, ninterior + v2->u.id, j2[0][1] * beta[0] + j2[2][1] * beta[2]);
EIG_linear_solver_right_hand_side_add(context, 0, v2->u.id, j2[1][1] * beta[1]);
EIG_linear_solver_right_hand_side_add(context, 0, ninterior + v2->u.id, j2[0][1] * beta[0] + j2[2][1] * beta[2]);
row1[1] = j2[1][1] * W[0][1];
row2[1] = j2[1][1] * W[1][1];
@ -2567,8 +2560,8 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
sys->J2dt[e2->u.id][2] = j2[1][2] = p_abf_compute_sin_product(sys, v3, e2->u.id) * wi2;
sys->J2dt[e3->u.id][2] = j2[2][2] = 1.0f * wi3;
nlRightHandSideAdd(context, 0, v3->u.id, j2[2][2] * beta[2]);
nlRightHandSideAdd(context, 0, ninterior + v3->u.id, j2[0][2] * beta[0] + j2[1][2] * beta[1]);
EIG_linear_solver_right_hand_side_add(context, 0, v3->u.id, j2[2][2] * beta[2]);
EIG_linear_solver_right_hand_side_add(context, 0, ninterior + v3->u.id, j2[0][2] * beta[0] + j2[1][2] * beta[1]);
row1[2] = j2[2][2] * W[0][2];
row2[2] = j2[2][2] * W[1][2];
@ -2592,29 +2585,25 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
continue;
if (i == 0)
nlMatrixAdd(context, r, c, j2[0][i] * row1[j]);
EIG_linear_solver_matrix_add(context, r, c, j2[0][i] * row1[j]);
else
nlMatrixAdd(context, r + ninterior, c, j2[0][i] * row1[j]);
EIG_linear_solver_matrix_add(context, r + ninterior, c, j2[0][i] * row1[j]);
if (i == 1)
nlMatrixAdd(context, r, c, j2[1][i] * row2[j]);
EIG_linear_solver_matrix_add(context, r, c, j2[1][i] * row2[j]);
else
nlMatrixAdd(context, r + ninterior, c, j2[1][i] * row2[j]);
EIG_linear_solver_matrix_add(context, r + ninterior, c, j2[1][i] * row2[j]);
if (i == 2)
nlMatrixAdd(context, r, c, j2[2][i] * row3[j]);
EIG_linear_solver_matrix_add(context, r, c, j2[2][i] * row3[j]);
else
nlMatrixAdd(context, r + ninterior, c, j2[2][i] * row3[j]);
EIG_linear_solver_matrix_add(context, r + ninterior, c, j2[2][i] * row3[j]);
}
}
}
nlEnd(context, NL_MATRIX);
nlEnd(context, NL_SYSTEM);
success = nlSolve(context, NL_FALSE);
success = EIG_linear_solver_solve(context);
if (success) {
for (f = chart->faces; f; f = f->nextlink) {
@ -2625,24 +2614,24 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
pre[0] = pre[1] = pre[2] = 0.0;
if (v1->flag & PVERT_INTERIOR) {
float x = nlGetVariable(context, 0, v1->u.id);
float x2 = nlGetVariable(context, 0, ninterior + v1->u.id);
float x = EIG_linear_solver_variable_get(context, 0, v1->u.id);
float x2 = EIG_linear_solver_variable_get(context, 0, ninterior + v1->u.id);
pre[0] += sys->J2dt[e1->u.id][0] * x;
pre[1] += sys->J2dt[e2->u.id][0] * x2;
pre[2] += sys->J2dt[e3->u.id][0] * x2;
}
if (v2->flag & PVERT_INTERIOR) {
float x = nlGetVariable(context, 0, v2->u.id);
float x2 = nlGetVariable(context, 0, ninterior + v2->u.id);
float x = EIG_linear_solver_variable_get(context, 0, v2->u.id);
float x2 = EIG_linear_solver_variable_get(context, 0, ninterior + v2->u.id);
pre[0] += sys->J2dt[e1->u.id][1] * x2;
pre[1] += sys->J2dt[e2->u.id][1] * x;
pre[2] += sys->J2dt[e3->u.id][1] * x2;
}
if (v3->flag & PVERT_INTERIOR) {
float x = nlGetVariable(context, 0, v3->u.id);
float x2 = nlGetVariable(context, 0, ninterior + v3->u.id);
float x = EIG_linear_solver_variable_get(context, 0, v3->u.id);
float x2 = EIG_linear_solver_variable_get(context, 0, ninterior + v3->u.id);
pre[0] += sys->J2dt[e1->u.id][2] * x2;
pre[1] += sys->J2dt[e2->u.id][2] * x2;
pre[2] += sys->J2dt[e3->u.id][2] * x;
@ -2673,12 +2662,12 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart)
}
for (i = 0; i < ninterior; i++) {
sys->lambdaPlanar[i] += (float)nlGetVariable(context, 0, i);
sys->lambdaLength[i] += (float)nlGetVariable(context, 0, ninterior + i);
sys->lambdaPlanar[i] += (float)EIG_linear_solver_variable_get(context, 0, i);
sys->lambdaLength[i] += (float)EIG_linear_solver_variable_get(context, 0, ninterior + i);
}
}
nlDeleteContext(context);
EIG_linear_solver_delete(context);
return success;
}
@ -3004,12 +2993,12 @@ static void p_chart_extrema_verts(PChart *chart, PVert **pin1, PVert **pin2)
static void p_chart_lscm_load_solution(PChart *chart)
{
NLContext *context = chart->u.lscm.context;
LinearSolver *context = chart->u.lscm.context;
PVert *v;
for (v = chart->verts; v; v = v->nextlink) {
v->uv[0] = nlGetVariable(context, 0, 2 * v->u.id);
v->uv[1] = nlGetVariable(context, 0, 2 * v->u.id + 1);
v->uv[0] = EIG_linear_solver_variable_get(context, 0, 2 * v->u.id);
v->uv[1] = EIG_linear_solver_variable_get(context, 0, 2 * v->u.id + 1);
}
}
@ -3064,16 +3053,13 @@ static void p_chart_lscm_begin(PChart *chart, PBool live, PBool abf)
for (v = chart->verts; v; v = v->nextlink)
v->u.id = id++;
chart->u.lscm.context = nlNewContext();
nlSolverParameteri(chart->u.lscm.context, NL_NB_VARIABLES, 2 * chart->nverts);
nlSolverParameteri(chart->u.lscm.context, NL_NB_ROWS, 2 * chart->nfaces);
nlSolverParameteri(chart->u.lscm.context, NL_LEAST_SQUARES, NL_TRUE);
chart->u.lscm.context = EIG_linear_least_squares_solver_new(2 * chart->nfaces, 2 * chart->nverts, 1);
}
}
static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart)
{
NLContext *context = chart->u.lscm.context;
LinearSolver *context = chart->u.lscm.context;
PVert *v, *pin1 = chart->u.lscm.pin1, *pin2 = chart->u.lscm.pin2;
PFace *f;
float *alpha = chart->u.lscm.abf_alpha;
@ -3081,8 +3067,6 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart)
bool flip_faces;
int row;
nlBegin(context, NL_SYSTEM);
#if 0
/* TODO: make loading pins work for simplify/complexify. */
#endif
@ -3092,25 +3076,25 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart)
p_vert_load_pin_select_uvs(handle, v); /* reload for live */
if (chart->u.lscm.pin1) {
nlLockVariable(context, 2 * pin1->u.id);
nlLockVariable(context, 2 * pin1->u.id + 1);
nlLockVariable(context, 2 * pin2->u.id);
nlLockVariable(context, 2 * pin2->u.id + 1);
EIG_linear_solver_variable_lock(context, 2 * pin1->u.id);
EIG_linear_solver_variable_lock(context, 2 * pin1->u.id + 1);
EIG_linear_solver_variable_lock(context, 2 * pin2->u.id);
EIG_linear_solver_variable_lock(context, 2 * pin2->u.id + 1);
nlSetVariable(context, 0, 2 * pin1->u.id, pin1->uv[0]);
nlSetVariable(context, 0, 2 * pin1->u.id + 1, pin1->uv[1]);
nlSetVariable(context, 0, 2 * pin2->u.id, pin2->uv[0]);
nlSetVariable(context, 0, 2 * pin2->u.id + 1, pin2->uv[1]);
EIG_linear_solver_variable_set(context, 0, 2 * pin1->u.id, pin1->uv[0]);
EIG_linear_solver_variable_set(context, 0, 2 * pin1->u.id + 1, pin1->uv[1]);
EIG_linear_solver_variable_set(context, 0, 2 * pin2->u.id, pin2->uv[0]);
EIG_linear_solver_variable_set(context, 0, 2 * pin2->u.id + 1, pin2->uv[1]);
}
else {
/* set and lock the pins */
for (v = chart->verts; v; v = v->nextlink) {
if (v->flag & PVERT_PIN) {
nlLockVariable(context, 2 * v->u.id);
nlLockVariable(context, 2 * v->u.id + 1);
EIG_linear_solver_variable_lock(context, 2 * v->u.id);
EIG_linear_solver_variable_lock(context, 2 * v->u.id + 1);
nlSetVariable(context, 0, 2 * v->u.id, v->uv[0]);
nlSetVariable(context, 0, 2 * v->u.id + 1, v->uv[1]);
EIG_linear_solver_variable_set(context, 0, 2 * v->u.id, v->uv[0]);
EIG_linear_solver_variable_set(context, 0, 2 * v->u.id + 1, v->uv[1]);
}
}
}
@ -3137,8 +3121,6 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart)
/* construct matrix */
nlBegin(context, NL_MATRIX);
row = 0;
for (f = chart->faces; f; f = f->nextlink) {
PEdge *e1 = f->edge, *e2 = e1->next, *e3 = e2->next;
@ -3185,26 +3167,22 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart)
cosine = cosf(a1) * ratio;
sine = sina1 * ratio;
nlMatrixAdd(context, row, 2 * v1->u.id, cosine - 1.0f);
nlMatrixAdd(context, row, 2 * v1->u.id + 1, -sine);
nlMatrixAdd(context, row, 2 * v2->u.id, -cosine);
nlMatrixAdd(context, row, 2 * v2->u.id + 1, sine);
nlMatrixAdd(context, row, 2 * v3->u.id, 1.0);
EIG_linear_solver_matrix_add(context, row, 2 * v1->u.id, cosine - 1.0f);
EIG_linear_solver_matrix_add(context, row, 2 * v1->u.id + 1, -sine);
EIG_linear_solver_matrix_add(context, row, 2 * v2->u.id, -cosine);
EIG_linear_solver_matrix_add(context, row, 2 * v2->u.id + 1, sine);
EIG_linear_solver_matrix_add(context, row, 2 * v3->u.id, 1.0);
row++;
nlMatrixAdd(context, row, 2 * v1->u.id, sine);
nlMatrixAdd(context, row, 2 * v1->u.id + 1, cosine - 1.0f);
nlMatrixAdd(context, row, 2 * v2->u.id, -sine);
nlMatrixAdd(context, row, 2 * v2->u.id + 1, -cosine);
nlMatrixAdd(context, row, 2 * v3->u.id + 1, 1.0);
EIG_linear_solver_matrix_add(context, row, 2 * v1->u.id, sine);
EIG_linear_solver_matrix_add(context, row, 2 * v1->u.id + 1, cosine - 1.0f);
EIG_linear_solver_matrix_add(context, row, 2 * v2->u.id, -sine);
EIG_linear_solver_matrix_add(context, row, 2 * v2->u.id + 1, -cosine);
EIG_linear_solver_matrix_add(context, row, 2 * v3->u.id + 1, 1.0);
row++;
}
nlEnd(context, NL_MATRIX);
nlEnd(context, NL_SYSTEM);
if (nlSolve(context, NL_TRUE)) {
if (EIG_linear_solver_solve(context)) {
p_chart_lscm_load_solution(chart);
return P_TRUE;
}
@ -3221,7 +3199,7 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart)
static void p_chart_lscm_end(PChart *chart)
{
if (chart->u.lscm.context)
nlDeleteContext(chart->u.lscm.context);
EIG_linear_solver_delete(chart->u.lscm.context);
if (chart->u.lscm.abf_alpha) {
MEM_freeN(chart->u.lscm.abf_alpha);
@ -4700,36 +4678,3 @@ void param_flush_restore(ParamHandle *handle)
}
}
#else /* WITH_OPENNL */
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wunused-parameter"
#endif
/* stubs */
void param_face_add(ParamHandle *handle, ParamKey key, int nverts,
ParamKey *vkeys, float **co, float **uv,
ParamBool *pin, ParamBool *select, float normal[3]) {}
void param_edge_set_seam(ParamHandle *handle,
ParamKey *vkeys) {}
void param_aspect_ratio(ParamHandle *handle, float aspx, float aspy) {}
ParamHandle *param_construct_begin(void) { return NULL; }
void param_construct_end(ParamHandle *handle, ParamBool fill, ParamBool impl) {}
void param_delete(ParamHandle *handle) {}
void param_stretch_begin(ParamHandle *handle) {}
void param_stretch_blend(ParamHandle *handle, float blend) {}
void param_stretch_iter(ParamHandle *handle) {}
void param_stretch_end(ParamHandle *handle) {}
void param_pack(ParamHandle *handle, float margin, bool do_rotate) {}
void param_average(ParamHandle *handle) {}
void param_flush(ParamHandle *handle) {}
void param_flush_restore(ParamHandle *handle) {}
void param_lscm_begin(ParamHandle *handle, ParamBool live, ParamBool abf) {}
void param_lscm_solve(ParamHandle *handle) {}
void param_lscm_end(ParamHandle *handle) {}
#endif /* WITH_OPENNL */

8
source/blender/modifiers/CMakeLists.txt
View File

@ -37,6 +37,7 @@ set(INC
../render/extern/include
../../../intern/elbeem/extern
../../../intern/guardedalloc
../../../intern/eigen
)
set(INC_SYS
@ -144,13 +145,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_OPENNL)
add_definitions(-DWITH_OPENNL)
list(APPEND INC_SYS
../../../intern/opennl/extern
)
endif()
if(WITH_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV)
endif()

2
source/blender/modifiers/SConscript
View File

@ -33,8 +33,8 @@ incs = [
'.',
'./intern',
'#/intern/guardedalloc',
'#/intern/eigen',
'#/intern/elbeem/extern',
'#/intern/opennl/extern',
'../render/extern/include',
'../bmesh',
'../include',

153
source/blender/modifiers/intern/MOD_laplaciandeform.c
View File

@ -42,6 +42,7 @@
#include "MOD_util.h"
#include "eigen_capi.h"
enum {
LAPDEFORM_SYSTEM_NOT_CHANGE = 0,
@ -54,10 +55,6 @@ enum {
LAPDEFORM_SYSTEM_CHANGE_NOT_VALID_GROUP,
};
#ifdef WITH_OPENNL
#include "ONL_opennl.h"
typedef struct LaplacianSystem {
bool is_matrix_computed;
bool has_solution;
@ -75,7 +72,7 @@ typedef struct LaplacianSystem {
int *unit_verts; /* Unit vectors of projected edges onto the plane orthogonal to n */
int *ringf_indices; /* Indices of faces per vertex */
int *ringv_indices; /* Indices of neighbors(vertex) per vertex */
NLContext *context; /* System for solve general implicit rotations */
LinearSolver *context; /* System for solve general implicit rotations */
MeshElemMap *ringf_map; /* Map of faces per vertex */
MeshElemMap *ringv_map; /* Map of vertex per vertex */
} LaplacianSystem;
@ -134,7 +131,7 @@ static void deleteLaplacianSystem(LaplacianSystem *sys)
MEM_SAFE_FREE(sys->ringv_map);
if (sys->context) {
nlDeleteContext(sys->context);
EIG_linear_solver_delete(sys->context);
}
MEM_SAFE_FREE(sys);
}
@ -283,9 +280,9 @@ static void initLaplacianMatrix(LaplacianSystem *sys)
sys->delta[idv[0]][1] -= v3[1] * w3;
sys->delta[idv[0]][2] -= v3[2] * w3;
nlMatrixAdd(sys->context, idv[0], idv[1], -w2);
nlMatrixAdd(sys->context, idv[0], idv[2], -w3);
nlMatrixAdd(sys->context, idv[0], idv[0], w2 + w3);
EIG_linear_solver_matrix_add(sys->context, idv[0], idv[1], -w2);
EIG_linear_solver_matrix_add(sys->context, idv[0], idv[2], -w3);
EIG_linear_solver_matrix_add(sys->context, idv[0], idv[0], w2 + w3);
}
}
}
@ -338,9 +335,9 @@ static void rotateDifferentialCoordinates(LaplacianSystem *sys)
beta = dot_v3v3(uij, di);
gamma = dot_v3v3(e2, di);
pi[0] = nlGetVariable(sys->context, 0, i);
pi[1] = nlGetVariable(sys->context, 1, i);
pi[2] = nlGetVariable(sys->context, 2, i);
pi[0] = EIG_linear_solver_variable_get(sys->context, 0, i);
pi[1] = EIG_linear_solver_variable_get(sys->context, 1, i);
pi[2] = EIG_linear_solver_variable_get(sys->context, 2, i);
zero_v3(ni);
num_fni = 0;
num_fni = sys->ringf_map[i].count;
@ -349,9 +346,9 @@ static void rotateDifferentialCoordinates(LaplacianSystem *sys)
fidn = sys->ringf_map[i].indices;
vin = sys->tris[fidn[fi]];
for (j = 0; j < 3; j++) {
vn[j][0] = nlGetVariable(sys->context, 0, vin[j]);
vn[j][1] = nlGetVariable(sys->context, 1, vin[j]);
vn[j][2] = nlGetVariable(sys->context, 2, vin[j]);
vn[j][0] = EIG_linear_solver_variable_get(sys->context, 0, vin[j]);
vn[j][1] = EIG_linear_solver_variable_get(sys->context, 1, vin[j]);
vn[j][2] = EIG_linear_solver_variable_get(sys->context, 2, vin[j]);
if (vin[j] == sys->unit_verts[i]) {
copy_v3_v3(pj, vn[j]);
}
@ -372,14 +369,14 @@ static void rotateDifferentialCoordinates(LaplacianSystem *sys)
fni[2] = alpha * ni[2] + beta * uij[2] + gamma * e2[2];
if (len_squared_v3(fni) > FLT_EPSILON) {
nlRightHandSideSet(sys->context, 0, i, fni[0]);
nlRightHandSideSet(sys->context, 1, i, fni[1]);
nlRightHandSideSet(sys->context, 2, i, fni[2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, i, fni[0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, i, fni[1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, i, fni[2]);
}
else {
nlRightHandSideSet(sys->context, 0, i, sys->delta[i][0]);
nlRightHandSideSet(sys->context, 1, i, sys->delta[i][1]);
nlRightHandSideSet(sys->context, 2, i, sys->delta[i][2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, i, sys->delta[i][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, i, sys->delta[i][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, i, sys->delta[i][2]);
}
}
}
@ -390,75 +387,59 @@ static void laplacianDeformPreview(LaplacianSystem *sys, float (*vertexCos)[3])
n = sys->total_verts;
na = sys->total_anchors;
#ifdef OPENNL_THREADING_HACK
modifier_opennl_lock();
#endif
if (!sys->is_matrix_computed) {
sys->context = nlNewContext();
sys->context = EIG_linear_least_squares_solver_new(n + na, n, 3);
nlSolverParameteri(sys->context, NL_NB_VARIABLES, n);
nlSolverParameteri(sys->context, NL_LEAST_SQUARES, NL_TRUE);
nlSolverParameteri(sys->context, NL_NB_ROWS, n + na);
nlSolverParameteri(sys->context, NL_NB_RIGHT_HAND_SIDES, 3);
nlBegin(sys->context, NL_SYSTEM);
for (i = 0; i < n; i++) {
nlSetVariable(sys->context, 0, i, sys->co[i][0]);
nlSetVariable(sys->context, 1, i, sys->co[i][1]);
nlSetVariable(sys->context, 2, i, sys->co[i][2]);
EIG_linear_solver_variable_set(sys->context, 0, i, sys->co[i][0]);
EIG_linear_solver_variable_set(sys->context, 1, i, sys->co[i][1]);
EIG_linear_solver_variable_set(sys->context, 2, i, sys->co[i][2]);
}
for (i = 0; i < na; i++) {
vid = sys->index_anchors[i];
nlSetVariable(sys->context, 0, vid, vertexCos[vid][0]);
nlSetVariable(sys->context, 1, vid, vertexCos[vid][1]);
nlSetVariable(sys->context, 2, vid, vertexCos[vid][2]);
EIG_linear_solver_variable_set(sys->context, 0, vid, vertexCos[vid][0]);
EIG_linear_solver_variable_set(sys->context, 1, vid, vertexCos[vid][1]);
EIG_linear_solver_variable_set(sys->context, 2, vid, vertexCos[vid][2]);
}
nlBegin(sys->context, NL_MATRIX);
initLaplacianMatrix(sys);
computeImplictRotations(sys);
for (i = 0; i < n; i++) {
nlRightHandSideSet(sys->context, 0, i, sys->delta[i][0]);
nlRightHandSideSet(sys->context, 1, i, sys->delta[i][1]);
nlRightHandSideSet(sys->context, 2, i, sys->delta[i][2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, i, sys->delta[i][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, i, sys->delta[i][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, i, sys->delta[i][2]);
}
for (i = 0; i < na; i++) {
vid = sys->index_anchors[i];
nlRightHandSideSet(sys->context, 0, n + i, vertexCos[vid][0]);
nlRightHandSideSet(sys->context, 1, n + i, vertexCos[vid][1]);
nlRightHandSideSet(sys->context, 2, n + i, vertexCos[vid][2]);
nlMatrixAdd(sys->context, n + i, vid, 1.0f);
EIG_linear_solver_right_hand_side_add(sys->context, 0, n + i, vertexCos[vid][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, n + i, vertexCos[vid][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, n + i, vertexCos[vid][2]);
EIG_linear_solver_matrix_add(sys->context, n + i, vid, 1.0f);
}
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
if (nlSolve(sys->context, NL_TRUE)) {
if (EIG_linear_solver_solve(sys->context)) {
sys->has_solution = true;
for (j = 1; j <= sys->repeat; j++) {
nlBegin(sys->context, NL_SYSTEM);
nlBegin(sys->context, NL_MATRIX);
rotateDifferentialCoordinates(sys);
for (i = 0; i < na; i++) {
vid = sys->index_anchors[i];
nlRightHandSideSet(sys->context, 0, n + i, vertexCos[vid][0]);
nlRightHandSideSet(sys->context, 1, n + i, vertexCos[vid][1]);
nlRightHandSideSet(sys->context, 2, n + i, vertexCos[vid][2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, n + i, vertexCos[vid][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, n + i, vertexCos[vid][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, n + i, vertexCos[vid][2]);
}
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
if (!nlSolve(sys->context, NL_FALSE)) {
if (!EIG_linear_solver_solve(sys->context)) {
sys->has_solution = false;
break;
}
}
if (sys->has_solution) {
for (vid = 0; vid < sys->total_verts; vid++) {
vertexCos[vid][0] = nlGetVariable(sys->context, 0, vid);
vertexCos[vid][1] = nlGetVariable(sys->context, 1, vid);
vertexCos[vid][2] = nlGetVariable(sys->context, 2, vid);
vertexCos[vid][0] = EIG_linear_solver_variable_get(sys->context, 0, vid);
vertexCos[vid][1] = EIG_linear_solver_variable_get(sys->context, 1, vid);
vertexCos[vid][2] = EIG_linear_solver_variable_get(sys->context, 2, vid);
}
}
else {
@ -473,49 +454,40 @@ static void laplacianDeformPreview(LaplacianSystem *sys, float (*vertexCos)[3])
}
else if (sys->has_solution) {
nlBegin(sys->context, NL_SYSTEM);
nlBegin(sys->context, NL_MATRIX);
for (i = 0; i < n; i++) {
nlRightHandSideSet(sys->context, 0, i, sys->delta[i][0]);
nlRightHandSideSet(sys->context, 1, i, sys->delta[i][1]);
nlRightHandSideSet(sys->context, 2, i, sys->delta[i][2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, i, sys->delta[i][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, i, sys->delta[i][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, i, sys->delta[i][2]);
}
for (i = 0; i < na; i++) {
vid = sys->index_anchors[i];
nlRightHandSideSet(sys->context, 0, n + i, vertexCos[vid][0]);
nlRightHandSideSet(sys->context, 1, n + i, vertexCos[vid][1]);
nlRightHandSideSet(sys->context, 2, n + i, vertexCos[vid][2]);
nlMatrixAdd(sys->context, n + i, vid, 1.0f);
EIG_linear_solver_right_hand_side_add(sys->context, 0, n + i, vertexCos[vid][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, n + i, vertexCos[vid][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, n + i, vertexCos[vid][2]);
EIG_linear_solver_matrix_add(sys->context, n + i, vid, 1.0f);
}
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
if (nlSolve(sys->context, NL_FALSE)) {
if (EIG_linear_solver_solve(sys->context)) {
sys->has_solution = true;
for (j = 1; j <= sys->repeat; j++) {
nlBegin(sys->context, NL_SYSTEM);
nlBegin(sys->context, NL_MATRIX);
rotateDifferentialCoordinates(sys);
for (i = 0; i < na; i++) {
vid = sys->index_anchors[i];
nlRightHandSideSet(sys->context, 0, n + i, vertexCos[vid][0]);
nlRightHandSideSet(sys->context, 1, n + i, vertexCos[vid][1]);
nlRightHandSideSet(sys->context, 2, n + i, vertexCos[vid][2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, n + i, vertexCos[vid][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, n + i, vertexCos[vid][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, n + i, vertexCos[vid][2]);
}
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
if (!nlSolve(sys->context, NL_FALSE)) {
if (!EIG_linear_solver_solve(sys->context)) {
sys->has_solution = false;
break;
}
}
if (sys->has_solution) {
for (vid = 0; vid < sys->total_verts; vid++) {
vertexCos[vid][0] = nlGetVariable(sys->context, 0, vid);
vertexCos[vid][1] = nlGetVariable(sys->context, 1, vid);
vertexCos[vid][2] = nlGetVariable(sys->context, 2, vid);
vertexCos[vid][0] = EIG_linear_solver_variable_get(sys->context, 0, vid);
vertexCos[vid][1] = EIG_linear_solver_variable_get(sys->context, 1, vid);
vertexCos[vid][2] = EIG_linear_solver_variable_get(sys->context, 2, vid);
}
}
else {
@ -526,10 +498,6 @@ static void laplacianDeformPreview(LaplacianSystem *sys, float (*vertexCos)[3])
sys->has_solution = false;
}
}
#ifdef OPENNL_THREADING_HACK
modifier_opennl_unlock();
#endif
}
static bool isValidVertexGroup(LaplacianDeformModifierData *lmd, Object *ob, DerivedMesh *dm)
@ -720,15 +688,6 @@ static void LaplacianDeformModifier_do(
}
}
#else /* WITH_OPENNL */
static void LaplacianDeformModifier_do(
LaplacianDeformModifierData *lmd, Object *ob, DerivedMesh *dm,
float (*vertexCos)[3], int numVerts)
{
UNUSED_VARS(lmd, ob, dm, vertexCos, numVerts);
}
#endif /* WITH_OPENNL */
static void initData(ModifierData *md)
{
LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md;
@ -792,12 +751,10 @@ static void deformVertsEM(
static void freeData(ModifierData *md)
{
LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md;
#ifdef WITH_OPENNL
LaplacianSystem *sys = (LaplacianSystem *)lmd->cache_system;
if (sys) {
deleteLaplacianSystem(sys);
}
#endif
MEM_SAFE_FREE(lmd->vertexco);
lmd->total_verts = 0;
}

84
source/blender/modifiers/intern/MOD_laplaciansmooth.c
View File

@ -43,9 +43,7 @@
#include "MOD_util.h"
#ifdef WITH_OPENNL
#include "ONL_opennl.h"
#include "eigen_capi.h"
#if 0
#define MOD_LAPLACIANSMOOTH_MAX_EDGE_PERCENTAGE 1.8f
@ -71,7 +69,7 @@ struct BLaplacianSystem {
const MPoly *mpoly;
const MLoop *mloop;
const MEdge *medges;
NLContext *context;
LinearSolver *context;
/*Data*/
float min_area;
@ -104,7 +102,7 @@ static void delete_laplacian_system(LaplacianSystem *sys)
MEM_SAFE_FREE(sys->zerola);
if (sys->context) {
nlDeleteContext(sys->context);
EIG_linear_solver_delete(sys->context);
}
sys->vertexCos = NULL;
sys->mpoly = NULL;
@ -300,16 +298,16 @@ static void fill_laplacian_matrix(LaplacianSystem *sys)
/* Is ring if number of faces == number of edges around vertice*/
if (sys->numNeEd[l_curr->v] == sys->numNeFa[l_curr->v] && sys->zerola[l_curr->v] == 0) {
nlMatrixAdd(sys->context, l_curr->v, l_next->v, sys->fweights[l_curr_index][2] * sys->vweights[l_curr->v]);
nlMatrixAdd(sys->context, l_curr->v, l_prev->v, sys->fweights[l_curr_index][1] * sys->vweights[l_curr->v]);
EIG_linear_solver_matrix_add(sys->context, l_curr->v, l_next->v, sys->fweights[l_curr_index][2] * sys->vweights[l_curr->v]);
EIG_linear_solver_matrix_add(sys->context, l_curr->v, l_prev->v, sys->fweights[l_curr_index][1] * sys->vweights[l_curr->v]);
}
if (sys->numNeEd[l_next->v] == sys->numNeFa[l_next->v] && sys->zerola[l_next->v] == 0) {
nlMatrixAdd(sys->context, l_next->v, l_curr->v, sys->fweights[l_curr_index][2] * sys->vweights[l_next->v]);
nlMatrixAdd(sys->context, l_next->v, l_prev->v, sys->fweights[l_curr_index][0] * sys->vweights[l_next->v]);
EIG_linear_solver_matrix_add(sys->context, l_next->v, l_curr->v, sys->fweights[l_curr_index][2] * sys->vweights[l_next->v]);
EIG_linear_solver_matrix_add(sys->context, l_next->v, l_prev->v, sys->fweights[l_curr_index][0] * sys->vweights[l_next->v]);
}
if (sys->numNeEd[l_prev->v] == sys->numNeFa[l_prev->v] && sys->zerola[l_prev->v] == 0) {
nlMatrixAdd(sys->context, l_prev->v, l_curr->v, sys->fweights[l_curr_index][1] * sys->vweights[l_prev->v]);
nlMatrixAdd(sys->context, l_prev->v, l_next->v, sys->fweights[l_curr_index][0] * sys->vweights[l_prev->v]);
EIG_linear_solver_matrix_add(sys->context, l_prev->v, l_curr->v, sys->fweights[l_curr_index][1] * sys->vweights[l_prev->v]);
EIG_linear_solver_matrix_add(sys->context, l_prev->v, l_next->v, sys->fweights[l_curr_index][0] * sys->vweights[l_prev->v]);
}
}
}
@ -323,8 +321,8 @@ static void fill_laplacian_matrix(LaplacianSystem *sys)
sys->zerola[idv1] == 0 &&
sys->zerola[idv2] == 0)
{
nlMatrixAdd(sys->context, idv1, idv2, sys->eweights[i] * sys->vlengths[idv1]);
nlMatrixAdd(sys->context, idv2, idv1, sys->eweights[i] * sys->vlengths[idv2]);
EIG_linear_solver_matrix_add(sys->context, idv1, idv2, sys->eweights[i] * sys->vlengths[idv1]);
EIG_linear_solver_matrix_add(sys->context, idv2, idv1, sys->eweights[i] * sys->vlengths[idv2]);
}
}
}
@ -342,13 +340,13 @@ static void validate_solution(LaplacianSystem *sys, short flag, float lambda, fl
if (sys->zerola[i] == 0) {
lam = sys->numNeEd[i] == sys->numNeFa[i] ? (lambda >= 0.0f ? 1.0f : -1.0f) : (lambda_border >= 0.0f ? 1.0f : -1.0f);
if (flag & MOD_LAPLACIANSMOOTH_X) {
sys->vertexCos[i][0] += lam * ((float)nlGetVariable(sys->context, 0, i) - sys->vertexCos[i][0]);
sys->vertexCos[i][0] += lam * ((float)EIG_linear_solver_variable_get(sys->context, 0, i) - sys->vertexCos[i][0]);
}
if (flag & MOD_LAPLACIANSMOOTH_Y) {
sys->vertexCos[i][1] += lam * ((float)nlGetVariable(sys->context, 1, i) - sys->vertexCos[i][1]);
sys->vertexCos[i][1] += lam * ((float)EIG_linear_solver_variable_get(sys->context, 1, i) - sys->vertexCos[i][1]);
}
if (flag & MOD_LAPLACIANSMOOTH_Z) {
sys->vertexCos[i][2] += lam * ((float)nlGetVariable(sys->context, 2, i) - sys->vertexCos[i][2]);
sys->vertexCos[i][2] += lam * ((float)EIG_linear_solver_variable_get(sys->context, 2, i) - sys->vertexCos[i][2]);
}
}
}
@ -386,24 +384,15 @@ static void laplaciansmoothModifier_do(
sys->vert_centroid[2] = 0.0f;
memset_laplacian_system(sys, 0);
#ifdef OPENNL_THREADING_HACK
modifier_opennl_lock();
#endif
sys->context = nlNewContext();
nlSolverParameteri(sys->context, NL_NB_VARIABLES, numVerts);
nlSolverParameteri(sys->context, NL_LEAST_SQUARES, NL_TRUE);
nlSolverParameteri(sys->context, NL_NB_ROWS, numVerts);
nlSolverParameteri(sys->context, NL_NB_RIGHT_HAND_SIDES, 3);
sys->context = EIG_linear_least_squares_solver_new(numVerts, numVerts, 3);
init_laplacian_matrix(sys);
for (iter = 0; iter < smd->repeat; iter++) {
nlBegin(sys->context, NL_SYSTEM);
for (i = 0; i < numVerts; i++) {
nlSetVariable(sys->context, 0, i, vertexCos[i][0]);
nlSetVariable(sys->context, 1, i, vertexCos[i][1]);
nlSetVariable(sys->context, 2, i, vertexCos[i][2]);
EIG_linear_solver_variable_set(sys->context, 0, i, vertexCos[i][0]);
EIG_linear_solver_variable_set(sys->context, 1, i, vertexCos[i][1]);
EIG_linear_solver_variable_set(sys->context, 2, i, vertexCos[i][2]);
if (iter == 0) {
add_v3_v3(sys->vert_centroid, vertexCos[i]);
}
@ -412,12 +401,11 @@ static void laplaciansmoothModifier_do(
mul_v3_fl(sys->vert_centroid, 1.0f / (float)numVerts);
}
nlBegin(sys->context, NL_MATRIX);
dv = dvert;
for (i = 0; i < numVerts; i++) {
nlRightHandSideSet(sys->context, 0, i, vertexCos[i][0]);
nlRightHandSideSet(sys->context, 1, i, vertexCos[i][1]);
nlRightHandSideSet(sys->context, 2, i, vertexCos[i][2]);
EIG_linear_solver_right_hand_side_add(sys->context, 0, i, vertexCos[i][0]);
EIG_linear_solver_right_hand_side_add(sys->context, 1, i, vertexCos[i][1]);
EIG_linear_solver_right_hand_side_add(sys->context, 2, i, vertexCos[i][2]);
if (iter == 0) {
if (dv) {
wpaint = defvert_find_weight(dv, defgrp_index);
@ -434,10 +422,10 @@ static void laplaciansmoothModifier_do(
w = sys->vlengths[i];
sys->vlengths[i] = (w == 0.0f) ? 0.0f : -fabsf(smd->lambda_border) * wpaint * 2.0f / w;
if (sys->numNeEd[i] == sys->numNeFa[i]) {
nlMatrixAdd(sys->context, i, i, 1.0f + fabsf(smd->lambda) * wpaint);
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f + fabsf(smd->lambda) * wpaint);
}
else {
nlMatrixAdd(sys->context, i, i, 1.0f + fabsf(smd->lambda_border) * wpaint * 2.0f);
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f + fabsf(smd->lambda_border) * wpaint * 2.0f);
}
}
else {
@ -447,15 +435,15 @@ static void laplaciansmoothModifier_do(
sys->vlengths[i] = (w == 0.0f) ? 0.0f : -fabsf(smd->lambda_border) * wpaint * 2.0f / w;
if (sys->numNeEd[i] == sys->numNeFa[i]) {
nlMatrixAdd(sys->context, i, i, 1.0f + fabsf(smd->lambda) * wpaint / (4.0f * sys->ring_areas[i]));
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f + fabsf(smd->lambda) * wpaint / (4.0f * sys->ring_areas[i]));
}
else {
nlMatrixAdd(sys->context, i, i, 1.0f + fabsf(smd->lambda_border) * wpaint * 2.0f);
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f + fabsf(smd->lambda_border) * wpaint * 2.0f);
}
}
}
else {
nlMatrixAdd(sys->context, i, i, 1.0f);
EIG_linear_solver_matrix_add(sys->context, i, i, 1.0f);
}
}
}
@ -464,32 +452,16 @@ static void laplaciansmoothModifier_do(
fill_laplacian_matrix(sys);
}
nlEnd(sys->context, NL_MATRIX);
nlEnd(sys->context, NL_SYSTEM);
if (nlSolve(sys->context, NL_TRUE)) {
if (EIG_linear_solver_solve(sys->context)) {
validate_solution(sys, smd->flag, smd->lambda, smd->lambda_border);
}
}
nlDeleteContext(sys->context);
EIG_linear_solver_delete(sys->context);
sys->context = NULL;
#ifdef OPENNL_THREADING_HACK
modifier_opennl_unlock();
#endif
delete_laplacian_system(sys);
}
#else /* WITH_OPENNL */
static void laplaciansmoothModifier_do(
LaplacianSmoothModifierData *smd, Object *ob, DerivedMesh *dm,
float (*vertexCos)[3], int numVerts)
{
UNUSED_VARS(smd, ob, dm, vertexCos, numVerts);
}
#endif /* WITH_OPENNL */
static void init_data(ModifierData *md)
{
LaplacianSmoothModifierData *smd = (LaplacianSmoothModifierData *) md;

21
source/blender/modifiers/intern/MOD_util.c
View File

@ -55,10 +55,6 @@
#include "MEM_guardedalloc.h"
#ifdef OPENNL_THREADING_HACK
#include "BLI_threads.h"
#endif
void modifier_init_texture(const Scene *scene, Tex *tex)
{
if (!tex)
@ -234,23 +230,6 @@ void modifier_get_vgroup(Object *ob, DerivedMesh *dm, const char *name, MDeformV
}
#ifdef OPENNL_THREADING_HACK
static ThreadMutex opennl_context_mutex = BLI_MUTEX_INITIALIZER;
void modifier_opennl_lock(void)
{
BLI_mutex_lock(&opennl_context_mutex);
}
void modifier_opennl_unlock(void)
{
BLI_mutex_unlock(&opennl_context_mutex);
}
#endif
/* only called by BKE_modifier.h/modifier.c */
void modifier_type_init(ModifierTypeInfo *types[])
{

17
source/blender/modifiers/intern/MOD_util.h
View File

@ -52,21 +52,4 @@ struct DerivedMesh *get_dm_for_modifier(struct Object *ob, ModifierApplyFlag fla
void modifier_get_vgroup(struct Object *ob, struct DerivedMesh *dm,
const char *name, struct MDeformVert **dvert, int *defgrp_index);
/* XXX workaround for non-threadsafe context in OpenNL (T38403)
* OpenNL uses global pointer for "current context", which causes
* conflict when multiple modifiers get evaluated in threaded depgraph.
* This is just a stupid hack to prevent assert failure / crash,
* otherwise we'd have to modify OpenNL on a large scale.
* OpenNL should be replaced eventually, there are other options (eigen, ceres).
* - lukas_t
*/
#ifdef WITH_OPENNL
#define OPENNL_THREADING_HACK
#endif
#ifdef OPENNL_THREADING_HACK
void modifier_opennl_lock(void);
void modifier_opennl_unlock(void);
#endif
#endif /* __MOD_UTIL_H__ */

3
source/blenderplayer/CMakeLists.txt
View File

@ -169,7 +169,6 @@ endif()
extern_recastnavigation
bf_intern_raskter
bf_intern_opencolorio
bf_intern_opennl
bf_intern_glew_mx
bf_intern_eigen
extern_rangetree
@ -195,8 +194,6 @@ endif()
list(APPEND BLENDER_SORTED_LIBS extern_ceres)
endif()
list(APPEND BLENDER_SORTED_LIBS extern_colamd)
if(WITH_MOD_BOOLEAN)
list(APPEND BLENDER_SORTED_LIBS extern_carve)
endif()