mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Compare commits
89 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8dd23c4ffd | ||
|
|
d65a6aeb20 | ||
|
|
395214bcc3 | ||
|
|
696bee033b | ||
|
|
59bd03457a | ||
|
|
088e8fcfef | ||
|
|
0e2efbddd3 | ||
|
|
12b9b92c40 | ||
|
|
0952ab2ac4 | ||
|
|
38229a3d23 | ||
|
|
b18f9427a8 | ||
|
|
a6fbf2c202 | ||
|
|
2034af6db9 | ||
|
|
fbe1d5fb2c | ||
|
|
560877016a | ||
|
|
c7ba7f59d6 | ||
|
|
5dca39eb8b | ||
|
|
21826e9e53 | ||
|
|
97c08b43b4 | ||
|
|
8f67e02ee2 | ||
|
|
93c329445c | ||
|
|
575255bc1f | ||
|
|
d29654fb4e | ||
|
|
2221cdbe62 | ||
|
|
ba1e62f516 | ||
|
|
ce2b0ac502 | ||
|
|
1f7dfcff8a | ||
|
|
2234043f99 | ||
|
|
69ff8afea7 | ||
|
|
64a6d37729 | ||
|
|
4ac874ed03 | ||
|
|
0029599c4a | ||
|
|
f78dffffda | ||
|
|
e304a92f41 | ||
|
|
2674a31421 | ||
|
|
de25881056 | ||
|
|
7df8b57770 | ||
|
|
ddba6054e0 | ||
|
|
6adc13ea04 | ||
|
|
66cbfd4d39 | ||
|
|
394784c999 | ||
|
|
fcc46f49ca | ||
|
|
92983fc95a | ||
|
|
d5702fb7e9 | ||
|
|
8aaa570c6d | ||
|
|
8c65cacad8 | ||
|
|
2041114285 | ||
|
|
ac406a7685 | ||
|
|
45ccaacc54 | ||
|
|
43e90e3575 | ||
|
|
63c58c8436 | ||
|
|
caf24f1c9e | ||
|
|
f7b959b5fb | ||
|
|
ad27746b5d | ||
|
|
90912315ac | ||
|
|
26e9563baf | ||
|
|
85c40128e4 | ||
|
|
7b13a7fd23 | ||
|
|
2f0307cdb5 | ||
|
|
749317561c | ||
|
|
dc5b335f9f | ||
|
|
74a2a0f224 | ||
|
|
b0862dcb2f | ||
|
|
ba013de9da | ||
|
|
4ea9113efc | ||
|
|
76a2db4c74 | ||
|
|
53a0142583 | ||
|
|
733fd6e7ba | ||
|
|
26282498dc | ||
|
|
f4bdc66e83 | ||
|
|
16deb21376 | ||
|
|
221f54698c | ||
|
|
2858b6d2d6 | ||
|
|
e589e3f0b6 | ||
|
|
66e7d02533 | ||
|
|
5cde86fce8 | ||
|
|
d0cb2b78d3 | ||
|
|
c0da31309d | ||
|
|
66c3343238 | ||
|
|
0c078ca80a | ||
|
|
87e4b10747 | ||
|
|
e2886d34ef | ||
|
|
246d12dcab | ||
|
|
1914024965 | ||
|
|
a03c970c5c | ||
|
|
9f945b6028 | ||
|
|
4691a4e4b5 | ||
|
|
e546ee315a | ||
|
|
a63c4da68e |
41
.gitignore
vendored
Normal file
41
.gitignore
vendored
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
qrc_*cxx
|
||||||
|
*.orig
|
||||||
|
*.pyc
|
||||||
|
*.diff
|
||||||
|
diff
|
||||||
|
*.save
|
||||||
|
save
|
||||||
|
*.old
|
||||||
|
*.gmo
|
||||||
|
*.qm
|
||||||
|
core
|
||||||
|
core.*
|
||||||
|
*.bak
|
||||||
|
*~
|
||||||
|
*.build*
|
||||||
|
*.moc.*
|
||||||
|
*.moc
|
||||||
|
ui_*
|
||||||
|
CMakeCache.txt
|
||||||
|
tags
|
||||||
|
.*.swp
|
||||||
|
activity.png
|
||||||
|
*.out
|
||||||
|
*.php*
|
||||||
|
*.log
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
log
|
||||||
|
patch
|
||||||
|
*.patch
|
||||||
|
a
|
||||||
|
a.*
|
||||||
|
lapack/testing
|
||||||
|
lapack/reference
|
||||||
|
.*project
|
||||||
|
.settings
|
||||||
|
Makefile
|
||||||
|
!ci/build.gitlab-ci.yml
|
||||||
|
!scripts/buildtests.in
|
||||||
|
!Eigen/Core
|
||||||
|
!Eigen/src/Core
|
||||||
28
.gitlab-ci.yml
Normal file
28
.gitlab-ci.yml
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
# This file is part of Eigen, a lightweight C++ template library
|
||||||
|
# for linear algebra.
|
||||||
|
#
|
||||||
|
# Copyright (C) 2023, The Eigen Authors
|
||||||
|
#
|
||||||
|
# This Source Code Form is subject to the terms of the Mozilla
|
||||||
|
# Public License v. 2.0. If a copy of the MPL was not distributed
|
||||||
|
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
stages:
|
||||||
|
- build
|
||||||
|
- deploy
|
||||||
|
|
||||||
|
variables:
|
||||||
|
# CMake build directory.
|
||||||
|
EIGEN_CI_BUILDDIR: .build
|
||||||
|
# Specify the CMake build target.
|
||||||
|
EIGEN_CI_BUILD_TARGET: ""
|
||||||
|
# If a test regex is specified, that will be selected.
|
||||||
|
# Otherwise, we will try a label if specified.
|
||||||
|
EIGEN_CI_CTEST_REGEX: ""
|
||||||
|
EIGEN_CI_CTEST_LABEL: ""
|
||||||
|
EIGEN_CI_CTEST_ARGS: ""
|
||||||
|
|
||||||
|
include:
|
||||||
|
- "/ci/common.gitlab-ci.yml"
|
||||||
|
- "/ci/build.linux.gitlab-ci.yml"
|
||||||
|
- "/ci/deploy.gitlab-ci.yml"
|
||||||
613
COPYING.LGPL
613
COPYING.LGPL
@@ -1,165 +1,502 @@
|
|||||||
GNU LESSER GENERAL PUBLIC LICENSE
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
Version 3, 29 June 2007
|
Version 2.1, February 1999
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this license document, but changing it is not allowed.
|
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.]
|
||||||
|
|
||||||
This version of the GNU Lesser General Public License incorporates
|
Preamble
|
||||||
the terms and conditions of version 3 of the GNU General Public
|
|
||||||
License, supplemented by the additional permissions listed below.
|
|
||||||
|
|
||||||
0. Additional Definitions.
|
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.
|
||||||
|
|
||||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
This license, the Lesser General Public License, applies to some
|
||||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
specially designated software packages--typically libraries--of the
|
||||||
General Public License.
|
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.
|
||||||
|
|
||||||
"The Library" refers to a covered work governed by this License,
|
When we speak of free software, we are referring to freedom of use,
|
||||||
other than an Application or a Combined Work as defined below.
|
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.
|
||||||
|
|
||||||
An "Application" is any work that makes use of an interface provided
|
To protect your rights, we need to make restrictions that forbid
|
||||||
by the Library, but which is not otherwise based on the Library.
|
distributors to deny you these rights or to ask you to surrender these
|
||||||
Defining a subclass of a class defined by the Library is deemed a mode
|
rights. These restrictions translate to certain responsibilities for
|
||||||
of using an interface provided by the Library.
|
you if you distribute copies of the library or if you modify it.
|
||||||
|
|
||||||
A "Combined Work" is a work produced by combining or linking an
|
For example, if you distribute copies of the library, whether gratis
|
||||||
Application with the Library. The particular version of the Library
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
with which the Combined Work was made is also called the "Linked
|
you. You must make sure that they, too, receive or can get the source
|
||||||
Version".
|
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.
|
||||||
|
|
||||||
The "Minimal Corresponding Source" for a Combined Work means the
|
We protect your rights with a two-step method: (1) we copyright the
|
||||||
Corresponding Source for the Combined Work, excluding any source code
|
library, and (2) we offer you this license, which gives you legal
|
||||||
for portions of the Combined Work that, considered in isolation, are
|
permission to copy, distribute and/or modify the library.
|
||||||
based on the Application, and not on the Linked Version.
|
|
||||||
|
|
||||||
The "Corresponding Application Code" for a Combined Work means the
|
To protect each distributor, we want to make it very clear that
|
||||||
object code and/or source code for the Application, including any data
|
there is no warranty for the free library. Also, if the library is
|
||||||
and utility programs needed for reproducing the Combined Work from the
|
modified by someone else and passed on, the recipients should know
|
||||||
Application, but excluding the System Libraries of the Combined Work.
|
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.
|
||||||
|
|
||||||
1. Exception to Section 3 of the GNU GPL.
|
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.
|
||||||
|
|
||||||
You may convey a covered work under sections 3 and 4 of this License
|
When a program is linked with a library, whether statically or using
|
||||||
without being bound by section 3 of the GNU GPL.
|
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.
|
||||||
|
|
||||||
2. Conveying Modified Versions.
|
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.
|
||||||
|
|
||||||
If you modify a copy of the Library, and, in your modifications, a
|
For example, on rare occasions, there may be a special need to
|
||||||
facility refers to a function or data to be supplied by an Application
|
encourage the widest possible use of a certain library, so that it becomes
|
||||||
that uses the facility (other than as an argument passed when the
|
a de-facto standard. To achieve this, non-free programs must be
|
||||||
facility is invoked), then you may convey a copy of the modified
|
allowed to use the library. A more frequent case is that a free
|
||||||
version:
|
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.
|
||||||
|
|
||||||
a) under this License, provided that you make a good faith effort to
|
In other cases, permission to use a particular library in non-free
|
||||||
ensure that, in the event an Application does not supply the
|
programs enables a greater number of people to use a large body of
|
||||||
function or data, the facility still operates, and performs
|
free software. For example, permission to use the GNU C Library in
|
||||||
whatever part of its purpose remains meaningful, or
|
non-free programs enables many more people to use the whole GNU
|
||||||
|
operating system, as well as its variant, the GNU/Linux operating
|
||||||
|
system.
|
||||||
|
|
||||||
b) under the GNU GPL, with none of the additional permissions of
|
Although the Lesser General Public License is Less protective of the
|
||||||
this License applicable to that copy.
|
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.
|
||||||
|
|
||||||
3. Object Code Incorporating Material from Library Header Files.
|
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
|
||||||
|
|
||||||
The object code form of an Application may incorporate material from
|
0. This License Agreement applies to any software library or other
|
||||||
a header file that is part of the Library. You may convey such object
|
program which contains a notice placed by the copyright holder or
|
||||||
code under terms of your choice, provided that, if the incorporated
|
other authorized party saying it may be distributed under the terms of
|
||||||
material is not limited to numerical parameters, data structure
|
this Lesser General Public License (also called "this License").
|
||||||
layouts and accessors, or small macros, inline functions and templates
|
Each licensee is addressed as "you".
|
||||||
(ten or fewer lines in length), you do both of the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the object code that the
|
A "library" means a collection of software functions and/or data
|
||||||
Library is used in it and that the Library and its use are
|
prepared so as to be conveniently linked with application programs
|
||||||
covered by this License.
|
(which use some of those functions and data) to form executables.
|
||||||
|
|
||||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
The "Library", below, refers to any such software library or work
|
||||||
document.
|
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".)
|
||||||
|
|
||||||
4. Combined Works.
|
"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.
|
||||||
|
|
||||||
You may convey a Combined Work under terms of your choice that,
|
Activities other than copying, distribution and modification are not
|
||||||
taken together, effectively do not restrict modification of the
|
covered by this License; they are outside its scope. The act of
|
||||||
portions of the Library contained in the Combined Work and reverse
|
running a program using the Library is not restricted, and output from
|
||||||
engineering for debugging such modifications, if you also do each of
|
such a program is covered only if its contents constitute a work based
|
||||||
the following:
|
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.
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the Combined Work that
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
the Library is used in it and that the Library and its use are
|
complete source code as you receive it, in any medium, provided that
|
||||||
covered by this License.
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
all the notices that refer to this License and to the absence of any
|
||||||
document.
|
warranty; and distribute a copy of this License along with the
|
||||||
|
|
||||||
c) For a Combined Work that displays copyright notices during
|
|
||||||
execution, include the copyright notice for the Library among
|
|
||||||
these notices, as well as a reference directing the user to the
|
|
||||||
copies of the GNU GPL and this license document.
|
|
||||||
|
|
||||||
d) Do one of the following:
|
|
||||||
|
|
||||||
0) Convey the Minimal Corresponding Source under the terms of this
|
|
||||||
License, and the Corresponding Application Code in a form
|
|
||||||
suitable for, and under terms that permit, the user to
|
|
||||||
recombine or relink the Application with a modified version of
|
|
||||||
the Linked Version to produce a modified Combined Work, in the
|
|
||||||
manner specified by section 6 of the GNU GPL for conveying
|
|
||||||
Corresponding Source.
|
|
||||||
|
|
||||||
1) Use a suitable shared library mechanism for linking with the
|
|
||||||
Library. A suitable mechanism is one that (a) uses at run time
|
|
||||||
a copy of the Library already present on the user's computer
|
|
||||||
system, and (b) will operate properly with a modified version
|
|
||||||
of the Library that is interface-compatible with the Linked
|
|
||||||
Version.
|
|
||||||
|
|
||||||
e) Provide Installation Information, but only if you would otherwise
|
|
||||||
be required to provide such information under section 6 of the
|
|
||||||
GNU GPL, and only to the extent that such information is
|
|
||||||
necessary to install and execute a modified version of the
|
|
||||||
Combined Work produced by recombining or relinking the
|
|
||||||
Application with a modified version of the Linked Version. (If
|
|
||||||
you use option 4d0, the Installation Information must accompany
|
|
||||||
the Minimal Corresponding Source and Corresponding Application
|
|
||||||
Code. If you use option 4d1, you must provide the Installation
|
|
||||||
Information in the manner specified by section 6 of the GNU GPL
|
|
||||||
for conveying Corresponding Source.)
|
|
||||||
|
|
||||||
5. Combined Libraries.
|
|
||||||
|
|
||||||
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 that are not Applications and are not covered by this
|
|
||||||
License, and convey such a combined library under terms of your
|
|
||||||
choice, if you do both of the following:
|
|
||||||
|
|
||||||
a) Accompany the combined library with a copy of the same work based
|
|
||||||
on the Library, uncombined with any other library facilities,
|
|
||||||
conveyed under the terms of this License.
|
|
||||||
|
|
||||||
b) Give prominent notice with the combined library that part of it
|
|
||||||
is a work based on the Library, and explaining where to find the
|
|
||||||
accompanying uncombined form of the same work.
|
|
||||||
|
|
||||||
6. Revised Versions of the GNU Lesser General Public License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the GNU 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 as you received it specifies that a certain numbered version
|
|
||||||
of the GNU Lesser General Public License "or any later version"
|
|
||||||
applies to it, you have the option of following the terms and
|
|
||||||
conditions either of that published version or of any later version
|
|
||||||
published by the Free Software Foundation. If the Library as you
|
|
||||||
received it does not specify a version number of the GNU Lesser
|
|
||||||
General Public License, you may choose any version of the GNU Lesser
|
|
||||||
General Public License ever published by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Library as you received it specifies that a proxy can decide
|
|
||||||
whether future versions of the GNU Lesser General Public License shall
|
|
||||||
apply, that proxy's public statement of acceptance of any version is
|
|
||||||
permanent authorization for you to choose that version for the
|
|
||||||
Library.
|
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 Street, 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!
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ Eigen is primarily MPL2 licensed. See COPYING.MPL2 and these links:
|
|||||||
Some files contain third-party code under BSD or LGPL licenses, whence the other
|
Some files contain third-party code under BSD or LGPL licenses, whence the other
|
||||||
COPYING.* files here.
|
COPYING.* files here.
|
||||||
|
|
||||||
|
All the LGPL code is either LGPL 2.1-only, or LGPL 2.1-or-later.
|
||||||
|
For this reason, the COPYING.LGPL file contains the LGPL 2.1 text.
|
||||||
|
|
||||||
If you want to guarantee that the Eigen code that you are #including is licensed
|
If you want to guarantee that the Eigen code that you are #including is licensed
|
||||||
under the MPL2 and possibly more permissive licenses (like BSD), #define this
|
under the MPL2 and possibly more permissive licenses (like BSD), #define this
|
||||||
preprocessor symbol:
|
preprocessor symbol:
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
## # The following are required to uses Dart and the Cdash dashboard
|
## # The following are required to uses Dart and the Cdash dashboard
|
||||||
## ENABLE_TESTING()
|
## ENABLE_TESTING()
|
||||||
## INCLUDE(CTest)
|
## INCLUDE(CTest)
|
||||||
set(CTEST_PROJECT_NAME "Eigen")
|
set(CTEST_PROJECT_NAME "Eigen3.1")
|
||||||
set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")
|
set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC")
|
||||||
|
|
||||||
set(CTEST_DROP_METHOD "http")
|
set(CTEST_DROP_METHOD "http")
|
||||||
set(CTEST_DROP_SITE "manao.inria.fr")
|
set(CTEST_DROP_SITE "manao.inria.fr")
|
||||||
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen")
|
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=Eigen3.1")
|
||||||
set(CTEST_DROP_SITE_CDASH TRUE)
|
set(CTEST_DROP_SITE_CDASH TRUE)
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
// Remember that usage of defined() in a #define is undefined by the standard
|
// Remember that usage of defined() in a #define is undefined by the standard
|
||||||
#if (defined __SSE2__) && ( (!defined __GNUC__) || EIGEN_GNUC_AT_LEAST(4,2) )
|
#if (defined __SSE2__) && ( (!defined __GNUC__) || (defined __INTEL_COMPILER) || EIGEN_GNUC_AT_LEAST(4,2) )
|
||||||
#define EIGEN_SSE2_ON_NON_MSVC_BUT_NOT_OLD_GCC
|
#define EIGEN_SSE2_ON_NON_MSVC_BUT_NOT_OLD_GCC
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#define EIGEN_SPARSECHOLESKY_MODULE_H
|
#define EIGEN_SPARSECHOLESKY_MODULE_H
|
||||||
|
|
||||||
#include "SparseCore"
|
#include "SparseCore"
|
||||||
|
#include "OrderingMethods"
|
||||||
|
|
||||||
#include "src/Core/util/DisableStupidWarnings.h"
|
#include "src/Core/util/DisableStupidWarnings.h"
|
||||||
|
|
||||||
|
|||||||
@@ -277,15 +277,13 @@ template<> struct ldlt_inplace<Lower>
|
|||||||
// are compared; if any diagonal is negligible compared
|
// are compared; if any diagonal is negligible compared
|
||||||
// to the largest overall, the algorithm bails.
|
// to the largest overall, the algorithm bails.
|
||||||
cutoff = abs(NumTraits<Scalar>::epsilon() * biggest_in_corner);
|
cutoff = abs(NumTraits<Scalar>::epsilon() * biggest_in_corner);
|
||||||
|
|
||||||
if(sign)
|
|
||||||
*sign = real(mat.diagonal().coeff(index_of_biggest_in_corner)) > 0 ? 1 : -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finish early if the matrix is not full rank.
|
// Finish early if the matrix is not full rank.
|
||||||
if(biggest_in_corner < cutoff)
|
if(biggest_in_corner < cutoff)
|
||||||
{
|
{
|
||||||
for(Index i = k; i < size; i++) transpositions.coeffRef(i) = i;
|
for(Index i = k; i < size; i++) transpositions.coeffRef(i) = i;
|
||||||
|
if(sign) *sign = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,6 +324,16 @@ template<> struct ldlt_inplace<Lower>
|
|||||||
}
|
}
|
||||||
if((rs>0) && (abs(mat.coeffRef(k,k)) > cutoff))
|
if((rs>0) && (abs(mat.coeffRef(k,k)) > cutoff))
|
||||||
A21 /= mat.coeffRef(k,k);
|
A21 /= mat.coeffRef(k,k);
|
||||||
|
|
||||||
|
if(sign)
|
||||||
|
{
|
||||||
|
// LDLT is not guaranteed to work for indefinite matrices, but let's try to get the sign right
|
||||||
|
int newSign = real(mat.diagonal().coeff(index_of_biggest_in_corner)) > 0;
|
||||||
|
if(k == 0)
|
||||||
|
*sign = newSign;
|
||||||
|
else if(*sign != newSign)
|
||||||
|
*sign = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -534,8 +542,7 @@ template<typename Derived>
|
|||||||
bool LDLT<MatrixType,_UpLo>::solveInPlace(MatrixBase<Derived> &bAndX) const
|
bool LDLT<MatrixType,_UpLo>::solveInPlace(MatrixBase<Derived> &bAndX) const
|
||||||
{
|
{
|
||||||
eigen_assert(m_isInitialized && "LDLT is not initialized.");
|
eigen_assert(m_isInitialized && "LDLT is not initialized.");
|
||||||
const Index size = m_matrix.rows();
|
eigen_assert(m_matrix.rows() == bAndX.rows());
|
||||||
eigen_assert(size == bAndX.rows());
|
|
||||||
|
|
||||||
bAndX = this->solve(bAndX);
|
bAndX = this->solve(bAndX);
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> >
|
|||||||
inline Index outerStride() const { return m_expression.outerStride(); }
|
inline Index outerStride() const { return m_expression.outerStride(); }
|
||||||
inline Index innerStride() const { return m_expression.innerStride(); }
|
inline Index innerStride() const { return m_expression.innerStride(); }
|
||||||
|
|
||||||
inline ScalarWithConstIfNotLvalue* data() { return m_expression.data(); }
|
inline ScalarWithConstIfNotLvalue* data() { return m_expression.const_cast_derived().data(); }
|
||||||
inline const Scalar* data() const { return m_expression.data(); }
|
inline const Scalar* data() const { return m_expression.data(); }
|
||||||
|
|
||||||
inline CoeffReturnType coeff(Index row, Index col) const
|
inline CoeffReturnType coeff(Index row, Index col) const
|
||||||
@@ -121,6 +121,13 @@ class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> >
|
|||||||
return m_expression;
|
return m_expression;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Forwards the resizing request to the nested expression
|
||||||
|
* \sa DenseBase::resize(Index) */
|
||||||
|
void resize(Index newSize) { m_expression.const_cast_derived().resize(newSize); }
|
||||||
|
/** Forwards the resizing request to the nested expression
|
||||||
|
* \sa DenseBase::resize(Index,Index)*/
|
||||||
|
void resize(Index nbRows, Index nbCols) { m_expression.const_cast_derived().resize(nbRows,nbCols); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
NestedExpressionType m_expression;
|
NestedExpressionType m_expression;
|
||||||
};
|
};
|
||||||
@@ -168,7 +175,7 @@ class MatrixWrapper : public MatrixBase<MatrixWrapper<ExpressionType> >
|
|||||||
inline Index outerStride() const { return m_expression.outerStride(); }
|
inline Index outerStride() const { return m_expression.outerStride(); }
|
||||||
inline Index innerStride() const { return m_expression.innerStride(); }
|
inline Index innerStride() const { return m_expression.innerStride(); }
|
||||||
|
|
||||||
inline ScalarWithConstIfNotLvalue* data() { return m_expression.data(); }
|
inline ScalarWithConstIfNotLvalue* data() { return m_expression.const_cast_derived().data(); }
|
||||||
inline const Scalar* data() const { return m_expression.data(); }
|
inline const Scalar* data() const { return m_expression.data(); }
|
||||||
|
|
||||||
inline CoeffReturnType coeff(Index row, Index col) const
|
inline CoeffReturnType coeff(Index row, Index col) const
|
||||||
@@ -231,6 +238,13 @@ class MatrixWrapper : public MatrixBase<MatrixWrapper<ExpressionType> >
|
|||||||
return m_expression;
|
return m_expression;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Forwards the resizing request to the nested expression
|
||||||
|
* \sa DenseBase::resize(Index) */
|
||||||
|
void resize(Index newSize) { m_expression.const_cast_derived().resize(newSize); }
|
||||||
|
/** Forwards the resizing request to the nested expression
|
||||||
|
* \sa DenseBase::resize(Index,Index)*/
|
||||||
|
void resize(Index nbRows, Index nbCols) { m_expression.const_cast_derived().resize(nbRows,nbCols); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
NestedExpressionType m_expression;
|
NestedExpressionType m_expression;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(sqrt, Sqrt)
|
|||||||
EIGEN_MKL_VML_DECLARE_UNARY_CALLS_REAL(square, Sqr)
|
EIGEN_MKL_VML_DECLARE_UNARY_CALLS_REAL(square, Sqr)
|
||||||
|
|
||||||
// The vm*powx functions are not avaibale in the windows version of MKL.
|
// The vm*powx functions are not avaibale in the windows version of MKL.
|
||||||
#ifdef _WIN32
|
#ifndef _WIN32
|
||||||
EIGEN_MKL_VML_DECLARE_POW_CALL(pow, vmspowx_, float, float)
|
EIGEN_MKL_VML_DECLARE_POW_CALL(pow, vmspowx_, float, float)
|
||||||
EIGEN_MKL_VML_DECLARE_POW_CALL(pow, vmdpowx_, double, double)
|
EIGEN_MKL_VML_DECLARE_POW_CALL(pow, vmdpowx_, double, double)
|
||||||
EIGEN_MKL_VML_DECLARE_POW_CALL(pow, vmcpowx_, scomplex, MKL_Complex8)
|
EIGEN_MKL_VML_DECLARE_POW_CALL(pow, vmcpowx_, scomplex, MKL_Complex8)
|
||||||
|
|||||||
@@ -65,6 +65,8 @@ struct CommaInitializer
|
|||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
CommaInitializer& operator,(const DenseBase<OtherDerived>& other)
|
CommaInitializer& operator,(const DenseBase<OtherDerived>& other)
|
||||||
{
|
{
|
||||||
|
if(other.cols()==0 || other.rows()==0)
|
||||||
|
return *this;
|
||||||
if (m_col==m_xpr.cols())
|
if (m_col==m_xpr.cols())
|
||||||
{
|
{
|
||||||
m_row+=m_currentBlockRows;
|
m_row+=m_currentBlockRows;
|
||||||
|
|||||||
@@ -44,9 +44,10 @@ struct traits<CwiseUnaryView<ViewOp, MatrixType> >
|
|||||||
// "error: no integral type can represent all of the enumerator values
|
// "error: no integral type can represent all of the enumerator values
|
||||||
InnerStrideAtCompileTime = MatrixTypeInnerStride == Dynamic
|
InnerStrideAtCompileTime = MatrixTypeInnerStride == Dynamic
|
||||||
? int(Dynamic)
|
? int(Dynamic)
|
||||||
: int(MatrixTypeInnerStride)
|
: int(MatrixTypeInnerStride) * int(sizeof(typename traits<MatrixType>::Scalar) / sizeof(Scalar)),
|
||||||
* int(sizeof(typename traits<MatrixType>::Scalar) / sizeof(Scalar)),
|
OuterStrideAtCompileTime = outer_stride_at_compile_time<MatrixType>::ret == Dynamic
|
||||||
OuterStrideAtCompileTime = outer_stride_at_compile_time<MatrixType>::ret
|
? int(Dynamic)
|
||||||
|
: outer_stride_at_compile_time<MatrixType>::ret * int(sizeof(typename traits<MatrixType>::Scalar) / sizeof(Scalar))
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -55,8 +56,7 @@ template<typename ViewOp, typename MatrixType, typename StorageKind>
|
|||||||
class CwiseUnaryViewImpl;
|
class CwiseUnaryViewImpl;
|
||||||
|
|
||||||
template<typename ViewOp, typename MatrixType>
|
template<typename ViewOp, typename MatrixType>
|
||||||
class CwiseUnaryView : internal::no_assignment_operator,
|
class CwiseUnaryView : public CwiseUnaryViewImpl<ViewOp, MatrixType, typename internal::traits<MatrixType>::StorageKind>
|
||||||
public CwiseUnaryViewImpl<ViewOp, MatrixType, typename internal::traits<MatrixType>::StorageKind>
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@@ -98,6 +98,10 @@ class CwiseUnaryViewImpl<ViewOp,MatrixType,Dense>
|
|||||||
typedef typename internal::dense_xpr_base< CwiseUnaryView<ViewOp, MatrixType> >::type Base;
|
typedef typename internal::dense_xpr_base< CwiseUnaryView<ViewOp, MatrixType> >::type Base;
|
||||||
|
|
||||||
EIGEN_DENSE_PUBLIC_INTERFACE(Derived)
|
EIGEN_DENSE_PUBLIC_INTERFACE(Derived)
|
||||||
|
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(CwiseUnaryViewImpl)
|
||||||
|
|
||||||
|
inline Scalar* data() { return &coeffRef(0); }
|
||||||
|
inline const Scalar* data() const { return &coeff(0); }
|
||||||
|
|
||||||
inline Index innerStride() const
|
inline Index innerStride() const
|
||||||
{
|
{
|
||||||
@@ -106,7 +110,7 @@ class CwiseUnaryViewImpl<ViewOp,MatrixType,Dense>
|
|||||||
|
|
||||||
inline Index outerStride() const
|
inline Index outerStride() const
|
||||||
{
|
{
|
||||||
return derived().nestedExpression().outerStride();
|
return derived().nestedExpression().outerStride() * sizeof(typename internal::traits<MatrixType>::Scalar) / sizeof(Scalar);
|
||||||
}
|
}
|
||||||
|
|
||||||
EIGEN_STRONG_INLINE CoeffReturnType coeff(Index row, Index col) const
|
EIGEN_STRONG_INLINE CoeffReturnType coeff(Index row, Index col) const
|
||||||
|
|||||||
@@ -39,13 +39,24 @@ struct plain_array
|
|||||||
plain_array(constructor_without_unaligned_array_assert) {}
|
plain_array(constructor_without_unaligned_array_assert) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT
|
#if defined(EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT)
|
||||||
#define EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(sizemask)
|
#define EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(sizemask)
|
||||||
|
#elif EIGEN_GNUC_AT_LEAST(4,7)
|
||||||
|
// GCC 4.7 is too aggressive in its optimizations and remove the alignement test based on the fact the array is declared to be aligned.
|
||||||
|
// See this bug report: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53900
|
||||||
|
// Hiding the origin of the array pointer behind a function argument seems to do the trick even if the function is inlined:
|
||||||
|
template<typename PtrType>
|
||||||
|
EIGEN_ALWAYS_INLINE PtrType eigen_unaligned_array_assert_workaround_gcc47(PtrType array) { return array; }
|
||||||
|
#define EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(sizemask) \
|
||||||
|
eigen_assert((reinterpret_cast<size_t>(eigen_unaligned_array_assert_workaround_gcc47(array)) & sizemask) == 0 \
|
||||||
|
&& "this assertion is explained here: " \
|
||||||
|
"http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html" \
|
||||||
|
" **** READ THIS WEB PAGE !!! ****");
|
||||||
#else
|
#else
|
||||||
#define EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(sizemask) \
|
#define EIGEN_MAKE_UNALIGNED_ARRAY_ASSERT(sizemask) \
|
||||||
eigen_assert((reinterpret_cast<size_t>(array) & sizemask) == 0 \
|
eigen_assert((reinterpret_cast<size_t>(array) & sizemask) == 0 \
|
||||||
&& "this assertion is explained here: " \
|
&& "this assertion is explained here: " \
|
||||||
"http://eigen.tuxfamily.org/dox-devel/TopicUnalignedArrayAssert.html" \
|
"http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html" \
|
||||||
" **** READ THIS WEB PAGE !!! ****");
|
" **** READ THIS WEB PAGE !!! ****");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ class DiagonalBase : public EigenBase<Derived>
|
|||||||
public:
|
public:
|
||||||
typedef typename internal::traits<Derived>::DiagonalVectorType DiagonalVectorType;
|
typedef typename internal::traits<Derived>::DiagonalVectorType DiagonalVectorType;
|
||||||
typedef typename DiagonalVectorType::Scalar Scalar;
|
typedef typename DiagonalVectorType::Scalar Scalar;
|
||||||
|
typedef typename DiagonalVectorType::RealScalar RealScalar;
|
||||||
typedef typename internal::traits<Derived>::StorageKind StorageKind;
|
typedef typename internal::traits<Derived>::StorageKind StorageKind;
|
||||||
typedef typename internal::traits<Derived>::Index Index;
|
typedef typename internal::traits<Derived>::Index Index;
|
||||||
|
|
||||||
@@ -65,6 +66,17 @@ class DiagonalBase : public EigenBase<Derived>
|
|||||||
return diagonal().cwiseInverse();
|
return diagonal().cwiseInverse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline const DiagonalWrapper<const CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const DiagonalVectorType> >
|
||||||
|
operator*(const Scalar& scalar) const
|
||||||
|
{
|
||||||
|
return diagonal() * scalar;
|
||||||
|
}
|
||||||
|
friend inline const DiagonalWrapper<const CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const DiagonalVectorType> >
|
||||||
|
operator*(const Scalar& scalar, const DiagonalBase& other)
|
||||||
|
{
|
||||||
|
return other.diagonal() * scalar;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef EIGEN2_SUPPORT
|
#ifdef EIGEN2_SUPPORT
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
bool isApprox(const DiagonalBase<OtherDerived>& other, typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision()) const
|
bool isApprox(const DiagonalBase<OtherDerived>& other, typename NumTraits<Scalar>::Real precision = NumTraits<Scalar>::dummy_precision()) const
|
||||||
|
|||||||
@@ -447,7 +447,7 @@ struct functor_traits<scalar_log_op<Scalar> >
|
|||||||
* indeed it seems better to declare m_other as a Packet and do the pset1() once
|
* indeed it seems better to declare m_other as a Packet and do the pset1() once
|
||||||
* in the constructor. However, in practice:
|
* in the constructor. However, in practice:
|
||||||
* - GCC does not like m_other as a Packet and generate a load every time it needs it
|
* - GCC does not like m_other as a Packet and generate a load every time it needs it
|
||||||
* - on the other hand GCC is able to moves the pset1() away the loop :)
|
* - on the other hand GCC is able to moves the pset1() outside the loop :)
|
||||||
* - simpler code ;)
|
* - simpler code ;)
|
||||||
* (ICC and gcc 4.4 seems to perform well in both cases, the issue is visible with y = a*x + b*y)
|
* (ICC and gcc 4.4 seems to perform well in both cases, the issue is visible with y = a*x + b*y)
|
||||||
*/
|
*/
|
||||||
@@ -478,33 +478,6 @@ template<typename Scalar1,typename Scalar2>
|
|||||||
struct functor_traits<scalar_multiple2_op<Scalar1,Scalar2> >
|
struct functor_traits<scalar_multiple2_op<Scalar1,Scalar2> >
|
||||||
{ enum { Cost = NumTraits<Scalar1>::MulCost, PacketAccess = false }; };
|
{ enum { Cost = NumTraits<Scalar1>::MulCost, PacketAccess = false }; };
|
||||||
|
|
||||||
template<typename Scalar, bool IsInteger>
|
|
||||||
struct scalar_quotient1_impl {
|
|
||||||
typedef typename packet_traits<Scalar>::type Packet;
|
|
||||||
// FIXME default copy constructors seems bugged with std::complex<>
|
|
||||||
EIGEN_STRONG_INLINE scalar_quotient1_impl(const scalar_quotient1_impl& other) : m_other(other.m_other) { }
|
|
||||||
EIGEN_STRONG_INLINE scalar_quotient1_impl(const Scalar& other) : m_other(static_cast<Scalar>(1) / other) {}
|
|
||||||
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a * m_other; }
|
|
||||||
EIGEN_STRONG_INLINE const Packet packetOp(const Packet& a) const
|
|
||||||
{ return internal::pmul(a, pset1<Packet>(m_other)); }
|
|
||||||
const Scalar m_other;
|
|
||||||
};
|
|
||||||
template<typename Scalar>
|
|
||||||
struct functor_traits<scalar_quotient1_impl<Scalar,false> >
|
|
||||||
{ enum { Cost = NumTraits<Scalar>::MulCost, PacketAccess = packet_traits<Scalar>::HasMul }; };
|
|
||||||
|
|
||||||
template<typename Scalar>
|
|
||||||
struct scalar_quotient1_impl<Scalar,true> {
|
|
||||||
// FIXME default copy constructors seems bugged with std::complex<>
|
|
||||||
EIGEN_STRONG_INLINE scalar_quotient1_impl(const scalar_quotient1_impl& other) : m_other(other.m_other) { }
|
|
||||||
EIGEN_STRONG_INLINE scalar_quotient1_impl(const Scalar& other) : m_other(other) {}
|
|
||||||
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; }
|
|
||||||
typename add_const_on_value_type<typename NumTraits<Scalar>::Nested>::type m_other;
|
|
||||||
};
|
|
||||||
template<typename Scalar>
|
|
||||||
struct functor_traits<scalar_quotient1_impl<Scalar,true> >
|
|
||||||
{ enum { Cost = 2 * NumTraits<Scalar>::MulCost, PacketAccess = false }; };
|
|
||||||
|
|
||||||
/** \internal
|
/** \internal
|
||||||
* \brief Template functor to divide a scalar by a fixed other one
|
* \brief Template functor to divide a scalar by a fixed other one
|
||||||
*
|
*
|
||||||
@@ -514,14 +487,19 @@ struct functor_traits<scalar_quotient1_impl<Scalar,true> >
|
|||||||
* \sa class CwiseUnaryOp, MatrixBase::operator/
|
* \sa class CwiseUnaryOp, MatrixBase::operator/
|
||||||
*/
|
*/
|
||||||
template<typename Scalar>
|
template<typename Scalar>
|
||||||
struct scalar_quotient1_op : scalar_quotient1_impl<Scalar, NumTraits<Scalar>::IsInteger > {
|
struct scalar_quotient1_op {
|
||||||
EIGEN_STRONG_INLINE scalar_quotient1_op(const Scalar& other)
|
typedef typename packet_traits<Scalar>::type Packet;
|
||||||
: scalar_quotient1_impl<Scalar, NumTraits<Scalar>::IsInteger >(other) {}
|
// FIXME default copy constructors seems bugged with std::complex<>
|
||||||
|
EIGEN_STRONG_INLINE scalar_quotient1_op(const scalar_quotient1_op& other) : m_other(other.m_other) { }
|
||||||
|
EIGEN_STRONG_INLINE scalar_quotient1_op(const Scalar& other) : m_other(other) {}
|
||||||
|
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; }
|
||||||
|
EIGEN_STRONG_INLINE const Packet packetOp(const Packet& a) const
|
||||||
|
{ return internal::pdiv(a, pset1<Packet>(m_other)); }
|
||||||
|
typename add_const_on_value_type<typename NumTraits<Scalar>::Nested>::type m_other;
|
||||||
};
|
};
|
||||||
template<typename Scalar>
|
template<typename Scalar>
|
||||||
struct functor_traits<scalar_quotient1_op<Scalar> >
|
struct functor_traits<scalar_quotient1_op<Scalar> >
|
||||||
: functor_traits<scalar_quotient1_impl<Scalar, NumTraits<Scalar>::IsInteger> >
|
{ enum { Cost = 2 * NumTraits<Scalar>::MulCost, PacketAccess = packet_traits<Scalar>::HasDiv }; };
|
||||||
{};
|
|
||||||
|
|
||||||
// nullary functors
|
// nullary functors
|
||||||
|
|
||||||
@@ -555,8 +533,11 @@ template <typename Scalar, bool RandomAccess> struct linspaced_op_impl;
|
|||||||
// linear access for packet ops:
|
// linear access for packet ops:
|
||||||
// 1) initialization
|
// 1) initialization
|
||||||
// base = [low, ..., low] + ([step, ..., step] * [-size, ..., 0])
|
// base = [low, ..., low] + ([step, ..., step] * [-size, ..., 0])
|
||||||
// 2) each step
|
// 2) each step (where size is 1 for coeff access or PacketSize for packet access)
|
||||||
// base += [size*step, ..., size*step]
|
// base += [size*step, ..., size*step]
|
||||||
|
//
|
||||||
|
// TODO: Perhaps it's better to initialize lazily (so not in the constructor but in packetOp)
|
||||||
|
// in order to avoid the padd() in operator() ?
|
||||||
template <typename Scalar>
|
template <typename Scalar>
|
||||||
struct linspaced_op_impl<Scalar,false>
|
struct linspaced_op_impl<Scalar,false>
|
||||||
{
|
{
|
||||||
@@ -565,10 +546,15 @@ struct linspaced_op_impl<Scalar,false>
|
|||||||
linspaced_op_impl(Scalar low, Scalar step) :
|
linspaced_op_impl(Scalar low, Scalar step) :
|
||||||
m_low(low), m_step(step),
|
m_low(low), m_step(step),
|
||||||
m_packetStep(pset1<Packet>(packet_traits<Scalar>::size*step)),
|
m_packetStep(pset1<Packet>(packet_traits<Scalar>::size*step)),
|
||||||
m_base(padd(pset1<Packet>(low),pmul(pset1<Packet>(step),plset<Scalar>(-packet_traits<Scalar>::size)))) {}
|
m_base(padd(pset1<Packet>(low), pmul(pset1<Packet>(step),plset<Scalar>(-packet_traits<Scalar>::size)))) {}
|
||||||
|
|
||||||
template<typename Index>
|
template<typename Index>
|
||||||
EIGEN_STRONG_INLINE const Scalar operator() (Index i) const { return m_low+i*m_step; }
|
EIGEN_STRONG_INLINE const Scalar operator() (Index i) const
|
||||||
|
{
|
||||||
|
m_base = padd(m_base, pset1<Packet>(m_step));
|
||||||
|
return m_low+i*m_step;
|
||||||
|
}
|
||||||
|
|
||||||
template<typename Index>
|
template<typename Index>
|
||||||
EIGEN_STRONG_INLINE const Packet packetOp(Index) const { return m_base = padd(m_base,m_packetStep); }
|
EIGEN_STRONG_INLINE const Packet packetOp(Index) const { return m_base = padd(m_base,m_packetStep); }
|
||||||
|
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ template<typename Derived> class MatrixBase
|
|||||||
|
|
||||||
// huuuge hack. make Eigen2's matrix.part<Diagonal>() work in eigen3. Problem: Diagonal is now a class template instead
|
// huuuge hack. make Eigen2's matrix.part<Diagonal>() work in eigen3. Problem: Diagonal is now a class template instead
|
||||||
// of an integer constant. Solution: overload the part() method template wrt template parameters list.
|
// of an integer constant. Solution: overload the part() method template wrt template parameters list.
|
||||||
template<template<typename T, int n> class U>
|
template<template<typename T, int N> class U>
|
||||||
const DiagonalWrapper<ConstDiagonalReturnType> part() const
|
const DiagonalWrapper<ConstDiagonalReturnType> part() const
|
||||||
{ return diagonal().asDiagonal(); }
|
{ return diagonal().asDiagonal(); }
|
||||||
#endif // EIGEN2_SUPPORT
|
#endif // EIGEN2_SUPPORT
|
||||||
|
|||||||
@@ -105,13 +105,13 @@ class PermutationBase : public EigenBase<Derived>
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** \returns the number of rows */
|
/** \returns the number of rows */
|
||||||
inline Index rows() const { return indices().size(); }
|
inline Index rows() const { return Index(indices().size()); }
|
||||||
|
|
||||||
/** \returns the number of columns */
|
/** \returns the number of columns */
|
||||||
inline Index cols() const { return indices().size(); }
|
inline Index cols() const { return Index(indices().size()); }
|
||||||
|
|
||||||
/** \returns the size of a side of the respective square matrix, i.e., the number of indices */
|
/** \returns the size of a side of the respective square matrix, i.e., the number of indices */
|
||||||
inline Index size() const { return indices().size(); }
|
inline Index size() const { return Index(indices().size()); }
|
||||||
|
|
||||||
#ifndef EIGEN_PARSED_BY_DOXYGEN
|
#ifndef EIGEN_PARSED_BY_DOXYGEN
|
||||||
template<typename DenseDerived>
|
template<typename DenseDerived>
|
||||||
|
|||||||
@@ -551,6 +551,7 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
|
|||||||
eigen_assert((this->size()==0 || (IsVectorAtCompileTime ? (this->size() == other.size())
|
eigen_assert((this->size()==0 || (IsVectorAtCompileTime ? (this->size() == other.size())
|
||||||
: (rows() == other.rows() && cols() == other.cols())))
|
: (rows() == other.rows() && cols() == other.cols())))
|
||||||
&& "Size mismatch. Automatic resizing is disabled because EIGEN_NO_AUTOMATIC_RESIZING is defined");
|
&& "Size mismatch. Automatic resizing is disabled because EIGEN_NO_AUTOMATIC_RESIZING is defined");
|
||||||
|
EIGEN_ONLY_USED_FOR_DEBUG(other);
|
||||||
#else
|
#else
|
||||||
resizeLike(other);
|
resizeLike(other);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
namespace Eigen {
|
namespace Eigen {
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
template<typename ExpressionType, typename Scalar>
|
template<typename ExpressionType, typename Scalar>
|
||||||
inline void stable_norm_kernel(const ExpressionType& bl, Scalar& ssq, Scalar& scale, Scalar& invScale)
|
inline void stable_norm_kernel(const ExpressionType& bl, Scalar& ssq, Scalar& scale, Scalar& invScale)
|
||||||
{
|
{
|
||||||
@@ -76,21 +77,20 @@ MatrixBase<Derived>::blueNorm() const
|
|||||||
using std::pow;
|
using std::pow;
|
||||||
using std::min;
|
using std::min;
|
||||||
using std::max;
|
using std::max;
|
||||||
static Index nmax = -1;
|
static bool initialized = false;
|
||||||
static RealScalar b1, b2, s1m, s2m, overfl, rbig, relerr;
|
static RealScalar b1, b2, s1m, s2m, overfl, rbig, relerr;
|
||||||
if(nmax <= 0)
|
if(!initialized)
|
||||||
{
|
{
|
||||||
int nbig, ibeta, it, iemin, iemax, iexp;
|
int ibeta, it, iemin, iemax, iexp;
|
||||||
RealScalar abig, eps;
|
RealScalar abig, eps;
|
||||||
// This program calculates the machine-dependent constants
|
// This program calculates the machine-dependent constants
|
||||||
// bl, b2, slm, s2m, relerr overfl, nmax
|
// bl, b2, slm, s2m, relerr overfl
|
||||||
// from the "basic" machine-dependent numbers
|
// from the "basic" machine-dependent numbers
|
||||||
// nbig, ibeta, it, iemin, iemax, rbig.
|
// ibeta, it, iemin, iemax, rbig.
|
||||||
// The following define the basic machine-dependent constants.
|
// The following define the basic machine-dependent constants.
|
||||||
// For portability, the PORT subprograms "ilmaeh" and "rlmach"
|
// For portability, the PORT subprograms "ilmaeh" and "rlmach"
|
||||||
// are used. For any specific computer, each of the assignment
|
// are used. For any specific computer, each of the assignment
|
||||||
// statements can be replaced
|
// statements can be replaced
|
||||||
nbig = (std::numeric_limits<Index>::max)(); // largest integer
|
|
||||||
ibeta = std::numeric_limits<RealScalar>::radix; // base for floating-point numbers
|
ibeta = std::numeric_limits<RealScalar>::radix; // base for floating-point numbers
|
||||||
it = std::numeric_limits<RealScalar>::digits; // number of base-beta digits in mantissa
|
it = std::numeric_limits<RealScalar>::digits; // number of base-beta digits in mantissa
|
||||||
iemin = std::numeric_limits<RealScalar>::min_exponent; // minimum exponent
|
iemin = std::numeric_limits<RealScalar>::min_exponent; // minimum exponent
|
||||||
@@ -111,8 +111,7 @@ MatrixBase<Derived>::blueNorm() const
|
|||||||
eps = RealScalar(pow(double(ibeta), 1-it));
|
eps = RealScalar(pow(double(ibeta), 1-it));
|
||||||
relerr = internal::sqrt(eps); // tolerance for neglecting asml
|
relerr = internal::sqrt(eps); // tolerance for neglecting asml
|
||||||
abig = RealScalar(1.0/eps - 1.0);
|
abig = RealScalar(1.0/eps - 1.0);
|
||||||
if (RealScalar(nbig)>abig) nmax = int(abig); // largest safe n
|
initialized = true;
|
||||||
else nmax = nbig;
|
|
||||||
}
|
}
|
||||||
Index n = size();
|
Index n = size();
|
||||||
RealScalar ab2 = b2 / RealScalar(n);
|
RealScalar ab2 = b2 / RealScalar(n);
|
||||||
@@ -131,7 +130,6 @@ MatrixBase<Derived>::blueNorm() const
|
|||||||
abig = internal::sqrt(abig);
|
abig = internal::sqrt(abig);
|
||||||
if(abig > overfl)
|
if(abig > overfl)
|
||||||
{
|
{
|
||||||
eigen_assert(false && "overflow");
|
|
||||||
return rbig;
|
return rbig;
|
||||||
}
|
}
|
||||||
if(amed > RealScalar(0))
|
if(amed > RealScalar(0))
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ template<typename MatrixType> class TransposeImpl<MatrixType,Dense>
|
|||||||
|
|
||||||
typedef typename internal::TransposeImpl_base<MatrixType>::type Base;
|
typedef typename internal::TransposeImpl_base<MatrixType>::type Base;
|
||||||
EIGEN_DENSE_PUBLIC_INTERFACE(Transpose<MatrixType>)
|
EIGEN_DENSE_PUBLIC_INTERFACE(Transpose<MatrixType>)
|
||||||
|
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(TransposeImpl)
|
||||||
|
|
||||||
inline Index innerStride() const { return derived().nestedExpression().innerStride(); }
|
inline Index innerStride() const { return derived().nestedExpression().innerStride(); }
|
||||||
inline Index outerStride() const { return derived().nestedExpression().outerStride(); }
|
inline Index outerStride() const { return derived().nestedExpression().outerStride(); }
|
||||||
@@ -252,7 +253,7 @@ struct inplace_transpose_selector;
|
|||||||
template<typename MatrixType>
|
template<typename MatrixType>
|
||||||
struct inplace_transpose_selector<MatrixType,true> { // square matrix
|
struct inplace_transpose_selector<MatrixType,true> { // square matrix
|
||||||
static void run(MatrixType& m) {
|
static void run(MatrixType& m) {
|
||||||
m.template triangularView<StrictlyUpper>().swap(m.transpose());
|
m.matrix().template triangularView<StrictlyUpper>().swap(m.matrix().transpose());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -260,7 +261,7 @@ template<typename MatrixType>
|
|||||||
struct inplace_transpose_selector<MatrixType,false> { // non square matrix
|
struct inplace_transpose_selector<MatrixType,false> { // non square matrix
|
||||||
static void run(MatrixType& m) {
|
static void run(MatrixType& m) {
|
||||||
if (m.rows()==m.cols())
|
if (m.rows()==m.cols())
|
||||||
m.template triangularView<StrictlyUpper>().swap(m.transpose());
|
m.matrix().template triangularView<StrictlyUpper>().swap(m.matrix().transpose());
|
||||||
else
|
else
|
||||||
m = m.transpose().eval();
|
m = m.transpose().eval();
|
||||||
}
|
}
|
||||||
@@ -353,7 +354,7 @@ struct check_transpose_aliasing_run_time_selector
|
|||||||
{
|
{
|
||||||
static bool run(const Scalar* dest, const OtherDerived& src)
|
static bool run(const Scalar* dest, const OtherDerived& src)
|
||||||
{
|
{
|
||||||
return (bool(blas_traits<OtherDerived>::IsTransposed) != DestIsTransposed) && (dest!=0 && dest==(Scalar*)extract_data(src));
|
return (bool(blas_traits<OtherDerived>::IsTransposed) != DestIsTransposed) && (dest!=0 && dest==(const Scalar*)extract_data(src));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -362,8 +363,8 @@ struct check_transpose_aliasing_run_time_selector<Scalar,DestIsTransposed,CwiseB
|
|||||||
{
|
{
|
||||||
static bool run(const Scalar* dest, const CwiseBinaryOp<BinOp,DerivedA,DerivedB>& src)
|
static bool run(const Scalar* dest, const CwiseBinaryOp<BinOp,DerivedA,DerivedB>& src)
|
||||||
{
|
{
|
||||||
return ((blas_traits<DerivedA>::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(Scalar*)extract_data(src.lhs())))
|
return ((blas_traits<DerivedA>::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(const Scalar*)extract_data(src.lhs())))
|
||||||
|| ((blas_traits<DerivedB>::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(Scalar*)extract_data(src.rhs())));
|
|| ((blas_traits<DerivedB>::IsTransposed != DestIsTransposed) && (dest!=0 && dest==(const Scalar*)extract_data(src.rhs())));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -511,6 +511,7 @@ template<typename Derived1, typename Derived2, bool ClearOpposite>
|
|||||||
struct triangular_assignment_selector<Derived1, Derived2, StrictlyUpper, Dynamic, ClearOpposite>
|
struct triangular_assignment_selector<Derived1, Derived2, StrictlyUpper, Dynamic, ClearOpposite>
|
||||||
{
|
{
|
||||||
typedef typename Derived1::Index Index;
|
typedef typename Derived1::Index Index;
|
||||||
|
typedef typename Derived1::Scalar Scalar;
|
||||||
static inline void run(Derived1 &dst, const Derived2 &src)
|
static inline void run(Derived1 &dst, const Derived2 &src)
|
||||||
{
|
{
|
||||||
for(Index j = 0; j < dst.cols(); ++j)
|
for(Index j = 0; j < dst.cols(); ++j)
|
||||||
@@ -520,7 +521,7 @@ struct triangular_assignment_selector<Derived1, Derived2, StrictlyUpper, Dynamic
|
|||||||
dst.copyCoeff(i, j, src);
|
dst.copyCoeff(i, j, src);
|
||||||
if (ClearOpposite)
|
if (ClearOpposite)
|
||||||
for(Index i = maxi; i < dst.rows(); ++i)
|
for(Index i = maxi; i < dst.rows(); ++i)
|
||||||
dst.coeffRef(i, j) = 0;
|
dst.coeffRef(i, j) = Scalar(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ Packet4f plog<Packet4f>(const Packet4f& _x)
|
|||||||
|
|
||||||
/* the smallest non denormalized float number */
|
/* the smallest non denormalized float number */
|
||||||
_EIGEN_DECLARE_CONST_Packet4f_FROM_INT(min_norm_pos, 0x00800000);
|
_EIGEN_DECLARE_CONST_Packet4f_FROM_INT(min_norm_pos, 0x00800000);
|
||||||
|
_EIGEN_DECLARE_CONST_Packet4f_FROM_INT(minus_inf, 0xff800000);//-1.f/0.f);
|
||||||
|
|
||||||
/* natural logarithm computed for 4 simultaneous float
|
/* natural logarithm computed for 4 simultaneous float
|
||||||
return NaN for x <= 0
|
return NaN for x <= 0
|
||||||
*/
|
*/
|
||||||
@@ -51,7 +52,8 @@ Packet4f plog<Packet4f>(const Packet4f& _x)
|
|||||||
|
|
||||||
Packet4i emm0;
|
Packet4i emm0;
|
||||||
|
|
||||||
Packet4f invalid_mask = _mm_cmple_ps(x, _mm_setzero_ps());
|
Packet4f invalid_mask = _mm_cmplt_ps(x, _mm_setzero_ps());
|
||||||
|
Packet4f iszero_mask = _mm_cmpeq_ps(x, _mm_setzero_ps());
|
||||||
|
|
||||||
x = pmax(x, p4f_min_norm_pos); /* cut off denormalized stuff */
|
x = pmax(x, p4f_min_norm_pos); /* cut off denormalized stuff */
|
||||||
emm0 = _mm_srli_epi32(_mm_castps_si128(x), 23);
|
emm0 = _mm_srli_epi32(_mm_castps_si128(x), 23);
|
||||||
@@ -96,7 +98,9 @@ Packet4f plog<Packet4f>(const Packet4f& _x)
|
|||||||
y2 = pmul(e, p4f_cephes_log_q2);
|
y2 = pmul(e, p4f_cephes_log_q2);
|
||||||
x = padd(x, y);
|
x = padd(x, y);
|
||||||
x = padd(x, y2);
|
x = padd(x, y2);
|
||||||
return _mm_or_ps(x, invalid_mask); // negative arg will be NAN
|
// negative arg will be NAN, 0 will be -INF
|
||||||
|
return _mm_or_ps(_mm_andnot_ps(iszero_mask, _mm_or_ps(x, invalid_mask)),
|
||||||
|
_mm_and_ps(iszero_mask, p4f_minus_inf));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED
|
template<> EIGEN_DEFINE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS EIGEN_UNUSED
|
||||||
@@ -370,7 +374,7 @@ Packet4f psqrt<Packet4f>(const Packet4f& _x)
|
|||||||
Packet4f half = pmul(_x, pset1<Packet4f>(.5f));
|
Packet4f half = pmul(_x, pset1<Packet4f>(.5f));
|
||||||
|
|
||||||
/* select only the inverse sqrt of non-zero inputs */
|
/* select only the inverse sqrt of non-zero inputs */
|
||||||
Packet4f non_zero_mask = _mm_cmpgt_ps(_x, pset1<Packet4f>(std::numeric_limits<float>::epsilon()));
|
Packet4f non_zero_mask = _mm_cmpgt_ps(_x, pset1<Packet4f>((std::numeric_limits<float>::min)()));
|
||||||
Packet4f x = _mm_and_ps(non_zero_mask, _mm_rsqrt_ps(_x));
|
Packet4f x = _mm_and_ps(non_zero_mask, _mm_rsqrt_ps(_x));
|
||||||
|
|
||||||
x = pmul(x, psub(pset1<Packet4f>(1.5f), pmul(half, pmul(x,x))));
|
x = pmul(x, psub(pset1<Packet4f>(1.5f), pmul(half, pmul(x,x))));
|
||||||
|
|||||||
@@ -69,8 +69,8 @@ inline void manage_caching_sizes(Action action, std::ptrdiff_t* l1=0, std::ptrdi
|
|||||||
* - the number of scalars that fit into a packet (when vectorization is enabled).
|
* - the number of scalars that fit into a packet (when vectorization is enabled).
|
||||||
*
|
*
|
||||||
* \sa setCpuCacheSizes */
|
* \sa setCpuCacheSizes */
|
||||||
template<typename LhsScalar, typename RhsScalar, int KcFactor>
|
template<typename LhsScalar, typename RhsScalar, int KcFactor, typename SizeType>
|
||||||
void computeProductBlockingSizes(std::ptrdiff_t& k, std::ptrdiff_t& m, std::ptrdiff_t& n)
|
void computeProductBlockingSizes(SizeType& k, SizeType& m, SizeType& n)
|
||||||
{
|
{
|
||||||
EIGEN_UNUSED_VARIABLE(n);
|
EIGEN_UNUSED_VARIABLE(n);
|
||||||
// Explanations:
|
// Explanations:
|
||||||
@@ -91,13 +91,13 @@ void computeProductBlockingSizes(std::ptrdiff_t& k, std::ptrdiff_t& m, std::ptrd
|
|||||||
};
|
};
|
||||||
|
|
||||||
manage_caching_sizes(GetAction, &l1, &l2);
|
manage_caching_sizes(GetAction, &l1, &l2);
|
||||||
k = std::min<std::ptrdiff_t>(k, l1/kdiv);
|
k = std::min<SizeType>(k, l1/kdiv);
|
||||||
std::ptrdiff_t _m = k>0 ? l2/(4 * sizeof(LhsScalar) * k) : 0;
|
SizeType _m = k>0 ? l2/(4 * sizeof(LhsScalar) * k) : 0;
|
||||||
if(_m<m) m = _m & mr_mask;
|
if(_m<m) m = _m & mr_mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename LhsScalar, typename RhsScalar>
|
template<typename LhsScalar, typename RhsScalar, typename SizeType>
|
||||||
inline void computeProductBlockingSizes(std::ptrdiff_t& k, std::ptrdiff_t& m, std::ptrdiff_t& n)
|
inline void computeProductBlockingSizes(SizeType& k, SizeType& m, SizeType& n)
|
||||||
{
|
{
|
||||||
computeProductBlockingSizes<LhsScalar,RhsScalar,1>(k, m, n);
|
computeProductBlockingSizes<LhsScalar,RhsScalar,1>(k, m, n);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,14 +81,13 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
const Index peels = 2;
|
const Index peels = 2;
|
||||||
const Index LhsPacketAlignedMask = LhsPacketSize-1;
|
const Index LhsPacketAlignedMask = LhsPacketSize-1;
|
||||||
const Index ResPacketAlignedMask = ResPacketSize-1;
|
const Index ResPacketAlignedMask = ResPacketSize-1;
|
||||||
const Index PeelAlignedMask = ResPacketSize*peels-1;
|
|
||||||
const Index size = rows;
|
const Index size = rows;
|
||||||
|
|
||||||
// How many coeffs of the result do we have to skip to be aligned.
|
// How many coeffs of the result do we have to skip to be aligned.
|
||||||
// Here we assume data are at least aligned on the base scalar type.
|
// Here we assume data are at least aligned on the base scalar type.
|
||||||
Index alignedStart = internal::first_aligned(res,size);
|
Index alignedStart = internal::first_aligned(res,size);
|
||||||
Index alignedSize = ResPacketSize>1 ? alignedStart + ((size-alignedStart) & ~ResPacketAlignedMask) : 0;
|
Index alignedSize = ResPacketSize>1 ? alignedStart + ((size-alignedStart) & ~ResPacketAlignedMask) : 0;
|
||||||
const Index peeledSize = peels>1 ? alignedStart + ((alignedSize-alignedStart) & ~PeelAlignedMask) : alignedStart;
|
const Index peeledSize = alignedSize - RhsPacketSize*peels - RhsPacketSize + 1;
|
||||||
|
|
||||||
const Index alignmentStep = LhsPacketSize>1 ? (LhsPacketSize - lhsStride % LhsPacketSize) & LhsPacketAlignedMask : 0;
|
const Index alignmentStep = LhsPacketSize>1 ? (LhsPacketSize - lhsStride % LhsPacketSize) & LhsPacketAlignedMask : 0;
|
||||||
Index alignmentPattern = alignmentStep==0 ? AllAligned
|
Index alignmentPattern = alignmentStep==0 ? AllAligned
|
||||||
@@ -177,6 +176,8 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
_EIGEN_ACCUMULATE_PACKETS(d,du,d);
|
_EIGEN_ACCUMULATE_PACKETS(d,du,d);
|
||||||
break;
|
break;
|
||||||
case FirstAligned:
|
case FirstAligned:
|
||||||
|
{
|
||||||
|
Index j = alignedStart;
|
||||||
if(peels>1)
|
if(peels>1)
|
||||||
{
|
{
|
||||||
LhsPacket A00, A01, A02, A03, A10, A11, A12, A13;
|
LhsPacket A00, A01, A02, A03, A10, A11, A12, A13;
|
||||||
@@ -186,7 +187,7 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
A02 = pload<LhsPacket>(&lhs2[alignedStart-2]);
|
A02 = pload<LhsPacket>(&lhs2[alignedStart-2]);
|
||||||
A03 = pload<LhsPacket>(&lhs3[alignedStart-3]);
|
A03 = pload<LhsPacket>(&lhs3[alignedStart-3]);
|
||||||
|
|
||||||
for (Index j = alignedStart; j<peeledSize; j+=peels*ResPacketSize)
|
for (; j<peeledSize; j+=peels*ResPacketSize)
|
||||||
{
|
{
|
||||||
A11 = pload<LhsPacket>(&lhs1[j-1+LhsPacketSize]); palign<1>(A01,A11);
|
A11 = pload<LhsPacket>(&lhs1[j-1+LhsPacketSize]); palign<1>(A01,A11);
|
||||||
A12 = pload<LhsPacket>(&lhs2[j-2+LhsPacketSize]); palign<2>(A02,A12);
|
A12 = pload<LhsPacket>(&lhs2[j-2+LhsPacketSize]); palign<2>(A02,A12);
|
||||||
@@ -210,9 +211,10 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
pstore(&res[j+ResPacketSize],T1);
|
pstore(&res[j+ResPacketSize],T1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Index j = peeledSize; j<alignedSize; j+=ResPacketSize)
|
for (; j<alignedSize; j+=ResPacketSize)
|
||||||
_EIGEN_ACCUMULATE_PACKETS(d,du,du);
|
_EIGEN_ACCUMULATE_PACKETS(d,du,du);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
for (Index j = alignedStart; j<alignedSize; j+=ResPacketSize)
|
for (Index j = alignedStart; j<alignedSize; j+=ResPacketSize)
|
||||||
_EIGEN_ACCUMULATE_PACKETS(du,du,du);
|
_EIGEN_ACCUMULATE_PACKETS(du,du,du);
|
||||||
@@ -332,7 +334,6 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
const Index peels = 2;
|
const Index peels = 2;
|
||||||
const Index RhsPacketAlignedMask = RhsPacketSize-1;
|
const Index RhsPacketAlignedMask = RhsPacketSize-1;
|
||||||
const Index LhsPacketAlignedMask = LhsPacketSize-1;
|
const Index LhsPacketAlignedMask = LhsPacketSize-1;
|
||||||
const Index PeelAlignedMask = RhsPacketSize*peels-1;
|
|
||||||
const Index depth = cols;
|
const Index depth = cols;
|
||||||
|
|
||||||
// How many coeffs of the result do we have to skip to be aligned.
|
// How many coeffs of the result do we have to skip to be aligned.
|
||||||
@@ -340,7 +341,7 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
// if that's not the case then vectorization is discarded, see below.
|
// if that's not the case then vectorization is discarded, see below.
|
||||||
Index alignedStart = internal::first_aligned(rhs, depth);
|
Index alignedStart = internal::first_aligned(rhs, depth);
|
||||||
Index alignedSize = RhsPacketSize>1 ? alignedStart + ((depth-alignedStart) & ~RhsPacketAlignedMask) : 0;
|
Index alignedSize = RhsPacketSize>1 ? alignedStart + ((depth-alignedStart) & ~RhsPacketAlignedMask) : 0;
|
||||||
const Index peeledSize = peels>1 ? alignedStart + ((alignedSize-alignedStart) & ~PeelAlignedMask) : alignedStart;
|
const Index peeledSize = alignedSize - RhsPacketSize*peels - RhsPacketSize + 1;
|
||||||
|
|
||||||
const Index alignmentStep = LhsPacketSize>1 ? (LhsPacketSize - lhsStride % LhsPacketSize) & LhsPacketAlignedMask : 0;
|
const Index alignmentStep = LhsPacketSize>1 ? (LhsPacketSize - lhsStride % LhsPacketSize) & LhsPacketAlignedMask : 0;
|
||||||
Index alignmentPattern = alignmentStep==0 ? AllAligned
|
Index alignmentPattern = alignmentStep==0 ? AllAligned
|
||||||
@@ -430,10 +431,12 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
_EIGEN_ACCUMULATE_PACKETS(d,du,d);
|
_EIGEN_ACCUMULATE_PACKETS(d,du,d);
|
||||||
break;
|
break;
|
||||||
case FirstAligned:
|
case FirstAligned:
|
||||||
|
{
|
||||||
|
Index j = alignedStart;
|
||||||
if (peels>1)
|
if (peels>1)
|
||||||
{
|
{
|
||||||
/* Here we proccess 4 rows with with two peeled iterations to hide
|
/* Here we proccess 4 rows with with two peeled iterations to hide
|
||||||
* tghe overhead of unaligned loads. Moreover unaligned loads are handled
|
* the overhead of unaligned loads. Moreover unaligned loads are handled
|
||||||
* using special shift/move operations between the two aligned packets
|
* using special shift/move operations between the two aligned packets
|
||||||
* overlaping the desired unaligned packet. This is *much* more efficient
|
* overlaping the desired unaligned packet. This is *much* more efficient
|
||||||
* than basic unaligned loads.
|
* than basic unaligned loads.
|
||||||
@@ -443,7 +446,7 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
A02 = pload<LhsPacket>(&lhs2[alignedStart-2]);
|
A02 = pload<LhsPacket>(&lhs2[alignedStart-2]);
|
||||||
A03 = pload<LhsPacket>(&lhs3[alignedStart-3]);
|
A03 = pload<LhsPacket>(&lhs3[alignedStart-3]);
|
||||||
|
|
||||||
for (Index j = alignedStart; j<peeledSize; j+=peels*RhsPacketSize)
|
for (; j<peeledSize; j+=peels*RhsPacketSize)
|
||||||
{
|
{
|
||||||
RhsPacket b = pload<RhsPacket>(&rhs[j]);
|
RhsPacket b = pload<RhsPacket>(&rhs[j]);
|
||||||
A11 = pload<LhsPacket>(&lhs1[j-1+LhsPacketSize]); palign<1>(A01,A11);
|
A11 = pload<LhsPacket>(&lhs1[j-1+LhsPacketSize]); palign<1>(A01,A11);
|
||||||
@@ -465,9 +468,10 @@ EIGEN_DONT_INLINE static void run(
|
|||||||
ptmp3 = pcj.pmadd(A13, b, ptmp3);
|
ptmp3 = pcj.pmadd(A13, b, ptmp3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Index j = peeledSize; j<alignedSize; j+=RhsPacketSize)
|
for (; j<alignedSize; j+=RhsPacketSize)
|
||||||
_EIGEN_ACCUMULATE_PACKETS(d,du,du);
|
_EIGEN_ACCUMULATE_PACKETS(d,du,du);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
for (Index j = alignedStart; j<alignedSize; j+=RhsPacketSize)
|
for (Index j = alignedStart; j<alignedSize; j+=RhsPacketSize)
|
||||||
_EIGEN_ACCUMULATE_PACKETS(du,du,du);
|
_EIGEN_ACCUMULATE_PACKETS(du,du,du);
|
||||||
|
|||||||
@@ -57,11 +57,11 @@ template <typename Index, int Mode, \
|
|||||||
struct product_triangular_matrix_matrix<Scalar,Index, Mode, LhsIsTriangular, \
|
struct product_triangular_matrix_matrix<Scalar,Index, Mode, LhsIsTriangular, \
|
||||||
LhsStorageOrder,ConjugateLhs, RhsStorageOrder,ConjugateRhs,ColMajor,Specialized> { \
|
LhsStorageOrder,ConjugateLhs, RhsStorageOrder,ConjugateRhs,ColMajor,Specialized> { \
|
||||||
static inline void run(Index _rows, Index _cols, Index _depth, const Scalar* _lhs, Index lhsStride,\
|
static inline void run(Index _rows, Index _cols, Index _depth, const Scalar* _lhs, Index lhsStride,\
|
||||||
const Scalar* _rhs, Index rhsStride, Scalar* res, Index resStride, Scalar alpha) { \
|
const Scalar* _rhs, Index rhsStride, Scalar* res, Index resStride, Scalar alpha, level3_blocking<Scalar,Scalar>& blocking) { \
|
||||||
product_triangular_matrix_matrix_trmm<Scalar,Index,Mode, \
|
product_triangular_matrix_matrix_trmm<Scalar,Index,Mode, \
|
||||||
LhsIsTriangular,LhsStorageOrder,ConjugateLhs, \
|
LhsIsTriangular,LhsStorageOrder,ConjugateLhs, \
|
||||||
RhsStorageOrder, ConjugateRhs, ColMajor>::run( \
|
RhsStorageOrder, ConjugateRhs, ColMajor>::run( \
|
||||||
_rows, _cols, _depth, _lhs, lhsStride, _rhs, rhsStride, res, resStride, alpha); \
|
_rows, _cols, _depth, _lhs, lhsStride, _rhs, rhsStride, res, resStride, alpha, blocking); \
|
||||||
} \
|
} \
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -96,7 +96,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,true, \
|
|||||||
const EIGTYPE* _lhs, Index lhsStride, \
|
const EIGTYPE* _lhs, Index lhsStride, \
|
||||||
const EIGTYPE* _rhs, Index rhsStride, \
|
const EIGTYPE* _rhs, Index rhsStride, \
|
||||||
EIGTYPE* res, Index resStride, \
|
EIGTYPE* res, Index resStride, \
|
||||||
EIGTYPE alpha) \
|
EIGTYPE alpha, level3_blocking<EIGTYPE,EIGTYPE>& blocking) \
|
||||||
{ \
|
{ \
|
||||||
Index diagSize = (std::min)(_rows,_depth); \
|
Index diagSize = (std::min)(_rows,_depth); \
|
||||||
Index rows = IsLower ? _rows : diagSize; \
|
Index rows = IsLower ? _rows : diagSize; \
|
||||||
@@ -115,16 +115,16 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,true, \
|
|||||||
/* Most likely no benefit to call TRMM or GEMM from MKL*/ \
|
/* Most likely no benefit to call TRMM or GEMM from MKL*/ \
|
||||||
product_triangular_matrix_matrix<EIGTYPE,Index,Mode,true, \
|
product_triangular_matrix_matrix<EIGTYPE,Index,Mode,true, \
|
||||||
LhsStorageOrder,ConjugateLhs, RhsStorageOrder, ConjugateRhs, ColMajor, BuiltIn>::run( \
|
LhsStorageOrder,ConjugateLhs, RhsStorageOrder, ConjugateRhs, ColMajor, BuiltIn>::run( \
|
||||||
_rows, _cols, _depth, _lhs, lhsStride, _rhs, rhsStride, res, resStride, alpha); \
|
_rows, _cols, _depth, _lhs, lhsStride, _rhs, rhsStride, res, resStride, alpha, blocking); \
|
||||||
/*std::cout << "TRMM_L: A is not square! Go to Eigen TRMM implementation!\n";*/ \
|
/*std::cout << "TRMM_L: A is not square! Go to Eigen TRMM implementation!\n";*/ \
|
||||||
} else { \
|
} else { \
|
||||||
/* Make sense to call GEMM */ \
|
/* Make sense to call GEMM */ \
|
||||||
Map<const MatrixLhs, 0, OuterStride<> > lhsMap(_lhs,rows,depth,OuterStride<>(lhsStride)); \
|
Map<const MatrixLhs, 0, OuterStride<> > lhsMap(_lhs,rows,depth,OuterStride<>(lhsStride)); \
|
||||||
MatrixLhs aa_tmp=lhsMap.template triangularView<Mode>(); \
|
MatrixLhs aa_tmp=lhsMap.template triangularView<Mode>(); \
|
||||||
MKL_INT aStride = aa_tmp.outerStride(); \
|
MKL_INT aStride = aa_tmp.outerStride(); \
|
||||||
gemm_blocking_space<ColMajor,EIGTYPE,EIGTYPE,Dynamic,Dynamic,Dynamic> blocking(_rows,_cols,_depth); \
|
gemm_blocking_space<ColMajor,EIGTYPE,EIGTYPE,Dynamic,Dynamic,Dynamic> gemm_blocking(_rows,_cols,_depth); \
|
||||||
general_matrix_matrix_product<Index,EIGTYPE,LhsStorageOrder,ConjugateLhs,EIGTYPE,RhsStorageOrder,ConjugateRhs,ColMajor>::run( \
|
general_matrix_matrix_product<Index,EIGTYPE,LhsStorageOrder,ConjugateLhs,EIGTYPE,RhsStorageOrder,ConjugateRhs,ColMajor>::run( \
|
||||||
rows, cols, depth, aa_tmp.data(), aStride, _rhs, rhsStride, res, resStride, alpha, blocking, 0); \
|
rows, cols, depth, aa_tmp.data(), aStride, _rhs, rhsStride, res, resStride, alpha, gemm_blocking, 0); \
|
||||||
\
|
\
|
||||||
/*std::cout << "TRMM_L: A is not square! Go to MKL GEMM implementation! " << nthr<<" \n";*/ \
|
/*std::cout << "TRMM_L: A is not square! Go to MKL GEMM implementation! " << nthr<<" \n";*/ \
|
||||||
} \
|
} \
|
||||||
@@ -210,7 +210,7 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,false, \
|
|||||||
const EIGTYPE* _lhs, Index lhsStride, \
|
const EIGTYPE* _lhs, Index lhsStride, \
|
||||||
const EIGTYPE* _rhs, Index rhsStride, \
|
const EIGTYPE* _rhs, Index rhsStride, \
|
||||||
EIGTYPE* res, Index resStride, \
|
EIGTYPE* res, Index resStride, \
|
||||||
EIGTYPE alpha) \
|
EIGTYPE alpha, level3_blocking<EIGTYPE,EIGTYPE>& blocking) \
|
||||||
{ \
|
{ \
|
||||||
Index diagSize = (std::min)(_cols,_depth); \
|
Index diagSize = (std::min)(_cols,_depth); \
|
||||||
Index rows = _rows; \
|
Index rows = _rows; \
|
||||||
@@ -229,16 +229,16 @@ struct product_triangular_matrix_matrix_trmm<EIGTYPE,Index,Mode,false, \
|
|||||||
/* Most likely no benefit to call TRMM or GEMM from MKL*/ \
|
/* Most likely no benefit to call TRMM or GEMM from MKL*/ \
|
||||||
product_triangular_matrix_matrix<EIGTYPE,Index,Mode,false, \
|
product_triangular_matrix_matrix<EIGTYPE,Index,Mode,false, \
|
||||||
LhsStorageOrder,ConjugateLhs, RhsStorageOrder, ConjugateRhs, ColMajor, BuiltIn>::run( \
|
LhsStorageOrder,ConjugateLhs, RhsStorageOrder, ConjugateRhs, ColMajor, BuiltIn>::run( \
|
||||||
_rows, _cols, _depth, _lhs, lhsStride, _rhs, rhsStride, res, resStride, alpha); \
|
_rows, _cols, _depth, _lhs, lhsStride, _rhs, rhsStride, res, resStride, alpha, blocking); \
|
||||||
/*std::cout << "TRMM_R: A is not square! Go to Eigen TRMM implementation!\n";*/ \
|
/*std::cout << "TRMM_R: A is not square! Go to Eigen TRMM implementation!\n";*/ \
|
||||||
} else { \
|
} else { \
|
||||||
/* Make sense to call GEMM */ \
|
/* Make sense to call GEMM */ \
|
||||||
Map<const MatrixRhs, 0, OuterStride<> > rhsMap(_rhs,depth,cols, OuterStride<>(rhsStride)); \
|
Map<const MatrixRhs, 0, OuterStride<> > rhsMap(_rhs,depth,cols, OuterStride<>(rhsStride)); \
|
||||||
MatrixRhs aa_tmp=rhsMap.template triangularView<Mode>(); \
|
MatrixRhs aa_tmp=rhsMap.template triangularView<Mode>(); \
|
||||||
MKL_INT aStride = aa_tmp.outerStride(); \
|
MKL_INT aStride = aa_tmp.outerStride(); \
|
||||||
gemm_blocking_space<ColMajor,EIGTYPE,EIGTYPE,Dynamic,Dynamic,Dynamic> blocking(_rows,_cols,_depth); \
|
gemm_blocking_space<ColMajor,EIGTYPE,EIGTYPE,Dynamic,Dynamic,Dynamic> gemm_blocking(_rows,_cols,_depth); \
|
||||||
general_matrix_matrix_product<Index,EIGTYPE,LhsStorageOrder,ConjugateLhs,EIGTYPE,RhsStorageOrder,ConjugateRhs,ColMajor>::run( \
|
general_matrix_matrix_product<Index,EIGTYPE,LhsStorageOrder,ConjugateLhs,EIGTYPE,RhsStorageOrder,ConjugateRhs,ColMajor>::run( \
|
||||||
rows, cols, depth, _lhs, lhsStride, aa_tmp.data(), aStride, res, resStride, alpha, blocking, 0); \
|
rows, cols, depth, _lhs, lhsStride, aa_tmp.data(), aStride, res, resStride, alpha, gemm_blocking, 0); \
|
||||||
\
|
\
|
||||||
/*std::cout << "TRMM_R: A is not square! Go to MKL GEMM implementation! " << nthr<<" \n";*/ \
|
/*std::cout << "TRMM_R: A is not square! Go to MKL GEMM implementation! " << nthr<<" \n";*/ \
|
||||||
} \
|
} \
|
||||||
|
|||||||
@@ -82,11 +82,11 @@ struct triangular_matrix_vector_product_trmv<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE,
|
|||||||
LowUp = IsLower ? Lower : Upper \
|
LowUp = IsLower ? Lower : Upper \
|
||||||
}; \
|
}; \
|
||||||
static EIGEN_DONT_INLINE void run(Index _rows, Index _cols, const EIGTYPE* _lhs, Index lhsStride, \
|
static EIGEN_DONT_INLINE void run(Index _rows, Index _cols, const EIGTYPE* _lhs, Index lhsStride, \
|
||||||
const EIGTYPE* _rhs, Index rhsIncr, EIGTYPE* _res, Index resIncr, EIGTYPE alpha, level3_blocking<EIGTYPE,EIGTYPE>& blocking) \
|
const EIGTYPE* _rhs, Index rhsIncr, EIGTYPE* _res, Index resIncr, EIGTYPE alpha) \
|
||||||
{ \
|
{ \
|
||||||
if (ConjLhs || IsZeroDiag) { \
|
if (ConjLhs || IsZeroDiag) { \
|
||||||
triangular_matrix_vector_product<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE,ConjRhs,ColMajor,BuiltIn>::run( \
|
triangular_matrix_vector_product<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE,ConjRhs,ColMajor,BuiltIn>::run( \
|
||||||
_rows, _cols, _lhs, lhsStride, _rhs, rhsIncr, _res, resIncr, alpha, blocking); \
|
_rows, _cols, _lhs, lhsStride, _rhs, rhsIncr, _res, resIncr, alpha); \
|
||||||
return; \
|
return; \
|
||||||
}\
|
}\
|
||||||
Index size = (std::min)(_rows,_cols); \
|
Index size = (std::min)(_rows,_cols); \
|
||||||
@@ -167,11 +167,11 @@ struct triangular_matrix_vector_product_trmv<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE,
|
|||||||
LowUp = IsLower ? Lower : Upper \
|
LowUp = IsLower ? Lower : Upper \
|
||||||
}; \
|
}; \
|
||||||
static EIGEN_DONT_INLINE void run(Index _rows, Index _cols, const EIGTYPE* _lhs, Index lhsStride, \
|
static EIGEN_DONT_INLINE void run(Index _rows, Index _cols, const EIGTYPE* _lhs, Index lhsStride, \
|
||||||
const EIGTYPE* _rhs, Index rhsIncr, EIGTYPE* _res, Index resIncr, EIGTYPE alpha, level3_blocking<EIGTYPE,EIGTYPE>& blocking) \
|
const EIGTYPE* _rhs, Index rhsIncr, EIGTYPE* _res, Index resIncr, EIGTYPE alpha) \
|
||||||
{ \
|
{ \
|
||||||
if (IsZeroDiag) { \
|
if (IsZeroDiag) { \
|
||||||
triangular_matrix_vector_product<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE,ConjRhs,RowMajor,BuiltIn>::run( \
|
triangular_matrix_vector_product<Index,Mode,EIGTYPE,ConjLhs,EIGTYPE,ConjRhs,RowMajor,BuiltIn>::run( \
|
||||||
_rows, _cols, _lhs, lhsStride, _rhs, rhsIncr, _res, resIncr, alpha, blocking); \
|
_rows, _cols, _lhs, lhsStride, _rhs, rhsIncr, _res, resIncr, alpha); \
|
||||||
return; \
|
return; \
|
||||||
}\
|
}\
|
||||||
Index size = (std::min)(_rows,_cols); \
|
Index size = (std::min)(_rows,_cols); \
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
#define EIGEN_WORLD_VERSION 3
|
#define EIGEN_WORLD_VERSION 3
|
||||||
#define EIGEN_MAJOR_VERSION 1
|
#define EIGEN_MAJOR_VERSION 1
|
||||||
#define EIGEN_MINOR_VERSION 1
|
#define EIGEN_MINOR_VERSION 4
|
||||||
|
|
||||||
#define EIGEN_VERSION_AT_LEAST(x,y,z) (EIGEN_WORLD_VERSION>x || (EIGEN_WORLD_VERSION>=x && \
|
#define EIGEN_VERSION_AT_LEAST(x,y,z) (EIGEN_WORLD_VERSION>x || (EIGEN_WORLD_VERSION>=x && \
|
||||||
(EIGEN_MAJOR_VERSION>y || (EIGEN_MAJOR_VERSION>=y && \
|
(EIGEN_MAJOR_VERSION>y || (EIGEN_MAJOR_VERSION>=y && \
|
||||||
|
|||||||
@@ -88,11 +88,11 @@ inline void throw_std_bad_alloc()
|
|||||||
/** \internal Like malloc, but the returned pointer is guaranteed to be 16-byte aligned.
|
/** \internal Like malloc, but the returned pointer is guaranteed to be 16-byte aligned.
|
||||||
* Fast, but wastes 16 additional bytes of memory. Does not throw any exception.
|
* Fast, but wastes 16 additional bytes of memory. Does not throw any exception.
|
||||||
*/
|
*/
|
||||||
inline void* handmade_aligned_malloc(size_t size)
|
inline void* handmade_aligned_malloc(std::size_t size)
|
||||||
{
|
{
|
||||||
void *original = std::malloc(size+16);
|
void *original = std::malloc(size+16);
|
||||||
if (original == 0) return 0;
|
if (original == 0) return 0;
|
||||||
void *aligned = reinterpret_cast<void*>((reinterpret_cast<size_t>(original) & ~(size_t(15))) + 16);
|
void *aligned = reinterpret_cast<void*>((reinterpret_cast<std::size_t>(original) & ~(std::size_t(15))) + 16);
|
||||||
*(reinterpret_cast<void**>(aligned) - 1) = original;
|
*(reinterpret_cast<void**>(aligned) - 1) = original;
|
||||||
return aligned;
|
return aligned;
|
||||||
}
|
}
|
||||||
@@ -108,13 +108,18 @@ inline void handmade_aligned_free(void *ptr)
|
|||||||
* Since we know that our handmade version is based on std::realloc
|
* Since we know that our handmade version is based on std::realloc
|
||||||
* we can use std::realloc to implement efficient reallocation.
|
* we can use std::realloc to implement efficient reallocation.
|
||||||
*/
|
*/
|
||||||
inline void* handmade_aligned_realloc(void* ptr, size_t size, size_t = 0)
|
inline void* handmade_aligned_realloc(void* ptr, std::size_t size, std::size_t = 0)
|
||||||
{
|
{
|
||||||
if (ptr == 0) return handmade_aligned_malloc(size);
|
if (ptr == 0) return handmade_aligned_malloc(size);
|
||||||
void *original = *(reinterpret_cast<void**>(ptr) - 1);
|
void *original = *(reinterpret_cast<void**>(ptr) - 1);
|
||||||
|
std::ptrdiff_t previous_offset = static_cast<char *>(ptr)-static_cast<char *>(original);
|
||||||
original = std::realloc(original,size+16);
|
original = std::realloc(original,size+16);
|
||||||
if (original == 0) return 0;
|
if (original == 0) return 0;
|
||||||
void *aligned = reinterpret_cast<void*>((reinterpret_cast<size_t>(original) & ~(size_t(15))) + 16);
|
void *aligned = reinterpret_cast<void*>((reinterpret_cast<std::size_t>(original) & ~(std::size_t(15))) + 16);
|
||||||
|
void *previous_aligned = static_cast<char *>(original)+previous_offset;
|
||||||
|
if(aligned!=previous_aligned)
|
||||||
|
std::memmove(aligned, previous_aligned, size);
|
||||||
|
|
||||||
*(reinterpret_cast<void**>(aligned) - 1) = original;
|
*(reinterpret_cast<void**>(aligned) - 1) = original;
|
||||||
return aligned;
|
return aligned;
|
||||||
}
|
}
|
||||||
@@ -123,7 +128,7 @@ inline void* handmade_aligned_realloc(void* ptr, size_t size, size_t = 0)
|
|||||||
*** Implementation of generic aligned realloc (when no realloc can be used)***
|
*** Implementation of generic aligned realloc (when no realloc can be used)***
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
void* aligned_malloc(size_t size);
|
void* aligned_malloc(std::size_t size);
|
||||||
void aligned_free(void *ptr);
|
void aligned_free(void *ptr);
|
||||||
|
|
||||||
/** \internal
|
/** \internal
|
||||||
@@ -204,7 +209,7 @@ inline void* aligned_malloc(size_t size)
|
|||||||
if(posix_memalign(&result, 16, size)) result = 0;
|
if(posix_memalign(&result, 16, size)) result = 0;
|
||||||
#elif EIGEN_HAS_MM_MALLOC
|
#elif EIGEN_HAS_MM_MALLOC
|
||||||
result = _mm_malloc(size, 16);
|
result = _mm_malloc(size, 16);
|
||||||
#elif (defined _MSC_VER)
|
#elif defined(_MSC_VER) && (!defined(_WIN32_WCE))
|
||||||
result = _aligned_malloc(size, 16);
|
result = _aligned_malloc(size, 16);
|
||||||
#else
|
#else
|
||||||
result = handmade_aligned_malloc(size);
|
result = handmade_aligned_malloc(size);
|
||||||
@@ -227,7 +232,7 @@ inline void aligned_free(void *ptr)
|
|||||||
std::free(ptr);
|
std::free(ptr);
|
||||||
#elif EIGEN_HAS_MM_MALLOC
|
#elif EIGEN_HAS_MM_MALLOC
|
||||||
_mm_free(ptr);
|
_mm_free(ptr);
|
||||||
#elif defined(_MSC_VER)
|
#elif defined(_MSC_VER) && (!defined(_WIN32_WCE))
|
||||||
_aligned_free(ptr);
|
_aligned_free(ptr);
|
||||||
#else
|
#else
|
||||||
handmade_aligned_free(ptr);
|
handmade_aligned_free(ptr);
|
||||||
@@ -446,7 +451,6 @@ template<typename T, bool Align> inline void conditional_aligned_delete_auto(T *
|
|||||||
template<typename Scalar, typename Index>
|
template<typename Scalar, typename Index>
|
||||||
static inline Index first_aligned(const Scalar* array, Index size)
|
static inline Index first_aligned(const Scalar* array, Index size)
|
||||||
{
|
{
|
||||||
typedef typename packet_traits<Scalar>::type Packet;
|
|
||||||
enum { PacketSize = packet_traits<Scalar>::size,
|
enum { PacketSize = packet_traits<Scalar>::size,
|
||||||
PacketAlignedMask = PacketSize-1
|
PacketAlignedMask = PacketSize-1
|
||||||
};
|
};
|
||||||
@@ -705,15 +709,6 @@ public:
|
|||||||
::new( p ) T( value );
|
::new( p ) T( value );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Support for c++11
|
|
||||||
#if (__cplusplus >= 201103L)
|
|
||||||
template<typename... Args>
|
|
||||||
void construct(pointer p, Args&&... args)
|
|
||||||
{
|
|
||||||
::new(p) T(std::forward<Args>(args)...);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void destroy( pointer p )
|
void destroy( pointer p )
|
||||||
{
|
{
|
||||||
p->~T();
|
p->~T();
|
||||||
@@ -745,7 +740,7 @@ public:
|
|||||||
__asm__ __volatile__ ("cpuid": "=a" (abcd[0]), "=b" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func), "c" (id) );
|
__asm__ __volatile__ ("cpuid": "=a" (abcd[0]), "=b" (abcd[1]), "=c" (abcd[2]), "=d" (abcd[3]) : "a" (func), "c" (id) );
|
||||||
# endif
|
# endif
|
||||||
# elif defined(_MSC_VER)
|
# elif defined(_MSC_VER)
|
||||||
# if (_MSC_VER > 1500)
|
# if (_MSC_VER > 1500) && ( defined(_M_IX86) || defined(_M_X64) )
|
||||||
# define EIGEN_CPUID(abcd,func,id) __cpuidex((int*)abcd,func,id)
|
# define EIGEN_CPUID(abcd,func,id) __cpuidex((int*)abcd,func,id)
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
|||||||
@@ -301,9 +301,9 @@ template<typename T, int n=1, typename PlainObject = typename eval<T>::type> str
|
|||||||
// it's important that this value can still be squared without integer overflowing.
|
// it's important that this value can still be squared without integer overflowing.
|
||||||
DynamicAsInteger = 10000,
|
DynamicAsInteger = 10000,
|
||||||
ScalarReadCost = NumTraits<typename traits<T>::Scalar>::ReadCost,
|
ScalarReadCost = NumTraits<typename traits<T>::Scalar>::ReadCost,
|
||||||
ScalarReadCostAsInteger = ScalarReadCost == Dynamic ? DynamicAsInteger : ScalarReadCost,
|
ScalarReadCostAsInteger = ScalarReadCost == Dynamic ? int(DynamicAsInteger) : int(ScalarReadCost),
|
||||||
CoeffReadCost = traits<T>::CoeffReadCost,
|
CoeffReadCost = traits<T>::CoeffReadCost,
|
||||||
CoeffReadCostAsInteger = CoeffReadCost == Dynamic ? DynamicAsInteger : CoeffReadCost,
|
CoeffReadCostAsInteger = CoeffReadCost == Dynamic ? int(DynamicAsInteger) : int(CoeffReadCost),
|
||||||
NAsInteger = n == Dynamic ? int(DynamicAsInteger) : n,
|
NAsInteger = n == Dynamic ? int(DynamicAsInteger) : n,
|
||||||
CostEvalAsInteger = (NAsInteger+1) * ScalarReadCostAsInteger + CoeffReadCostAsInteger,
|
CostEvalAsInteger = (NAsInteger+1) * ScalarReadCostAsInteger + CoeffReadCostAsInteger,
|
||||||
CostNoEvalAsInteger = NAsInteger * CoeffReadCostAsInteger
|
CostNoEvalAsInteger = NAsInteger * CoeffReadCostAsInteger
|
||||||
|
|||||||
@@ -512,8 +512,7 @@ template<typename MatrixType>
|
|||||||
template<typename OtherDerived, typename ResultType>
|
template<typename OtherDerived, typename ResultType>
|
||||||
bool SVD<MatrixType>::solve(const MatrixBase<OtherDerived> &b, ResultType* result) const
|
bool SVD<MatrixType>::solve(const MatrixBase<OtherDerived> &b, ResultType* result) const
|
||||||
{
|
{
|
||||||
const int rows = m_matU.rows();
|
ei_assert(b.rows() == m_matU.rows());
|
||||||
ei_assert(b.rows() == rows);
|
|
||||||
|
|
||||||
Scalar maxVal = m_sigma.cwise().abs().maxCoeff();
|
Scalar maxVal = m_sigma.cwise().abs().maxCoeff();
|
||||||
for (int j=0; j<b.cols(); ++j)
|
for (int j=0; j<b.cols(); ++j)
|
||||||
|
|||||||
@@ -336,6 +336,7 @@ void ComplexSchur<MatrixType>::reduceToTriangularForm(bool computeU)
|
|||||||
Index iu = m_matT.cols() - 1;
|
Index iu = m_matT.cols() - 1;
|
||||||
Index il;
|
Index il;
|
||||||
Index iter = 0; // number of iterations we are working on the (iu,iu) element
|
Index iter = 0; // number of iterations we are working on the (iu,iu) element
|
||||||
|
Index totalIter = 0; // number of iterations for whole matrix
|
||||||
|
|
||||||
while(true)
|
while(true)
|
||||||
{
|
{
|
||||||
@@ -350,9 +351,10 @@ void ComplexSchur<MatrixType>::reduceToTriangularForm(bool computeU)
|
|||||||
// if iu is zero then we are done; the whole matrix is triangularized
|
// if iu is zero then we are done; the whole matrix is triangularized
|
||||||
if(iu==0) break;
|
if(iu==0) break;
|
||||||
|
|
||||||
// if we spent too many iterations on the current element, we give up
|
// if we spent too many iterations, we give up
|
||||||
iter++;
|
iter++;
|
||||||
if(iter > m_maxIterations * m_matT.cols()) break;
|
totalIter++;
|
||||||
|
if(totalIter > m_maxIterations * m_matT.cols()) break;
|
||||||
|
|
||||||
// find il, the top row of the active submatrix
|
// find il, the top row of the active submatrix
|
||||||
il = iu-1;
|
il = iu-1;
|
||||||
@@ -382,7 +384,7 @@ void ComplexSchur<MatrixType>::reduceToTriangularForm(bool computeU)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(iter <= m_maxIterations * m_matT.cols())
|
if(totalIter <= m_maxIterations * m_matT.cols())
|
||||||
m_info = Success;
|
m_info = Success;
|
||||||
else
|
else
|
||||||
m_info = NoConvergence;
|
m_info = NoConvergence;
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace Eigen {
|
|||||||
/** \internal Specialization for the data types supported by MKL */
|
/** \internal Specialization for the data types supported by MKL */
|
||||||
|
|
||||||
#define EIGEN_MKL_SCHUR_COMPLEX(EIGTYPE, MKLTYPE, MKLPREFIX, MKLPREFIX_U, EIGCOLROW, MKLCOLROW) \
|
#define EIGEN_MKL_SCHUR_COMPLEX(EIGTYPE, MKLTYPE, MKLPREFIX, MKLPREFIX_U, EIGCOLROW, MKLCOLROW) \
|
||||||
template<> inline\
|
template<> inline \
|
||||||
ComplexSchur<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >& \
|
ComplexSchur<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >& \
|
||||||
ComplexSchur<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >::compute(const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW>& matrix, bool computeU) \
|
ComplexSchur<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >::compute(const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW>& matrix, bool computeU) \
|
||||||
{ \
|
{ \
|
||||||
|
|||||||
@@ -220,8 +220,9 @@ RealSchur<MatrixType>& RealSchur<MatrixType>::compute(const MatrixType& matrix,
|
|||||||
// Rows il,...,iu is the part we are working on (the active window).
|
// Rows il,...,iu is the part we are working on (the active window).
|
||||||
// Rows iu+1,...,end are already brought in triangular form.
|
// Rows iu+1,...,end are already brought in triangular form.
|
||||||
Index iu = m_matT.cols() - 1;
|
Index iu = m_matT.cols() - 1;
|
||||||
Index iter = 0; // iteration count
|
Index iter = 0; // iteration count for current eigenvalue
|
||||||
Scalar exshift(0); // sum of exceptional shifts
|
Index totalIter = 0; // iteration count for whole matrix
|
||||||
|
Scalar exshift(0); // sum of exceptional shifts
|
||||||
Scalar norm = computeNormOfT();
|
Scalar norm = computeNormOfT();
|
||||||
|
|
||||||
if(norm!=0)
|
if(norm!=0)
|
||||||
@@ -251,14 +252,15 @@ RealSchur<MatrixType>& RealSchur<MatrixType>::compute(const MatrixType& matrix,
|
|||||||
Vector3s firstHouseholderVector(0,0,0), shiftInfo;
|
Vector3s firstHouseholderVector(0,0,0), shiftInfo;
|
||||||
computeShift(iu, iter, exshift, shiftInfo);
|
computeShift(iu, iter, exshift, shiftInfo);
|
||||||
iter = iter + 1;
|
iter = iter + 1;
|
||||||
if (iter > m_maxIterations * m_matT.cols()) break;
|
totalIter = totalIter + 1;
|
||||||
|
if (totalIter > m_maxIterations * matrix.cols()) break;
|
||||||
Index im;
|
Index im;
|
||||||
initFrancisQRStep(il, iu, shiftInfo, im, firstHouseholderVector);
|
initFrancisQRStep(il, iu, shiftInfo, im, firstHouseholderVector);
|
||||||
performFrancisQRStep(il, im, iu, computeU, firstHouseholderVector, workspace);
|
performFrancisQRStep(il, im, iu, computeU, firstHouseholderVector, workspace);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(iter <= m_maxIterations * m_matT.cols())
|
if(totalIter <= m_maxIterations * matrix.cols())
|
||||||
m_info = Success;
|
m_info = Success;
|
||||||
else
|
else
|
||||||
m_info = NoConvergence;
|
m_info = NoConvergence;
|
||||||
|
|||||||
@@ -743,7 +743,16 @@ static void tridiagonal_qr_step(RealScalar* diag, RealScalar* subdiag, Index sta
|
|||||||
// RealScalar e2 = abs2(subdiag[end-1]);
|
// RealScalar e2 = abs2(subdiag[end-1]);
|
||||||
// RealScalar mu = diag[end] - e2 / (td + (td>0 ? 1 : -1) * sqrt(td*td + e2));
|
// RealScalar mu = diag[end] - e2 / (td + (td>0 ? 1 : -1) * sqrt(td*td + e2));
|
||||||
// This explain the following, somewhat more complicated, version:
|
// This explain the following, somewhat more complicated, version:
|
||||||
RealScalar mu = diag[end] - (e / (td + (td>0 ? 1 : -1))) * (e / hypot(td,e));
|
RealScalar mu = diag[end];
|
||||||
|
if(td==0)
|
||||||
|
mu -= abs(e);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RealScalar e2 = abs2(subdiag[end-1]);
|
||||||
|
RealScalar h = hypot(td,e);
|
||||||
|
if(e2==0) mu -= (e / (td + (td>0 ? 1 : -1))) * (e / h);
|
||||||
|
else mu -= e2 / (td + (td>0 ? h : -h));
|
||||||
|
}
|
||||||
|
|
||||||
RealScalar x = diag[start] - mu;
|
RealScalar x = diag[start] - mu;
|
||||||
RealScalar z = subdiag[start];
|
RealScalar z = subdiag[start];
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace Eigen {
|
|||||||
/** \internal Specialization for the data types supported by MKL */
|
/** \internal Specialization for the data types supported by MKL */
|
||||||
|
|
||||||
#define EIGEN_MKL_EIG_SELFADJ(EIGTYPE, MKLTYPE, MKLRTYPE, MKLNAME, EIGCOLROW, MKLCOLROW ) \
|
#define EIGEN_MKL_EIG_SELFADJ(EIGTYPE, MKLTYPE, MKLRTYPE, MKLNAME, EIGCOLROW, MKLCOLROW ) \
|
||||||
template<> inline\
|
template<> inline \
|
||||||
SelfAdjointEigenSolver<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >& \
|
SelfAdjointEigenSolver<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >& \
|
||||||
SelfAdjointEigenSolver<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >::compute(const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW>& matrix, int options) \
|
SelfAdjointEigenSolver<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW> >::compute(const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW>& matrix, int options) \
|
||||||
{ \
|
{ \
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim)
|
|||||||
~AlignedBox() {}
|
~AlignedBox() {}
|
||||||
|
|
||||||
/** \returns the dimension in which the box holds */
|
/** \returns the dimension in which the box holds */
|
||||||
inline Index dim() const { return AmbientDimAtCompileTime==Dynamic ? m_min.size()-1 : Index(AmbientDimAtCompileTime); }
|
inline Index dim() const { return AmbientDimAtCompileTime==Dynamic ? m_min.size() : Index(AmbientDimAtCompileTime); }
|
||||||
|
|
||||||
/** \deprecated use isEmpty */
|
/** \deprecated use isEmpty */
|
||||||
inline bool isNull() const { return isEmpty(); }
|
inline bool isNull() const { return isEmpty(); }
|
||||||
|
|||||||
@@ -193,7 +193,8 @@ public:
|
|||||||
*
|
*
|
||||||
* \brief The quaternion class used to represent 3D orientations and rotations
|
* \brief The quaternion class used to represent 3D orientations and rotations
|
||||||
*
|
*
|
||||||
* \param _Scalar the scalar type, i.e., the type of the coefficients
|
* \tparam _Scalar the scalar type, i.e., the type of the coefficients
|
||||||
|
* \tparam _Options controls the memory alignement of the coeffecients. Can be \# AutoAlign or \# DontAlign. Default is AutoAlign.
|
||||||
*
|
*
|
||||||
* This class represents a quaternion \f$ w+xi+yj+zk \f$ that is a convenient representation of
|
* This class represents a quaternion \f$ w+xi+yj+zk \f$ that is a convenient representation of
|
||||||
* orientations and rotations of objects in three dimensions. Compared to other representations
|
* orientations and rotations of objects in three dimensions. Compared to other representations
|
||||||
@@ -304,41 +305,29 @@ typedef Quaternion<double> Quaterniond;
|
|||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
template<typename _Scalar, int _Options>
|
template<typename _Scalar, int _Options>
|
||||||
struct traits<Map<Quaternion<_Scalar>, _Options> >:
|
struct traits<Map<Quaternion<_Scalar>, _Options> > : traits<Quaternion<_Scalar, (int(_Options)&Aligned)==Aligned ? AutoAlign : DontAlign> >
|
||||||
traits<Quaternion<_Scalar, _Options> >
|
|
||||||
{
|
{
|
||||||
typedef _Scalar Scalar;
|
|
||||||
typedef Map<Matrix<_Scalar,4,1>, _Options> Coefficients;
|
typedef Map<Matrix<_Scalar,4,1>, _Options> Coefficients;
|
||||||
|
|
||||||
typedef traits<Quaternion<_Scalar, _Options> > TraitsBase;
|
|
||||||
enum {
|
|
||||||
IsAligned = TraitsBase::IsAligned,
|
|
||||||
|
|
||||||
Flags = TraitsBase::Flags
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
template<typename _Scalar, int _Options>
|
template<typename _Scalar, int _Options>
|
||||||
struct traits<Map<const Quaternion<_Scalar>, _Options> >:
|
struct traits<Map<const Quaternion<_Scalar>, _Options> > : traits<Quaternion<_Scalar, (int(_Options)&Aligned)==Aligned ? AutoAlign : DontAlign> >
|
||||||
traits<Quaternion<_Scalar> >
|
|
||||||
{
|
{
|
||||||
typedef _Scalar Scalar;
|
|
||||||
typedef Map<const Matrix<_Scalar,4,1>, _Options> Coefficients;
|
typedef Map<const Matrix<_Scalar,4,1>, _Options> Coefficients;
|
||||||
|
typedef traits<Quaternion<_Scalar, (int(_Options)&Aligned)==Aligned ? AutoAlign : DontAlign> > TraitsBase;
|
||||||
typedef traits<Quaternion<_Scalar, _Options> > TraitsBase;
|
|
||||||
enum {
|
enum {
|
||||||
IsAligned = TraitsBase::IsAligned,
|
|
||||||
Flags = TraitsBase::Flags & ~LvalueBit
|
Flags = TraitsBase::Flags & ~LvalueBit
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief Quaternion expression mapping a constant memory buffer
|
/** \ingroup Geometry_Module
|
||||||
|
* \brief Quaternion expression mapping a constant memory buffer
|
||||||
*
|
*
|
||||||
* \param _Scalar the type of the Quaternion coefficients
|
* \tparam _Scalar the type of the Quaternion coefficients
|
||||||
* \param _Options see class Map
|
* \tparam _Options see class Map
|
||||||
*
|
*
|
||||||
* This is a specialization of class Map for Quaternion. This class allows to view
|
* This is a specialization of class Map for Quaternion. This class allows to view
|
||||||
* a 4 scalar memory buffer as an Eigen's Quaternion object.
|
* a 4 scalar memory buffer as an Eigen's Quaternion object.
|
||||||
@@ -371,10 +360,11 @@ class Map<const Quaternion<_Scalar>, _Options >
|
|||||||
const Coefficients m_coeffs;
|
const Coefficients m_coeffs;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** \brief Expression of a quaternion from a memory buffer
|
/** \ingroup Geometry_Module
|
||||||
|
* \brief Expression of a quaternion from a memory buffer
|
||||||
*
|
*
|
||||||
* \param _Scalar the type of the Quaternion coefficients
|
* \tparam _Scalar the type of the Quaternion coefficients
|
||||||
* \param _Options see class Map
|
* \tparam _Options see class Map
|
||||||
*
|
*
|
||||||
* This is a specialization of class Map for Quaternion. This class allows to view
|
* This is a specialization of class Map for Quaternion. This class allows to view
|
||||||
* a 4 scalar memory buffer as an Eigen's Quaternion object.
|
* a 4 scalar memory buffer as an Eigen's Quaternion object.
|
||||||
|
|||||||
@@ -577,7 +577,7 @@ struct kernel_retval<FullPivLU<_MatrixType> >
|
|||||||
RealScalar premultiplied_threshold = dec().maxPivot() * dec().threshold();
|
RealScalar premultiplied_threshold = dec().maxPivot() * dec().threshold();
|
||||||
Index p = 0;
|
Index p = 0;
|
||||||
for(Index i = 0; i < dec().nonzeroPivots(); ++i)
|
for(Index i = 0; i < dec().nonzeroPivots(); ++i)
|
||||||
if(abs(dec().matrixLU().coeff(i,i)) > premultiplied_threshold)
|
if(internal::abs(dec().matrixLU().coeff(i,i)) > premultiplied_threshold)
|
||||||
pivots.coeffRef(p++) = i;
|
pivots.coeffRef(p++) = i;
|
||||||
eigen_internal_assert(p == rank());
|
eigen_internal_assert(p == rank());
|
||||||
|
|
||||||
@@ -645,7 +645,7 @@ struct image_retval<FullPivLU<_MatrixType> >
|
|||||||
RealScalar premultiplied_threshold = dec().maxPivot() * dec().threshold();
|
RealScalar premultiplied_threshold = dec().maxPivot() * dec().threshold();
|
||||||
Index p = 0;
|
Index p = 0;
|
||||||
for(Index i = 0; i < dec().nonzeroPivots(); ++i)
|
for(Index i = 0; i < dec().nonzeroPivots(); ++i)
|
||||||
if(abs(dec().matrixLU().coeff(i,i)) > premultiplied_threshold)
|
if(internal::abs(dec().matrixLU().coeff(i,i)) > premultiplied_threshold)
|
||||||
pivots.coeffRef(p++) = i;
|
pivots.coeffRef(p++) = i;
|
||||||
eigen_internal_assert(p == rank());
|
eigen_internal_assert(p == rank());
|
||||||
|
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ class PardisoImpl
|
|||||||
typedef Matrix<Scalar,Dynamic,1> VectorType;
|
typedef Matrix<Scalar,Dynamic,1> VectorType;
|
||||||
typedef Matrix<Index, 1, MatrixType::ColsAtCompileTime> IntRowVectorType;
|
typedef Matrix<Index, 1, MatrixType::ColsAtCompileTime> IntRowVectorType;
|
||||||
typedef Matrix<Index, MatrixType::RowsAtCompileTime, 1> IntColVectorType;
|
typedef Matrix<Index, MatrixType::RowsAtCompileTime, 1> IntColVectorType;
|
||||||
|
typedef Array<Index,64,1,DontAlign> ParameterType;
|
||||||
enum {
|
enum {
|
||||||
ScalarIsComplex = NumTraits<Scalar>::IsComplex
|
ScalarIsComplex = NumTraits<Scalar>::IsComplex
|
||||||
};
|
};
|
||||||
@@ -142,7 +143,7 @@ class PardisoImpl
|
|||||||
/** \warning for advanced usage only.
|
/** \warning for advanced usage only.
|
||||||
* \returns a reference to the parameter array controlling PARDISO.
|
* \returns a reference to the parameter array controlling PARDISO.
|
||||||
* See the PARDISO manual to know how to use it. */
|
* See the PARDISO manual to know how to use it. */
|
||||||
Array<Index,64,1>& pardisoParameterArray()
|
ParameterType& pardisoParameterArray()
|
||||||
{
|
{
|
||||||
return m_iparm;
|
return m_iparm;
|
||||||
}
|
}
|
||||||
@@ -295,7 +296,7 @@ class PardisoImpl
|
|||||||
bool m_initialized, m_analysisIsOk, m_factorizationIsOk;
|
bool m_initialized, m_analysisIsOk, m_factorizationIsOk;
|
||||||
Index m_type, m_msglvl;
|
Index m_type, m_msglvl;
|
||||||
mutable void *m_pt[64];
|
mutable void *m_pt[64];
|
||||||
mutable Array<Index,64,1> m_iparm;
|
mutable ParameterType m_iparm;
|
||||||
mutable IntColVectorType m_perm;
|
mutable IntColVectorType m_perm;
|
||||||
Index m_size;
|
Index m_size;
|
||||||
|
|
||||||
|
|||||||
@@ -56,6 +56,12 @@ template<typename _MatrixType> class ColPivHouseholderQR
|
|||||||
typedef typename internal::plain_row_type<MatrixType>::type RowVectorType;
|
typedef typename internal::plain_row_type<MatrixType>::type RowVectorType;
|
||||||
typedef typename internal::plain_row_type<MatrixType, RealScalar>::type RealRowVectorType;
|
typedef typename internal::plain_row_type<MatrixType, RealScalar>::type RealRowVectorType;
|
||||||
typedef typename HouseholderSequence<MatrixType,HCoeffsType>::ConjugateReturnType HouseholderSequenceType;
|
typedef typename HouseholderSequence<MatrixType,HCoeffsType>::ConjugateReturnType HouseholderSequenceType;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
typedef typename PermutationType::Index PermIndexType;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Default Constructor.
|
* \brief Default Constructor.
|
||||||
@@ -81,7 +87,7 @@ template<typename _MatrixType> class ColPivHouseholderQR
|
|||||||
ColPivHouseholderQR(Index rows, Index cols)
|
ColPivHouseholderQR(Index rows, Index cols)
|
||||||
: m_qr(rows, cols),
|
: m_qr(rows, cols),
|
||||||
m_hCoeffs((std::min)(rows,cols)),
|
m_hCoeffs((std::min)(rows,cols)),
|
||||||
m_colsPermutation(cols),
|
m_colsPermutation(PermIndexType(cols)),
|
||||||
m_colsTranspositions(cols),
|
m_colsTranspositions(cols),
|
||||||
m_temp(cols),
|
m_temp(cols),
|
||||||
m_colSqNorms(cols),
|
m_colSqNorms(cols),
|
||||||
@@ -91,7 +97,7 @@ template<typename _MatrixType> class ColPivHouseholderQR
|
|||||||
ColPivHouseholderQR(const MatrixType& matrix)
|
ColPivHouseholderQR(const MatrixType& matrix)
|
||||||
: m_qr(matrix.rows(), matrix.cols()),
|
: m_qr(matrix.rows(), matrix.cols()),
|
||||||
m_hCoeffs((std::min)(matrix.rows(),matrix.cols())),
|
m_hCoeffs((std::min)(matrix.rows(),matrix.cols())),
|
||||||
m_colsPermutation(matrix.cols()),
|
m_colsPermutation(PermIndexType(matrix.cols())),
|
||||||
m_colsTranspositions(matrix.cols()),
|
m_colsTranspositions(matrix.cols()),
|
||||||
m_temp(matrix.cols()),
|
m_temp(matrix.cols()),
|
||||||
m_colSqNorms(matrix.cols()),
|
m_colSqNorms(matrix.cols()),
|
||||||
@@ -436,9 +442,9 @@ ColPivHouseholderQR<MatrixType>& ColPivHouseholderQR<MatrixType>::compute(const
|
|||||||
m_colSqNorms.tail(cols-k-1) -= m_qr.row(k).tail(cols-k-1).cwiseAbs2();
|
m_colSqNorms.tail(cols-k-1) -= m_qr.row(k).tail(cols-k-1).cwiseAbs2();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_colsPermutation.setIdentity(cols);
|
m_colsPermutation.setIdentity(PermIndexType(cols));
|
||||||
for(Index k = 0; k < m_nonzero_pivots; ++k)
|
for(PermIndexType k = 0; k < m_nonzero_pivots; ++k)
|
||||||
m_colsPermutation.applyTranspositionOnTheRight(k, m_colsTranspositions.coeff(k));
|
m_colsPermutation.applyTranspositionOnTheRight(PermIndexType(k), PermIndexType(m_colsTranspositions.coeff(k)));
|
||||||
|
|
||||||
m_det_pq = (number_of_transpositions%2) ? -1 : 1;
|
m_det_pq = (number_of_transpositions%2) ? -1 : 1;
|
||||||
m_isInitialized = true;
|
m_isInitialized = true;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ namespace Eigen {
|
|||||||
/** \internal Specialization for the data types supported by MKL */
|
/** \internal Specialization for the data types supported by MKL */
|
||||||
|
|
||||||
#define EIGEN_MKL_QR_COLPIV(EIGTYPE, MKLTYPE, MKLPREFIX, EIGCOLROW, MKLCOLROW) \
|
#define EIGEN_MKL_QR_COLPIV(EIGTYPE, MKLTYPE, MKLPREFIX, EIGCOLROW, MKLCOLROW) \
|
||||||
template<> inline\
|
template<> inline \
|
||||||
ColPivHouseholderQR<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic> >& \
|
ColPivHouseholderQR<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic> >& \
|
||||||
ColPivHouseholderQR<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic> >::compute( \
|
ColPivHouseholderQR<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic> >::compute( \
|
||||||
const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>& matrix) \
|
const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>& matrix) \
|
||||||
|
|||||||
@@ -63,9 +63,10 @@ template<typename _MatrixType> class FullPivHouseholderQR
|
|||||||
typedef typename MatrixType::Index Index;
|
typedef typename MatrixType::Index Index;
|
||||||
typedef internal::FullPivHouseholderQRMatrixQReturnType<MatrixType> MatrixQReturnType;
|
typedef internal::FullPivHouseholderQRMatrixQReturnType<MatrixType> MatrixQReturnType;
|
||||||
typedef typename internal::plain_diag_type<MatrixType>::type HCoeffsType;
|
typedef typename internal::plain_diag_type<MatrixType>::type HCoeffsType;
|
||||||
typedef Matrix<Index, 1, ColsAtCompileTime, RowMajor, 1, MaxColsAtCompileTime> IntRowVectorType;
|
typedef Matrix<Index, 1,
|
||||||
|
EIGEN_SIZE_MIN_PREFER_DYNAMIC(ColsAtCompileTime,RowsAtCompileTime), RowMajor, 1,
|
||||||
|
EIGEN_SIZE_MIN_PREFER_FIXED(MaxColsAtCompileTime,MaxRowsAtCompileTime)> IntDiagSizeVectorType;
|
||||||
typedef PermutationMatrix<ColsAtCompileTime, MaxColsAtCompileTime> PermutationType;
|
typedef PermutationMatrix<ColsAtCompileTime, MaxColsAtCompileTime> PermutationType;
|
||||||
typedef typename internal::plain_col_type<MatrixType, Index>::type IntColVectorType;
|
|
||||||
typedef typename internal::plain_row_type<MatrixType>::type RowVectorType;
|
typedef typename internal::plain_row_type<MatrixType>::type RowVectorType;
|
||||||
typedef typename internal::plain_col_type<MatrixType>::type ColVectorType;
|
typedef typename internal::plain_col_type<MatrixType>::type ColVectorType;
|
||||||
|
|
||||||
@@ -158,7 +159,7 @@ template<typename _MatrixType> class FullPivHouseholderQR
|
|||||||
return m_cols_permutation;
|
return m_cols_permutation;
|
||||||
}
|
}
|
||||||
|
|
||||||
const IntColVectorType& rowsTranspositions() const
|
const IntDiagSizeVectorType& rowsTranspositions() const
|
||||||
{
|
{
|
||||||
eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized.");
|
eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized.");
|
||||||
return m_rows_transpositions;
|
return m_rows_transpositions;
|
||||||
@@ -348,8 +349,8 @@ template<typename _MatrixType> class FullPivHouseholderQR
|
|||||||
protected:
|
protected:
|
||||||
MatrixType m_qr;
|
MatrixType m_qr;
|
||||||
HCoeffsType m_hCoeffs;
|
HCoeffsType m_hCoeffs;
|
||||||
IntColVectorType m_rows_transpositions;
|
IntDiagSizeVectorType m_rows_transpositions;
|
||||||
IntRowVectorType m_cols_transpositions;
|
IntDiagSizeVectorType m_cols_transpositions;
|
||||||
PermutationType m_cols_permutation;
|
PermutationType m_cols_permutation;
|
||||||
RowVectorType m_temp;
|
RowVectorType m_temp;
|
||||||
bool m_isInitialized, m_usePrescribedThreshold;
|
bool m_isInitialized, m_usePrescribedThreshold;
|
||||||
@@ -389,8 +390,8 @@ FullPivHouseholderQR<MatrixType>& FullPivHouseholderQR<MatrixType>::compute(cons
|
|||||||
|
|
||||||
m_precision = NumTraits<Scalar>::epsilon() * size;
|
m_precision = NumTraits<Scalar>::epsilon() * size;
|
||||||
|
|
||||||
m_rows_transpositions.resize(matrix.rows());
|
m_rows_transpositions.resize(size);
|
||||||
m_cols_transpositions.resize(matrix.cols());
|
m_cols_transpositions.resize(size);
|
||||||
Index number_of_transpositions = 0;
|
Index number_of_transpositions = 0;
|
||||||
|
|
||||||
RealScalar biggest(0);
|
RealScalar biggest(0);
|
||||||
@@ -520,14 +521,14 @@ template<typename MatrixType> struct FullPivHouseholderQRMatrixQReturnType
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef typename MatrixType::Index Index;
|
typedef typename MatrixType::Index Index;
|
||||||
typedef typename internal::plain_col_type<MatrixType, Index>::type IntColVectorType;
|
typedef typename FullPivHouseholderQR<MatrixType>::IntDiagSizeVectorType IntDiagSizeVectorType;
|
||||||
typedef typename internal::plain_diag_type<MatrixType>::type HCoeffsType;
|
typedef typename internal::plain_diag_type<MatrixType>::type HCoeffsType;
|
||||||
typedef Matrix<typename MatrixType::Scalar, 1, MatrixType::RowsAtCompileTime, RowMajor, 1,
|
typedef Matrix<typename MatrixType::Scalar, 1, MatrixType::RowsAtCompileTime, RowMajor, 1,
|
||||||
MatrixType::MaxRowsAtCompileTime> WorkVectorType;
|
MatrixType::MaxRowsAtCompileTime> WorkVectorType;
|
||||||
|
|
||||||
FullPivHouseholderQRMatrixQReturnType(const MatrixType& qr,
|
FullPivHouseholderQRMatrixQReturnType(const MatrixType& qr,
|
||||||
const HCoeffsType& hCoeffs,
|
const HCoeffsType& hCoeffs,
|
||||||
const IntColVectorType& rowsTranspositions)
|
const IntDiagSizeVectorType& rowsTranspositions)
|
||||||
: m_qr(qr),
|
: m_qr(qr),
|
||||||
m_hCoeffs(hCoeffs),
|
m_hCoeffs(hCoeffs),
|
||||||
m_rowsTranspositions(rowsTranspositions)
|
m_rowsTranspositions(rowsTranspositions)
|
||||||
@@ -566,7 +567,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
typename MatrixType::Nested m_qr;
|
typename MatrixType::Nested m_qr;
|
||||||
typename HCoeffsType::Nested m_hCoeffs;
|
typename HCoeffsType::Nested m_hCoeffs;
|
||||||
typename IntColVectorType::Nested m_rowsTranspositions;
|
typename IntDiagSizeVectorType::Nested m_rowsTranspositions;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // end namespace internal
|
} // end namespace internal
|
||||||
|
|||||||
@@ -833,17 +833,13 @@ struct solve_retval<JacobiSVD<_MatrixType, QRPreconditioner>, Rhs>
|
|||||||
// A = U S V^*
|
// A = U S V^*
|
||||||
// So A^{-1} = V S^{-1} U^*
|
// So A^{-1} = V S^{-1} U^*
|
||||||
|
|
||||||
|
Matrix<Scalar, Dynamic, Rhs::ColsAtCompileTime, 0, _MatrixType::MaxRowsAtCompileTime, Rhs::MaxColsAtCompileTime> tmp;
|
||||||
Index diagSize = (std::min)(dec().rows(), dec().cols());
|
Index diagSize = (std::min)(dec().rows(), dec().cols());
|
||||||
typename JacobiSVDType::SingularValuesType invertedSingVals(diagSize);
|
|
||||||
|
|
||||||
Index nonzeroSingVals = dec().nonzeroSingularValues();
|
Index nonzeroSingVals = dec().nonzeroSingularValues();
|
||||||
invertedSingVals.head(nonzeroSingVals) = dec().singularValues().head(nonzeroSingVals).array().inverse();
|
|
||||||
invertedSingVals.tail(diagSize - nonzeroSingVals).setZero();
|
tmp.noalias() = dec().matrixU().leftCols(nonzeroSingVals).adjoint() * rhs();
|
||||||
|
tmp = dec().singularValues().head(nonzeroSingVals).asDiagonal().inverse() * tmp;
|
||||||
dst = dec().matrixV().leftCols(diagSize)
|
dst = dec().matrixV().leftCols(nonzeroSingVals) * tmp;
|
||||||
* invertedSingVals.asDiagonal()
|
|
||||||
* dec().matrixU().leftCols(diagSize).adjoint()
|
|
||||||
* rhs();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
} // end namespace internal
|
} // end namespace internal
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace Eigen {
|
|||||||
/** \internal Specialization for the data types supported by MKL */
|
/** \internal Specialization for the data types supported by MKL */
|
||||||
|
|
||||||
#define EIGEN_MKL_SVD(EIGTYPE, MKLTYPE, MKLRTYPE, MKLPREFIX, EIGCOLROW, MKLCOLROW) \
|
#define EIGEN_MKL_SVD(EIGTYPE, MKLTYPE, MKLRTYPE, MKLPREFIX, EIGCOLROW, MKLCOLROW) \
|
||||||
template<> inline\
|
template<> inline \
|
||||||
JacobiSVD<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>, ColPivHouseholderQRPreconditioner>& \
|
JacobiSVD<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>, ColPivHouseholderQRPreconditioner>& \
|
||||||
JacobiSVD<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>, ColPivHouseholderQRPreconditioner>::compute(const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>& matrix, unsigned int computationOptions) \
|
JacobiSVD<Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>, ColPivHouseholderQRPreconditioner>::compute(const Matrix<EIGTYPE, Dynamic, Dynamic, EIGCOLROW, Dynamic, Dynamic>& matrix, unsigned int computationOptions) \
|
||||||
{ \
|
{ \
|
||||||
|
|||||||
@@ -126,11 +126,15 @@ class sparse_diagonal_product_inner_iterator_selector
|
|||||||
SparseInnerVectorSet<Rhs,1>,
|
SparseInnerVectorSet<Rhs,1>,
|
||||||
typename Lhs::DiagonalVectorType>::InnerIterator Base;
|
typename Lhs::DiagonalVectorType>::InnerIterator Base;
|
||||||
typedef typename Lhs::Index Index;
|
typedef typename Lhs::Index Index;
|
||||||
|
Index m_outer;
|
||||||
public:
|
public:
|
||||||
inline sparse_diagonal_product_inner_iterator_selector(
|
inline sparse_diagonal_product_inner_iterator_selector(
|
||||||
const SparseDiagonalProductType& expr, Index outer)
|
const SparseDiagonalProductType& expr, Index outer)
|
||||||
: Base(expr.rhs().innerVector(outer) .cwiseProduct(expr.lhs().diagonal()), 0)
|
: Base(expr.rhs().innerVector(outer) .cwiseProduct(expr.lhs().diagonal()), 0), m_outer(outer)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
inline Index outer() const { return m_outer; }
|
||||||
|
inline Index col() const { return m_outer; }
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename Lhs, typename Rhs, typename SparseDiagonalProductType>
|
template<typename Lhs, typename Rhs, typename SparseDiagonalProductType>
|
||||||
@@ -160,11 +164,15 @@ class sparse_diagonal_product_inner_iterator_selector
|
|||||||
SparseInnerVectorSet<Lhs,1>,
|
SparseInnerVectorSet<Lhs,1>,
|
||||||
Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator Base;
|
Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator Base;
|
||||||
typedef typename Lhs::Index Index;
|
typedef typename Lhs::Index Index;
|
||||||
|
Index m_outer;
|
||||||
public:
|
public:
|
||||||
inline sparse_diagonal_product_inner_iterator_selector(
|
inline sparse_diagonal_product_inner_iterator_selector(
|
||||||
const SparseDiagonalProductType& expr, Index outer)
|
const SparseDiagonalProductType& expr, Index outer)
|
||||||
: Base(expr.lhs().innerVector(outer) .cwiseProduct(expr.rhs().diagonal().transpose()), 0)
|
: Base(expr.lhs().innerVector(outer) .cwiseProduct(expr.rhs().diagonal().transpose()), 0), m_outer(outer)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
inline Index outer() const { return m_outer; }
|
||||||
|
inline Index row() const { return m_outer; }
|
||||||
};
|
};
|
||||||
|
|
||||||
} // end namespace internal
|
} // end namespace internal
|
||||||
|
|||||||
@@ -572,6 +572,16 @@ class SparseMatrix
|
|||||||
*this = other.derived();
|
*this = other.derived();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** \brief Copy constructor with in-place evaluation */
|
||||||
|
template<typename OtherDerived>
|
||||||
|
SparseMatrix(const ReturnByValue<OtherDerived>& other)
|
||||||
|
: Base(), m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0)
|
||||||
|
{
|
||||||
|
check_template_parameters();
|
||||||
|
initAssignment(other);
|
||||||
|
other.evalTo(*this);
|
||||||
|
}
|
||||||
|
|
||||||
/** Swaps the content of two sparse matrices of the same type.
|
/** Swaps the content of two sparse matrices of the same type.
|
||||||
* This is a fast operation that simply swaps the underlying pointers and parameters. */
|
* This is a fast operation that simply swaps the underlying pointers and parameters. */
|
||||||
inline void swap(SparseMatrix& other)
|
inline void swap(SparseMatrix& other)
|
||||||
@@ -613,7 +623,10 @@ class SparseMatrix
|
|||||||
|
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
inline SparseMatrix& operator=(const ReturnByValue<OtherDerived>& other)
|
inline SparseMatrix& operator=(const ReturnByValue<OtherDerived>& other)
|
||||||
{ return Base::operator=(other.derived()); }
|
{
|
||||||
|
initAssignment(other);
|
||||||
|
return Base::operator=(other.derived());
|
||||||
|
}
|
||||||
|
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
inline SparseMatrix& operator=(const EigenBase<OtherDerived>& other)
|
inline SparseMatrix& operator=(const EigenBase<OtherDerived>& other)
|
||||||
@@ -623,7 +636,6 @@ class SparseMatrix
|
|||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
EIGEN_DONT_INLINE SparseMatrix& operator=(const SparseMatrixBase<OtherDerived>& other)
|
EIGEN_DONT_INLINE SparseMatrix& operator=(const SparseMatrixBase<OtherDerived>& other)
|
||||||
{
|
{
|
||||||
initAssignment(other.derived());
|
|
||||||
const bool needToTranspose = (Flags & RowMajorBit) != (OtherDerived::Flags & RowMajorBit);
|
const bool needToTranspose = (Flags & RowMajorBit) != (OtherDerived::Flags & RowMajorBit);
|
||||||
if (needToTranspose)
|
if (needToTranspose)
|
||||||
{
|
{
|
||||||
@@ -635,40 +647,45 @@ class SparseMatrix
|
|||||||
typedef typename internal::remove_all<OtherCopy>::type _OtherCopy;
|
typedef typename internal::remove_all<OtherCopy>::type _OtherCopy;
|
||||||
OtherCopy otherCopy(other.derived());
|
OtherCopy otherCopy(other.derived());
|
||||||
|
|
||||||
Eigen::Map<Matrix<Index, Dynamic, 1> > (m_outerIndex,outerSize()).setZero();
|
SparseMatrix dest(other.rows(),other.cols());
|
||||||
|
Eigen::Map<Matrix<Index, Dynamic, 1> > (dest.m_outerIndex,dest.outerSize()).setZero();
|
||||||
|
|
||||||
// pass 1
|
// pass 1
|
||||||
// FIXME the above copy could be merged with that pass
|
// FIXME the above copy could be merged with that pass
|
||||||
for (Index j=0; j<otherCopy.outerSize(); ++j)
|
for (Index j=0; j<otherCopy.outerSize(); ++j)
|
||||||
for (typename _OtherCopy::InnerIterator it(otherCopy, j); it; ++it)
|
for (typename _OtherCopy::InnerIterator it(otherCopy, j); it; ++it)
|
||||||
++m_outerIndex[it.index()];
|
++dest.m_outerIndex[it.index()];
|
||||||
|
|
||||||
// prefix sum
|
// prefix sum
|
||||||
Index count = 0;
|
Index count = 0;
|
||||||
VectorXi positions(outerSize());
|
VectorXi positions(dest.outerSize());
|
||||||
for (Index j=0; j<outerSize(); ++j)
|
for (Index j=0; j<dest.outerSize(); ++j)
|
||||||
{
|
{
|
||||||
Index tmp = m_outerIndex[j];
|
Index tmp = dest.m_outerIndex[j];
|
||||||
m_outerIndex[j] = count;
|
dest.m_outerIndex[j] = count;
|
||||||
positions[j] = count;
|
positions[j] = count;
|
||||||
count += tmp;
|
count += tmp;
|
||||||
}
|
}
|
||||||
m_outerIndex[outerSize()] = count;
|
dest.m_outerIndex[dest.outerSize()] = count;
|
||||||
// alloc
|
// alloc
|
||||||
m_data.resize(count);
|
dest.m_data.resize(count);
|
||||||
// pass 2
|
// pass 2
|
||||||
for (Index j=0; j<otherCopy.outerSize(); ++j)
|
for (Index j=0; j<otherCopy.outerSize(); ++j)
|
||||||
{
|
{
|
||||||
for (typename _OtherCopy::InnerIterator it(otherCopy, j); it; ++it)
|
for (typename _OtherCopy::InnerIterator it(otherCopy, j); it; ++it)
|
||||||
{
|
{
|
||||||
Index pos = positions[it.index()]++;
|
Index pos = positions[it.index()]++;
|
||||||
m_data.index(pos) = j;
|
dest.m_data.index(pos) = j;
|
||||||
m_data.value(pos) = it.value();
|
dest.m_data.value(pos) = it.value();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this->swap(dest);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if(other.isRValue())
|
||||||
|
initAssignment(other.derived());
|
||||||
// there is no special optimization
|
// there is no special optimization
|
||||||
return Base::operator=(other.derived());
|
return Base::operator=(other.derived());
|
||||||
}
|
}
|
||||||
@@ -888,6 +905,7 @@ protected:
|
|||||||
m_data.value(p) = m_data.value(p-1);
|
m_data.value(p) = m_data.value(p-1);
|
||||||
--p;
|
--p;
|
||||||
}
|
}
|
||||||
|
eigen_assert((p<=startId || m_data.index(p-1)!=inner) && "you cannot insert an element that already exist, you must call coeffRef to this end");
|
||||||
|
|
||||||
m_innerNonZeros[outer]++;
|
m_innerNonZeros[outer]++;
|
||||||
|
|
||||||
|
|||||||
@@ -209,6 +209,7 @@ class SparseSelfAdjointTimeDenseProduct
|
|||||||
|
|
||||||
template<typename Dest> void scaleAndAddTo(Dest& dest, Scalar alpha) const
|
template<typename Dest> void scaleAndAddTo(Dest& dest, Scalar alpha) const
|
||||||
{
|
{
|
||||||
|
EIGEN_ONLY_USED_FOR_DEBUG(alpha);
|
||||||
// TODO use alpha
|
// TODO use alpha
|
||||||
eigen_assert(alpha==Scalar(1) && "alpha != 1 is not implemented yet, sorry");
|
eigen_assert(alpha==Scalar(1) && "alpha != 1 is not implemented yet, sorry");
|
||||||
typedef typename internal::remove_all<Lhs>::type _Lhs;
|
typedef typename internal::remove_all<Lhs>::type _Lhs;
|
||||||
|
|||||||
@@ -113,9 +113,10 @@ template<typename T,int Rows> struct sparse_eval<T,Rows,1> {
|
|||||||
|
|
||||||
template<typename T,int Rows,int Cols> struct sparse_eval {
|
template<typename T,int Rows,int Cols> struct sparse_eval {
|
||||||
typedef typename traits<T>::Scalar _Scalar;
|
typedef typename traits<T>::Scalar _Scalar;
|
||||||
enum { _Flags = traits<T>::Flags };
|
typedef typename traits<T>::Index _Index;
|
||||||
|
enum { _Options = ((traits<T>::Flags&RowMajorBit)==RowMajorBit) ? RowMajor : ColMajor };
|
||||||
public:
|
public:
|
||||||
typedef SparseMatrix<_Scalar, _Flags> type;
|
typedef SparseMatrix<_Scalar, _Options, _Index> type;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T> struct sparse_eval<T,1,1> {
|
template<typename T> struct sparse_eval<T,1,1> {
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ class SparseVector
|
|||||||
}
|
}
|
||||||
|
|
||||||
inline SparseVector(const SparseVector& other)
|
inline SparseVector(const SparseVector& other)
|
||||||
: m_size(0)
|
: SparseBase(other), m_size(0)
|
||||||
{
|
{
|
||||||
*this = other.derived();
|
*this = other.derived();
|
||||||
}
|
}
|
||||||
@@ -230,7 +230,8 @@ class SparseVector
|
|||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
inline SparseVector& operator=(const SparseMatrixBase<OtherDerived>& other)
|
inline SparseVector& operator=(const SparseMatrixBase<OtherDerived>& other)
|
||||||
{
|
{
|
||||||
if (int(RowsAtCompileTime)!=int(OtherDerived::RowsAtCompileTime))
|
if ( (bool(OtherDerived::IsVectorAtCompileTime) && int(RowsAtCompileTime)!=int(OtherDerived::RowsAtCompileTime))
|
||||||
|
|| ((!bool(OtherDerived::IsVectorAtCompileTime)) && ( bool(IsColVector) ? other.cols()>1 : other.rows()>1 )))
|
||||||
return assign(other.transpose());
|
return assign(other.transpose());
|
||||||
else
|
else
|
||||||
return assign(other);
|
return assign(other);
|
||||||
|
|||||||
@@ -496,8 +496,8 @@ class SuperLU : public SuperLUBase<_MatrixType,SuperLU<_MatrixType> >
|
|||||||
|
|
||||||
SuperLU(const MatrixType& matrix) : Base()
|
SuperLU(const MatrixType& matrix) : Base()
|
||||||
{
|
{
|
||||||
Base::init();
|
init();
|
||||||
compute(matrix);
|
Base::compute(matrix);
|
||||||
}
|
}
|
||||||
|
|
||||||
~SuperLU()
|
~SuperLU()
|
||||||
@@ -833,7 +833,7 @@ class SuperILU : public SuperLUBase<_MatrixType,SuperILU<_MatrixType> >
|
|||||||
SuperILU(const MatrixType& matrix) : Base()
|
SuperILU(const MatrixType& matrix) : Base()
|
||||||
{
|
{
|
||||||
init();
|
init();
|
||||||
compute(matrix);
|
Base::compute(matrix);
|
||||||
}
|
}
|
||||||
|
|
||||||
~SuperILU()
|
~SuperILU()
|
||||||
|
|||||||
@@ -33,7 +33,8 @@ EIGEN_MAKE_CWISE_BINARY_OP(min,internal::scalar_min_op)
|
|||||||
*
|
*
|
||||||
* \sa max()
|
* \sa max()
|
||||||
*/
|
*/
|
||||||
EIGEN_STRONG_INLINE const CwiseBinaryOp<internal::scalar_min_op<Scalar>, const Derived, const ConstantReturnType>
|
EIGEN_STRONG_INLINE const CwiseBinaryOp<internal::scalar_min_op<Scalar>, const Derived,
|
||||||
|
const CwiseNullaryOp<internal::scalar_constant_op<Scalar>, PlainObject> >
|
||||||
(min)(const Scalar &other) const
|
(min)(const Scalar &other) const
|
||||||
{
|
{
|
||||||
return (min)(Derived::PlainObject::Constant(rows(), cols(), other));
|
return (min)(Derived::PlainObject::Constant(rows(), cols(), other));
|
||||||
@@ -52,7 +53,8 @@ EIGEN_MAKE_CWISE_BINARY_OP(max,internal::scalar_max_op)
|
|||||||
*
|
*
|
||||||
* \sa min()
|
* \sa min()
|
||||||
*/
|
*/
|
||||||
EIGEN_STRONG_INLINE const CwiseBinaryOp<internal::scalar_max_op<Scalar>, const Derived, const ConstantReturnType>
|
EIGEN_STRONG_INLINE const CwiseBinaryOp<internal::scalar_max_op<Scalar>, const Derived,
|
||||||
|
const CwiseNullaryOp<internal::scalar_constant_op<Scalar>, PlainObject> >
|
||||||
(max)(const Scalar &other) const
|
(max)(const Scalar &other) const
|
||||||
{
|
{
|
||||||
return (max)(Derived::PlainObject::Constant(rows(), cols(), other));
|
return (max)(Derived::PlainObject::Constant(rows(), cols(), other));
|
||||||
|
|||||||
@@ -200,3 +200,4 @@ EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator<=, std::less_equal)
|
|||||||
EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>, std::greater)
|
EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>, std::greater)
|
||||||
EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>=, std::greater_equal)
|
EIGEN_MAKE_SCALAR_CWISE_UNARY_OP(operator>=, std::greater_equal)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
30
ci/build.linux.gitlab-ci.yml
Normal file
30
ci/build.linux.gitlab-ci.yml
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
# Base configuration for linux cross-compilation.
|
||||||
|
.build:linux:cross:
|
||||||
|
extends: .common:linux:cross
|
||||||
|
stage: build
|
||||||
|
variables:
|
||||||
|
EIGEN_CI_BUILD_TARGET: buildtests
|
||||||
|
script:
|
||||||
|
- . ci/scripts/build.linux.script.sh
|
||||||
|
tags:
|
||||||
|
- saas-linux-2xlarge-amd64
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen"
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen"
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "libeigen" && $CI_MERGE_REQUEST_LABELS =~ "/all-tests/"
|
||||||
|
cache:
|
||||||
|
key: "$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG-BUILD"
|
||||||
|
paths:
|
||||||
|
- ${EIGEN_CI_BUILDDIR}/
|
||||||
|
|
||||||
|
build:linux:docs:
|
||||||
|
extends: .build:linux:cross
|
||||||
|
variables:
|
||||||
|
EIGEN_CI_TARGET_ARCH: any
|
||||||
|
EIGEN_CI_BUILD_TARGET: doc
|
||||||
|
EIGEN_CI_INSTALL: ca-certificates clang flex python3 bison graphviz
|
||||||
|
EIGEN_CI_C_COMPILER: clang
|
||||||
|
EIGEN_CI_CXX_COMPILER: clang++
|
||||||
|
EIGEN_CI_BEFORE_SCRIPT: ". ci/scripts/build_and_install_doxygen.sh Release_1_13_2"
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "libeigen"
|
||||||
24
ci/common.gitlab-ci.yml
Normal file
24
ci/common.gitlab-ci.yml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# Base configuration for linux builds and tests.
|
||||||
|
.common:linux:cross:
|
||||||
|
image: ubuntu:20.04
|
||||||
|
variables:
|
||||||
|
EIGEN_CI_TARGET_ARCH: ""
|
||||||
|
EIGEN_CI_ADDITIONAL_ARGS: ""
|
||||||
|
# If host matches target, use the following:
|
||||||
|
EIGEN_CI_C_COMPILER: ""
|
||||||
|
EIGEN_CI_CXX_COMPILER: ""
|
||||||
|
EIGEN_CI_INSTALL: "${EIGEN_CI_C_COMPILER} ${EIGEN_CI_CXX_COMPILER}"
|
||||||
|
# If host does not match the target, use the following:
|
||||||
|
EIGEN_CI_CROSS_TARGET_TRIPLE: ""
|
||||||
|
EIGEN_CI_CROSS_C_COMPILER: ${EIGEN_CI_C_COMPILER}
|
||||||
|
EIGEN_CI_CROSS_CXX_COMPILER: ${EIGEN_CI_CXX_COMPILER}
|
||||||
|
EIGEN_CI_CROSS_INSTALL: "${EIGEN_CI_CROSS_C_COMPILER} ${EIGEN_CI_CROSS_CXX_COMPILER}"
|
||||||
|
before_script:
|
||||||
|
# Call script in current shell - it sets up some environment variables.
|
||||||
|
- . ci/scripts/common.linux.before_script.sh
|
||||||
|
artifacts:
|
||||||
|
when: always
|
||||||
|
name: "$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG"
|
||||||
|
paths:
|
||||||
|
- ${EIGEN_CI_BUILDDIR}/
|
||||||
|
expire_in: 5 days
|
||||||
25
ci/deploy.gitlab-ci.yml
Normal file
25
ci/deploy.gitlab-ci.yml
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
# Upload docs if pipeline succeeded.
|
||||||
|
deploy:docs:
|
||||||
|
stage: deploy
|
||||||
|
image: busybox
|
||||||
|
dependencies: [ build:linux:docs ]
|
||||||
|
variables:
|
||||||
|
PAGES_PREFIX: docs-nightly
|
||||||
|
script:
|
||||||
|
- echo "Deploying site to $CI_PAGES_URL"
|
||||||
|
- mv ${EIGEN_CI_BUILDDIR}/doc/html public
|
||||||
|
pages:
|
||||||
|
path_prefix: $PAGES_PREFIX
|
||||||
|
expire_in: never
|
||||||
|
artifacts:
|
||||||
|
name: "$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG"
|
||||||
|
paths:
|
||||||
|
- public
|
||||||
|
tags:
|
||||||
|
- saas-linux-small-amd64
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "schedule" && $CI_PROJECT_NAMESPACE == "libeigen"
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "web" && $CI_PROJECT_NAMESPACE == "libeigen"
|
||||||
|
- if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "libeigen"
|
||||||
|
variables:
|
||||||
|
PAGES_PREFIX: docs-$CI_COMMIT_REF_NAME
|
||||||
31
ci/scripts/build.linux.script.sh
Executable file
31
ci/scripts/build.linux.script.sh
Executable file
@@ -0,0 +1,31 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
# Create and enter build directory.
|
||||||
|
rootdir=`pwd`
|
||||||
|
mkdir -p ${EIGEN_CI_BUILDDIR}
|
||||||
|
cd ${EIGEN_CI_BUILDDIR}
|
||||||
|
|
||||||
|
# Configure build.
|
||||||
|
cmake -G Ninja \
|
||||||
|
-DCMAKE_CXX_COMPILER=${EIGEN_CI_CXX_COMPILER} \
|
||||||
|
-DCMAKE_C_COMPILER=${EIGEN_CI_C_COMPILER} \
|
||||||
|
-DCMAKE_CXX_COMPILER_TARGET=${EIGEN_CI_CXX_COMPILER_TARGET} \
|
||||||
|
${EIGEN_CI_ADDITIONAL_ARGS} ${rootdir}
|
||||||
|
|
||||||
|
target=""
|
||||||
|
if [[ ${EIGEN_CI_BUILD_TARGET} ]]; then
|
||||||
|
target="--target ${EIGEN_CI_BUILD_TARGET}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Builds (particularly gcc) sometimes get killed, potentially when running
|
||||||
|
# out of resources. In that case, keep trying to build the remaining
|
||||||
|
# targets (k0), then try to build again with a single thread (j1) to minimize
|
||||||
|
# resource use.
|
||||||
|
cmake --build . ${target} -- -k0 || cmake --build . ${target} -- -k0 -j1
|
||||||
|
|
||||||
|
# Return to root directory.
|
||||||
|
cd ${rootdir}
|
||||||
|
|
||||||
|
set +x
|
||||||
6
ci/scripts/build_and_install_doxygen.sh
Normal file
6
ci/scripts/build_and_install_doxygen.sh
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
git clone --depth 1 --branch $1 https://github.com/doxygen/doxygen.git
|
||||||
|
cmake -B doxygen/.build -G Ninja \
|
||||||
|
-DCMAKE_CXX_COMPILER=${EIGEN_CI_CXX_COMPILER} \
|
||||||
|
-DCMAKE_C_COMPILER=${EIGEN_CI_C_COMPILER} \
|
||||||
|
doxygen
|
||||||
|
cmake --build doxygen/.build -t install
|
||||||
46
ci/scripts/common.linux.before_script.sh
Executable file
46
ci/scripts/common.linux.before_script.sh
Executable file
@@ -0,0 +1,46 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
echo "Running ${CI_JOB_NAME}"
|
||||||
|
|
||||||
|
# Get architecture and display CI configuration.
|
||||||
|
export ARCH=`uname -m`
|
||||||
|
export NPROC=`nproc`
|
||||||
|
echo "arch=$ARCH, target=${EIGEN_CI_TARGET_ARCH}"
|
||||||
|
echo "Processors: ${NPROC}"
|
||||||
|
echo "CI Variables:"
|
||||||
|
export | grep EIGEN
|
||||||
|
|
||||||
|
# Set noninteractive, otherwise tzdata may be installed and prompt for a
|
||||||
|
# geographical region.
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
apt-get update -y > /dev/null
|
||||||
|
apt-get install -y --no-install-recommends ninja-build cmake git > /dev/null
|
||||||
|
|
||||||
|
# Install required dependencies and set up compilers.
|
||||||
|
# These are required even for testing to ensure that dynamic runtime libraries
|
||||||
|
# are available.
|
||||||
|
if [[ "$ARCH" == "${EIGEN_CI_TARGET_ARCH}" || "${EIGEN_CI_TARGET_ARCH}" == "any" ]]; then
|
||||||
|
apt-get install -y --no-install-recommends ${EIGEN_CI_INSTALL} > /dev/null;
|
||||||
|
export EIGEN_CI_CXX_IMPLICIT_INCLUDE_DIRECTORIES="";
|
||||||
|
export EIGEN_CI_CXX_COMPILER_TARGET="";
|
||||||
|
else
|
||||||
|
apt-get install -y --no-install-recommends ${EIGEN_CI_CROSS_INSTALL} > /dev/null;
|
||||||
|
export EIGEN_CI_C_COMPILER=${EIGEN_CI_CROSS_C_COMPILER};
|
||||||
|
export EIGEN_CI_CXX_COMPILER=${EIGEN_CI_CROSS_CXX_COMPILER};
|
||||||
|
export EIGEN_CI_CXX_COMPILER_TARGET=${EIGEN_CI_CROSS_TARGET_TRIPLE};
|
||||||
|
# Tell the compiler where to find headers and libraries if using clang.
|
||||||
|
# NOTE: this breaks GCC since it messes with include path order
|
||||||
|
# (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129)
|
||||||
|
if [[ "${EIGEN_CI_CROSS_CXX_COMPILER}" == *"clang"* ]]; then
|
||||||
|
export CPLUS_INCLUDE_PATH="/usr/${EIGEN_CI_CROSS_TARGET_TRIPLE}/include";
|
||||||
|
export LIBRARY_PATH="/usr/${EIGEN_CI_CROSS_TARGET_TRIPLE}/lib64";
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Compilers: ${EIGEN_CI_C_COMPILER} ${EIGEN_CI_CXX_COMPILER}"
|
||||||
|
|
||||||
|
if [ -n "$EIGEN_CI_BEFORE_SCRIPT" ]; then eval "$EIGEN_CI_BEFORE_SCRIPT"; fi
|
||||||
|
|
||||||
|
set +x
|
||||||
@@ -19,8 +19,9 @@ find_path(UMFPACK_INCLUDES
|
|||||||
find_library(UMFPACK_LIBRARIES umfpack PATHS $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
|
find_library(UMFPACK_LIBRARIES umfpack PATHS $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
|
||||||
|
|
||||||
if(UMFPACK_LIBRARIES)
|
if(UMFPACK_LIBRARIES)
|
||||||
|
if (NOT UMFPACK_LIBDIR)
|
||||||
get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH)
|
get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH)
|
||||||
|
endif(NOT UMFPACK_LIBDIR)
|
||||||
|
|
||||||
find_library(AMD_LIBRARY amd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
|
find_library(AMD_LIBRARY amd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
|
||||||
if (AMD_LIBRARY)
|
if (AMD_LIBRARY)
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ function(workaround_9220 language language_works)
|
|||||||
set(text
|
set(text
|
||||||
"project(test NONE)
|
"project(test NONE)
|
||||||
cmake_minimum_required(VERSION 2.6.0)
|
cmake_minimum_required(VERSION 2.6.0)
|
||||||
|
set (CMAKE_Fortran_FLAGS \"${CMAKE_Fortran_FLAGS}\")
|
||||||
|
set (CMAKE_EXE_LINKER_FLAGS \"${CMAKE_EXE_LINKER_FLAGS}\")
|
||||||
enable_language(${language} OPTIONAL)
|
enable_language(${language} OPTIONAL)
|
||||||
")
|
")
|
||||||
file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/language_tests/${language})
|
file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/language_tests/${language})
|
||||||
|
|||||||
@@ -51,12 +51,12 @@ class EigenMatrixPrinter:
|
|||||||
template_params = m.split(',')
|
template_params = m.split(',')
|
||||||
template_params = map(lambda x:x.replace(" ", ""), template_params)
|
template_params = map(lambda x:x.replace(" ", ""), template_params)
|
||||||
|
|
||||||
if template_params[1] == '-0x00000000000000001' or template_params[1] == '-0x000000001':
|
if template_params[1] == '-0x00000000000000001' or template_params[1] == '-0x000000001' or template_params[1] == '-1':
|
||||||
self.rows = val['m_storage']['m_rows']
|
self.rows = val['m_storage']['m_rows']
|
||||||
else:
|
else:
|
||||||
self.rows = int(template_params[1])
|
self.rows = int(template_params[1])
|
||||||
|
|
||||||
if template_params[2] == '-0x00000000000000001' or template_params[2] == '-0x000000001':
|
if template_params[2] == '-0x00000000000000001' or template_params[2] == '-0x000000001' or template_params[2] == '-1':
|
||||||
self.cols = val['m_storage']['m_cols']
|
self.cols = val['m_storage']['m_cols']
|
||||||
else:
|
else:
|
||||||
self.cols = int(template_params[2])
|
self.cols = int(template_params[2])
|
||||||
|
|||||||
@@ -1,20 +1,28 @@
|
|||||||
find_package(Qt4 REQUIRED)
|
find_package(Qt4)
|
||||||
find_package(OpenGL REQUIRED)
|
find_package(OpenGL)
|
||||||
|
|
||||||
set(QT_USE_QTOPENGL TRUE)
|
if(QT4_FOUND AND OPENGL_FOUND)
|
||||||
include(${QT_USE_FILE})
|
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(QT_USE_QTOPENGL TRUE)
|
||||||
|
include(${QT_USE_FILE})
|
||||||
|
|
||||||
include_directories( ${QT_INCLUDE_DIR} )
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
||||||
set(quaternion_demo_SRCS gpuhelper.cpp icosphere.cpp camera.cpp trackball.cpp quaternion_demo.cpp)
|
include_directories( ${QT_INCLUDE_DIR} )
|
||||||
|
|
||||||
qt4_automoc(${quaternion_demo_SRCS})
|
set(quaternion_demo_SRCS gpuhelper.cpp icosphere.cpp camera.cpp trackball.cpp quaternion_demo.cpp)
|
||||||
|
|
||||||
add_executable(quaternion_demo ${quaternion_demo_SRCS})
|
qt4_automoc(${quaternion_demo_SRCS})
|
||||||
add_dependencies(demos quaternion_demo)
|
|
||||||
|
|
||||||
target_link_libraries(quaternion_demo
|
add_executable(quaternion_demo ${quaternion_demo_SRCS})
|
||||||
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
|
add_dependencies(demos quaternion_demo)
|
||||||
${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} )
|
|
||||||
|
target_link_libraries(quaternion_demo
|
||||||
|
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
|
||||||
|
${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} )
|
||||||
|
|
||||||
|
else()
|
||||||
|
|
||||||
|
message(STATUS "OpenGL demo disabled because Qt4 and/or OpenGL have not been found.")
|
||||||
|
|
||||||
|
endif()
|
||||||
@@ -98,8 +98,8 @@ Matrix3f a;
|
|||||||
MatrixXf b;
|
MatrixXf b;
|
||||||
\endcode
|
\endcode
|
||||||
Here,
|
Here,
|
||||||
\li \c a is a 3x3 matrix, with a static float[9] array of uninitialized coefficients,
|
\li \c a is a 3-by-3 matrix, with a plain float[9] array of uninitialized coefficients,
|
||||||
\li \c b is a dynamic-size matrix whose size is currently 0x0, and whose array of
|
\li \c b is a dynamic-size matrix whose size is currently 0-by-0, and whose array of
|
||||||
coefficients hasn't yet been allocated at all.
|
coefficients hasn't yet been allocated at all.
|
||||||
|
|
||||||
Constructors taking sizes are also available. For matrices, the number of rows is always passed first.
|
Constructors taking sizes are also available. For matrices, the number of rows is always passed first.
|
||||||
@@ -216,7 +216,7 @@ The simple answer is: use fixed
|
|||||||
sizes for very small sizes where you can, and use dynamic sizes for larger sizes or where you have to. For small sizes,
|
sizes for very small sizes where you can, and use dynamic sizes for larger sizes or where you have to. For small sizes,
|
||||||
especially for sizes smaller than (roughly) 16, using fixed sizes is hugely beneficial
|
especially for sizes smaller than (roughly) 16, using fixed sizes is hugely beneficial
|
||||||
to performance, as it allows Eigen to avoid dynamic memory allocation and to unroll
|
to performance, as it allows Eigen to avoid dynamic memory allocation and to unroll
|
||||||
loops. Internally, a fixed-size Eigen matrix is just a plain static array, i.e. doing
|
loops. Internally, a fixed-size Eigen matrix is just a plain array, i.e. doing
|
||||||
\code Matrix4f mymatrix; \endcode
|
\code Matrix4f mymatrix; \endcode
|
||||||
really amounts to just doing
|
really amounts to just doing
|
||||||
\code float mymatrix[16]; \endcode
|
\code float mymatrix[16]; \endcode
|
||||||
@@ -231,8 +231,9 @@ member variables.
|
|||||||
The limitation of using fixed sizes, of course, is that this is only possible
|
The limitation of using fixed sizes, of course, is that this is only possible
|
||||||
when you know the sizes at compile time. Also, for large enough sizes, say for sizes
|
when you know the sizes at compile time. Also, for large enough sizes, say for sizes
|
||||||
greater than (roughly) 32, the performance benefit of using fixed sizes becomes negligible.
|
greater than (roughly) 32, the performance benefit of using fixed sizes becomes negligible.
|
||||||
Worse, trying to create a very large matrix using fixed sizes could result in a stack overflow,
|
Worse, trying to create a very large matrix using fixed sizes inside a function could result in a
|
||||||
since Eigen will try to allocate the array as a static array, which by default goes on the stack.
|
stack overflow, since Eigen will try to allocate the array automatically as a local variable, and
|
||||||
|
this is normally done on the stack.
|
||||||
Finally, depending on circumstances, Eigen can also be more aggressive trying to vectorize
|
Finally, depending on circumstances, Eigen can also be more aggressive trying to vectorize
|
||||||
(use SIMD instructions) when dynamic sizes are used, see \ref TopicVectorization "Vectorization".
|
(use SIMD instructions) when dynamic sizes are used, see \ref TopicVectorization "Vectorization".
|
||||||
|
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ matNxN = t.linear();
|
|||||||
\endcode</td></tr>
|
\endcode</td></tr>
|
||||||
<tr><td>
|
<tr><td>
|
||||||
extract the rotation matrix</td><td>\code
|
extract the rotation matrix</td><td>\code
|
||||||
matNxN = t.extractRotation();
|
matNxN = t.rotation();
|
||||||
\endcode</td></tr>
|
\endcode</td></tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ Describing the \a buildProblem and \a save functions is out of the scope of this
|
|||||||
|
|
||||||
The SparseMatrix and SparseVector classes take three template arguments:
|
The SparseMatrix and SparseVector classes take three template arguments:
|
||||||
* the scalar type (e.g., double)
|
* the scalar type (e.g., double)
|
||||||
* the storage order (ColMajor or RowMajor, the default is RowMajor)
|
* the storage order (ColMajor or RowMajor, the default is ColMajor)
|
||||||
* the inner index type (default is \c int).
|
* the inner index type (default is \c int).
|
||||||
|
|
||||||
As for dense Matrix objects, constructors takes the size of the object.
|
As for dense Matrix objects, constructors takes the size of the object.
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ set(examples_targets "")
|
|||||||
set(snippets_targets "")
|
set(snippets_targets "")
|
||||||
|
|
||||||
add_definitions("-DEIGEN_MAKING_DOCS")
|
add_definitions("-DEIGEN_MAKING_DOCS")
|
||||||
|
add_custom_target(all_examples)
|
||||||
|
|
||||||
add_subdirectory(examples)
|
add_subdirectory(examples)
|
||||||
add_subdirectory(special_examples)
|
add_subdirectory(special_examples)
|
||||||
@@ -71,7 +72,8 @@ add_custom_target(doc ALL
|
|||||||
COMMAND doxygen
|
COMMAND doxygen
|
||||||
COMMAND doxygen Doxyfile-unsupported # run doxygen twice to get proper eigen <=> unsupported cross references
|
COMMAND doxygen Doxyfile-unsupported # run doxygen twice to get proper eigen <=> unsupported cross references
|
||||||
COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc
|
COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc
|
||||||
COMMAND ${CMAKE_COMMAND} -E tar cvfz eigen-doc/eigen-doc.tgz eigen-doc/*.html eigen-doc/*.map eigen-doc/*.png eigen-doc/*.css eigen-doc/*.js eigen-doc/*.txt eigen-doc/unsupported
|
COMMAND ${CMAKE_COMMAND} -E remove eigen-doc/eigen-doc.tgz
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E tar cvfz eigen-doc/eigen-doc.tgz eigen-doc
|
||||||
COMMAND ${CMAKE_COMMAND} -E rename eigen-doc html
|
COMMAND ${CMAKE_COMMAND} -E rename eigen-doc html
|
||||||
WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc)
|
WORKING_DIRECTORY ${Eigen_BINARY_DIR}/doc)
|
||||||
|
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ TYPEDEF_HIDES_STRUCT = NO
|
|||||||
# Private class members and static file members will be hidden unless
|
# Private class members and static file members will be hidden unless
|
||||||
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
|
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
|
||||||
|
|
||||||
EXTRACT_ALL = YES
|
EXTRACT_ALL = NO
|
||||||
|
|
||||||
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
|
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
|
||||||
# will be included in the documentation.
|
# will be included in the documentation.
|
||||||
@@ -797,9 +797,7 @@ HTML_HEADER = "${Eigen_BINARY_DIR}/doc/eigendoxy_header.html"
|
|||||||
# each generated HTML page. If it is left blank doxygen will generate a
|
# each generated HTML page. If it is left blank doxygen will generate a
|
||||||
# standard footer.
|
# standard footer.
|
||||||
|
|
||||||
# the footer has not been customized yet, so let's use the default one
|
HTML_FOOTER = "${Eigen_BINARY_DIR}/doc/eigendoxy_footer.html"
|
||||||
# ${Eigen_BINARY_DIR}/doc/eigendoxy_footer.html
|
|
||||||
HTML_FOOTER =
|
|
||||||
|
|
||||||
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
|
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
|
||||||
# style sheet that is used by each HTML page. It can be used to
|
# style sheet that is used by each HTML page. It can be used to
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ All combinations are allowed: you can have a matrix with a fixed number of rows
|
|||||||
Matrix<double, 6, Dynamic> // Dynamic number of columns (heap allocation)
|
Matrix<double, 6, Dynamic> // Dynamic number of columns (heap allocation)
|
||||||
Matrix<double, Dynamic, 2> // Dynamic number of rows (heap allocation)
|
Matrix<double, Dynamic, 2> // Dynamic number of rows (heap allocation)
|
||||||
Matrix<double, Dynamic, Dynamic, RowMajor> // Fully dynamic, row major (heap allocation)
|
Matrix<double, Dynamic, Dynamic, RowMajor> // Fully dynamic, row major (heap allocation)
|
||||||
Matrix<double, 13, 3> // Fully fixed (static allocation)
|
Matrix<double, 13, 3> // Fully fixed (usually allocated on stack)
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
In most cases, you can simply use one of the convenience typedefs for \ref matrixtypedefs "matrices" and \ref arraytypedefs "arrays". Some examples:
|
In most cases, you can simply use one of the convenience typedefs for \ref matrixtypedefs "matrices" and \ref arraytypedefs "arrays". Some examples:
|
||||||
@@ -490,7 +490,7 @@ Read-write access to sub-vectors:
|
|||||||
<tr><td>\code vec1.head(n)\endcode</td><td>\code vec1.head<n>()\endcode</td><td>the first \c n coeffs </td></tr>
|
<tr><td>\code vec1.head(n)\endcode</td><td>\code vec1.head<n>()\endcode</td><td>the first \c n coeffs </td></tr>
|
||||||
<tr><td>\code vec1.tail(n)\endcode</td><td>\code vec1.tail<n>()\endcode</td><td>the last \c n coeffs </td></tr>
|
<tr><td>\code vec1.tail(n)\endcode</td><td>\code vec1.tail<n>()\endcode</td><td>the last \c n coeffs </td></tr>
|
||||||
<tr><td>\code vec1.segment(pos,n)\endcode</td><td>\code vec1.segment<n>(pos)\endcode</td>
|
<tr><td>\code vec1.segment(pos,n)\endcode</td><td>\code vec1.segment<n>(pos)\endcode</td>
|
||||||
<td>the \c n coeffs in \n the range [\c pos : \c pos + \c n [</td></tr>
|
<td>the \c n coeffs in the \n range [\c pos : \c pos + \c n - 1]</td></tr>
|
||||||
<tr class="alt"><td colspan="3">
|
<tr class="alt"><td colspan="3">
|
||||||
|
|
||||||
Read-write access to sub-matrices:</td></tr>
|
Read-write access to sub-matrices:</td></tr>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ namespace Eigen {
|
|||||||
\section TopicLinAlgBigTable Catalogue of decompositions offered by Eigen
|
\section TopicLinAlgBigTable Catalogue of decompositions offered by Eigen
|
||||||
|
|
||||||
<table class="manual-vl">
|
<table class="manual-vl">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th class="meta"></th>
|
<th class="meta"></th>
|
||||||
<th class="meta" colspan="5">Generic information, not Eigen-specific</th>
|
<th class="meta" colspan="5">Generic information, not Eigen-specific</th>
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
|
<hr class="footer"/>
|
||||||
|
|
||||||
|
<!-- Piwik -->
|
||||||
|
<script type="text/javascript">
|
||||||
|
var pkBaseURL = (("https:" == document.location.protocol) ? "https://stats.sylphide-consulting.com/piwik/" : "http://stats.sylphide-consulting.com/piwik/");
|
||||||
|
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
|
||||||
|
</script><script type="text/javascript">
|
||||||
|
try {
|
||||||
|
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 20);
|
||||||
|
piwikTracker.trackPageView();
|
||||||
|
piwikTracker.enableLinkTracking();
|
||||||
|
} catch( err ) {}
|
||||||
|
</script><noscript><p><img src="http://stats.sylphide-consulting.com/piwik/piwik.php?idsite=20" style="border:0" alt="" /></p></noscript>
|
||||||
|
<!-- End Piwik Tracking Code -->
|
||||||
|
|
||||||
<hr class="footer"/><address class="footer"><small>
|
|
||||||
<a href="http://www.doxygen.org/index.html"><img class="footer" src="$relpath$doxygen.png" alt="doxygen"/></a></small></address>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
file(GLOB examples_SRCS "*.cpp")
|
file(GLOB examples_SRCS "*.cpp")
|
||||||
|
|
||||||
add_custom_target(all_examples)
|
|
||||||
|
|
||||||
foreach(example_src ${examples_SRCS})
|
foreach(example_src ${examples_SRCS})
|
||||||
get_filename_component(example ${example_src} NAME_WE)
|
get_filename_component(example ${example_src} NAME_WE)
|
||||||
add_executable(${example} ${example_src})
|
add_executable(${example} ${example_src})
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ using namespace std;
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
MatrixXf m = MatrixXf::Random(3,3);
|
MatrixXd m = MatrixXd::Random(3,3);
|
||||||
m = (m + MatrixXf::Constant(3,3,1.2)) * 50;
|
m = (m + MatrixXd::Constant(3,3,1.2)) * 50;
|
||||||
cout << "m =" << endl << m << endl;
|
cout << "m =" << endl << m << endl;
|
||||||
VectorXf v(3);
|
VectorXd v(3);
|
||||||
v << 1, 2, 3;
|
v << 1, 2, 3;
|
||||||
cout << "m * v =" << endl << m * v << endl;
|
cout << "m * v =" << endl << m * v << endl;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ using namespace std;
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
Matrix3f m = Matrix3f::Random();
|
Matrix3d m = Matrix3d::Random();
|
||||||
m = (m + Matrix3f::Constant(1.2)) * 50;
|
m = (m + Matrix3d::Constant(1.2)) * 50;
|
||||||
cout << "m =" << endl << m << endl;
|
cout << "m =" << endl << m << endl;
|
||||||
Vector3f v(1,2,3);
|
Vector3d v(1,2,3);
|
||||||
|
|
||||||
cout << "m * v =" << endl << m * v << endl;
|
cout << "m * v =" << endl << m * v << endl;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,4 +17,5 @@ if(QT4_FOUND)
|
|||||||
COMMAND Tutorial_sparse_example
|
COMMAND Tutorial_sparse_example
|
||||||
ARGS ${CMAKE_CURRENT_BINARY_DIR}/../html/Tutorial_sparse_example.jpeg
|
ARGS ${CMAKE_CURRENT_BINARY_DIR}/../html/Tutorial_sparse_example.jpeg
|
||||||
)
|
)
|
||||||
|
add_dependencies(all_examples Tutorial_sparse_example)
|
||||||
endif(QT4_FOUND)
|
endif(QT4_FOUND)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ mkdir build -p
|
|||||||
|
|
||||||
#step 2 : upload
|
#step 2 : upload
|
||||||
# (the '/' at the end of path is very important, see rsync documentation)
|
# (the '/' at the end of path is very important, see rsync documentation)
|
||||||
rsync -az --no-p --delete build/doc/html/ $USER@ssh.tuxfamily.org:eigen/eigen.tuxfamily.org-web/htdocs/dox-devel/ || { echo "upload failed"; exit 1; }
|
rsync -az --no-p --delete build/doc/html/ $USER@ssh.tuxfamily.org:eigen/eigen.tuxfamily.org-web/htdocs/dox/ || { echo "upload failed"; exit 1; }
|
||||||
|
|
||||||
#step 3 : fix the perm
|
#step 3 : fix the perm
|
||||||
ssh $USER@ssh.tuxfamily.org 'chmod -R g+w /home/eigen/eigen.tuxfamily.org-web/htdocs/dox-devel' || { echo "perm failed"; exit 1; }
|
ssh $USER@ssh.tuxfamily.org 'chmod -R g+w /home/eigen/eigen.tuxfamily.org-web/htdocs/dox-devel' || { echo "perm failed"; exit 1; }
|
||||||
|
|||||||
@@ -42,10 +42,10 @@ template<typename MatrixType> void array_for_matrix(const MatrixType& m)
|
|||||||
VERIFY_IS_APPROX(m3, (m1.array() - s1).matrix());
|
VERIFY_IS_APPROX(m3, (m1.array() - s1).matrix());
|
||||||
|
|
||||||
// reductions
|
// reductions
|
||||||
VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum().sum() - m1.sum(), m1.cwiseAbs().maxCoeff());
|
VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum().sum() - m1.sum(), m1.squaredNorm());
|
||||||
VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum().sum() - m1.sum(), m1.cwiseAbs().maxCoeff());
|
VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum().sum() - m1.sum(), m1.squaredNorm());
|
||||||
VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum() + m2.colwise().sum() - (m1+m2).colwise().sum(), (m1+m2).cwiseAbs().maxCoeff());
|
VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum() + m2.colwise().sum() - (m1+m2).colwise().sum(), (m1+m2).squaredNorm());
|
||||||
VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum() - m2.rowwise().sum() - (m1-m2).rowwise().sum(), (m1-m2).cwiseAbs().maxCoeff());
|
VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum() - m2.rowwise().sum() - (m1-m2).rowwise().sum(), (m1-m2).squaredNorm());
|
||||||
VERIFY_IS_APPROX(m1.colwise().sum(), m1.colwise().redux(internal::scalar_sum_op<Scalar>()));
|
VERIFY_IS_APPROX(m1.colwise().sum(), m1.colwise().redux(internal::scalar_sum_op<Scalar>()));
|
||||||
|
|
||||||
// vector-wise ops
|
// vector-wise ops
|
||||||
@@ -168,6 +168,38 @@ template<typename MatrixType> void cwise_min_max(const MatrixType& m)
|
|||||||
VERIFY_IS_APPROX(MatrixType::Constant(rows,cols, maxM1), m1.cwiseMax( maxM1));
|
VERIFY_IS_APPROX(MatrixType::Constant(rows,cols, maxM1), m1.cwiseMax( maxM1));
|
||||||
VERIFY_IS_APPROX(m1, m1.cwiseMax( minM1));
|
VERIFY_IS_APPROX(m1, m1.cwiseMax( minM1));
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(MatrixType::Constant(rows,cols, minM1).array(), (m1.array().min)( minM1));
|
||||||
|
VERIFY_IS_APPROX(m1.array(), (m1.array().min)( maxM1));
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(MatrixType::Constant(rows,cols, maxM1).array(), (m1.array().max)( maxM1));
|
||||||
|
VERIFY_IS_APPROX(m1.array(), (m1.array().max)( minM1));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename MatrixTraits> void resize(const MatrixTraits& t)
|
||||||
|
{
|
||||||
|
typedef typename MatrixTraits::Index Index;
|
||||||
|
typedef typename MatrixTraits::Scalar Scalar;
|
||||||
|
typedef Matrix<Scalar,Dynamic,Dynamic> MatrixType;
|
||||||
|
typedef Array<Scalar,Dynamic,Dynamic> Array2DType;
|
||||||
|
typedef Matrix<Scalar,Dynamic,1> VectorType;
|
||||||
|
typedef Array<Scalar,Dynamic,1> Array1DType;
|
||||||
|
|
||||||
|
Index rows = t.rows(), cols = t.cols();
|
||||||
|
|
||||||
|
MatrixType m(rows,cols);
|
||||||
|
VectorType v(rows);
|
||||||
|
Array2DType a2(rows,cols);
|
||||||
|
Array1DType a1(rows);
|
||||||
|
|
||||||
|
m.array().resize(rows+1,cols+1);
|
||||||
|
VERIFY(m.rows()==rows+1 && m.cols()==cols+1);
|
||||||
|
a2.matrix().resize(rows+1,cols+1);
|
||||||
|
VERIFY(a2.rows()==rows+1 && a2.cols()==cols+1);
|
||||||
|
v.array().resize(cols);
|
||||||
|
VERIFY(v.size()==cols);
|
||||||
|
a1.matrix().resize(cols);
|
||||||
|
VERIFY(a1.size()==cols);
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_array_for_matrix()
|
void test_array_for_matrix()
|
||||||
@@ -202,4 +234,9 @@ void test_array_for_matrix()
|
|||||||
CALL_SUBTEST_5( lpNorm(VectorXf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
CALL_SUBTEST_5( lpNorm(VectorXf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
||||||
CALL_SUBTEST_4( lpNorm(VectorXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
CALL_SUBTEST_4( lpNorm(VectorXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
||||||
}
|
}
|
||||||
|
for(int i = 0; i < g_repeat; i++) {
|
||||||
|
CALL_SUBTEST_4( resize(MatrixXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
||||||
|
CALL_SUBTEST_5( resize(MatrixXf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
||||||
|
CALL_SUBTEST_6( resize(MatrixXi(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,12 +56,12 @@ template<typename MatrixType> void diagonal(const MatrixType& m)
|
|||||||
VERIFY_IS_APPROX(m2.template diagonal<N2>()[0], static_cast<Scalar>(6) * m1.template diagonal<N2>()[0]);
|
VERIFY_IS_APPROX(m2.template diagonal<N2>()[0], static_cast<Scalar>(6) * m1.template diagonal<N2>()[0]);
|
||||||
|
|
||||||
m2.diagonal(N1) = 2 * m1.diagonal(N1);
|
m2.diagonal(N1) = 2 * m1.diagonal(N1);
|
||||||
VERIFY_IS_APPROX(m2.diagonal<N1>(), static_cast<Scalar>(2) * m1.diagonal(N1));
|
VERIFY_IS_APPROX(m2.template diagonal<N1>(), static_cast<Scalar>(2) * m1.diagonal(N1));
|
||||||
m2.diagonal(N1)[0] *= 3;
|
m2.diagonal(N1)[0] *= 3;
|
||||||
VERIFY_IS_APPROX(m2.diagonal(N1)[0], static_cast<Scalar>(6) * m1.diagonal(N1)[0]);
|
VERIFY_IS_APPROX(m2.diagonal(N1)[0], static_cast<Scalar>(6) * m1.diagonal(N1)[0]);
|
||||||
|
|
||||||
m2.diagonal(N2) = 2 * m1.diagonal(N2);
|
m2.diagonal(N2) = 2 * m1.diagonal(N2);
|
||||||
VERIFY_IS_APPROX(m2.diagonal<N2>(), static_cast<Scalar>(2) * m1.diagonal(N2));
|
VERIFY_IS_APPROX(m2.template diagonal<N2>(), static_cast<Scalar>(2) * m1.diagonal(N2));
|
||||||
m2.diagonal(N2)[0] *= 3;
|
m2.diagonal(N2)[0] *= 3;
|
||||||
VERIFY_IS_APPROX(m2.diagonal(N2)[0], static_cast<Scalar>(6) * m1.diagonal(N2)[0]);
|
VERIFY_IS_APPROX(m2.diagonal(N2)[0], static_cast<Scalar>(6) * m1.diagonal(N2)[0]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ template<typename MatrixType> void diagonalmatrices(const MatrixType& m)
|
|||||||
rv2 = RowVectorType::Random(cols);
|
rv2 = RowVectorType::Random(cols);
|
||||||
LeftDiagonalMatrix ldm1(v1), ldm2(v2);
|
LeftDiagonalMatrix ldm1(v1), ldm2(v2);
|
||||||
RightDiagonalMatrix rdm1(rv1), rdm2(rv2);
|
RightDiagonalMatrix rdm1(rv1), rdm2(rv2);
|
||||||
|
|
||||||
|
Scalar s1 = internal::random<Scalar>();
|
||||||
|
|
||||||
SquareMatrixType sq_m1 (v1.asDiagonal());
|
SquareMatrixType sq_m1 (v1.asDiagonal());
|
||||||
VERIFY_IS_APPROX(sq_m1, v1.asDiagonal().toDenseMatrix());
|
VERIFY_IS_APPROX(sq_m1, v1.asDiagonal().toDenseMatrix());
|
||||||
@@ -76,6 +78,13 @@ template<typename MatrixType> void diagonalmatrices(const MatrixType& m)
|
|||||||
big.block(i,j,rows,cols) = big.block(i,j,rows,cols) * rv1.asDiagonal();
|
big.block(i,j,rows,cols) = big.block(i,j,rows,cols) * rv1.asDiagonal();
|
||||||
VERIFY_IS_APPROX((big.block(i,j,rows,cols)) , m1 * rv1.asDiagonal() );
|
VERIFY_IS_APPROX((big.block(i,j,rows,cols)) , m1 * rv1.asDiagonal() );
|
||||||
|
|
||||||
|
|
||||||
|
// scalar multiple
|
||||||
|
VERIFY_IS_APPROX(LeftDiagonalMatrix(ldm1*s1).diagonal(), ldm1.diagonal() * s1);
|
||||||
|
VERIFY_IS_APPROX(LeftDiagonalMatrix(s1*ldm1).diagonal(), s1 * ldm1.diagonal());
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(m1 * (rdm1 * s1), (m1 * rdm1) * s1);
|
||||||
|
VERIFY_IS_APPROX(m1 * (s1 * rdm1), (m1 * rdm1) * s1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_diagonalmatrices()
|
void test_diagonalmatrices()
|
||||||
|
|||||||
@@ -171,23 +171,36 @@ template<typename Scalar, int Options> void quaternion(void)
|
|||||||
|
|
||||||
template<typename Scalar> void mapQuaternion(void){
|
template<typename Scalar> void mapQuaternion(void){
|
||||||
typedef Map<Quaternion<Scalar>, Aligned> MQuaternionA;
|
typedef Map<Quaternion<Scalar>, Aligned> MQuaternionA;
|
||||||
|
typedef Map<const Quaternion<Scalar>, Aligned> MCQuaternionA;
|
||||||
typedef Map<Quaternion<Scalar> > MQuaternionUA;
|
typedef Map<Quaternion<Scalar> > MQuaternionUA;
|
||||||
typedef Map<const Quaternion<Scalar> > MCQuaternionUA;
|
typedef Map<const Quaternion<Scalar> > MCQuaternionUA;
|
||||||
typedef Quaternion<Scalar> Quaternionx;
|
typedef Quaternion<Scalar> Quaternionx;
|
||||||
|
typedef Matrix<Scalar,3,1> Vector3;
|
||||||
|
typedef AngleAxis<Scalar> AngleAxisx;
|
||||||
|
|
||||||
|
Vector3 v0 = Vector3::Random(),
|
||||||
|
v1 = Vector3::Random();
|
||||||
|
Scalar a = internal::random<Scalar>(-Scalar(M_PI), Scalar(M_PI));
|
||||||
|
|
||||||
EIGEN_ALIGN16 Scalar array1[4];
|
EIGEN_ALIGN16 Scalar array1[4];
|
||||||
EIGEN_ALIGN16 Scalar array2[4];
|
EIGEN_ALIGN16 Scalar array2[4];
|
||||||
EIGEN_ALIGN16 Scalar array3[4+1];
|
EIGEN_ALIGN16 Scalar array3[4+1];
|
||||||
Scalar* array3unaligned = array3+1;
|
Scalar* array3unaligned = array3+1;
|
||||||
|
|
||||||
|
MQuaternionA mq1(array1);
|
||||||
|
MCQuaternionA mcq1(array1);
|
||||||
|
MQuaternionA mq2(array2);
|
||||||
|
MQuaternionUA mq3(array3unaligned);
|
||||||
|
MCQuaternionUA mcq3(array3unaligned);
|
||||||
|
|
||||||
// std::cerr << array1 << " " << array2 << " " << array3 << "\n";
|
// std::cerr << array1 << " " << array2 << " " << array3 << "\n";
|
||||||
MQuaternionA(array1).coeffs().setRandom();
|
mq1 = AngleAxisx(a, v0.normalized());
|
||||||
(MQuaternionA(array2)) = MQuaternionA(array1);
|
mq2 = mq1;
|
||||||
(MQuaternionUA(array3unaligned)) = MQuaternionA(array1);
|
mq3 = mq1;
|
||||||
|
|
||||||
Quaternionx q1 = MQuaternionA(array1);
|
Quaternionx q1 = mq1;
|
||||||
Quaternionx q2 = MQuaternionA(array2);
|
Quaternionx q2 = mq2;
|
||||||
Quaternionx q3 = MQuaternionUA(array3unaligned);
|
Quaternionx q3 = mq3;
|
||||||
Quaternionx q4 = MCQuaternionUA(array3unaligned);
|
Quaternionx q4 = MCQuaternionUA(array3unaligned);
|
||||||
|
|
||||||
VERIFY_IS_APPROX(q1.coeffs(), q2.coeffs());
|
VERIFY_IS_APPROX(q1.coeffs(), q2.coeffs());
|
||||||
@@ -197,6 +210,23 @@ template<typename Scalar> void mapQuaternion(void){
|
|||||||
if(internal::packet_traits<Scalar>::Vectorizable)
|
if(internal::packet_traits<Scalar>::Vectorizable)
|
||||||
VERIFY_RAISES_ASSERT((MQuaternionA(array3unaligned)));
|
VERIFY_RAISES_ASSERT((MQuaternionA(array3unaligned)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(mq1 * (mq1.inverse() * v1), v1);
|
||||||
|
VERIFY_IS_APPROX(mq1 * (mq1.conjugate() * v1), v1);
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(mcq1 * (mcq1.inverse() * v1), v1);
|
||||||
|
VERIFY_IS_APPROX(mcq1 * (mcq1.conjugate() * v1), v1);
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(mq3 * (mq3.inverse() * v1), v1);
|
||||||
|
VERIFY_IS_APPROX(mq3 * (mq3.conjugate() * v1), v1);
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(mcq3 * (mcq3.inverse() * v1), v1);
|
||||||
|
VERIFY_IS_APPROX(mcq3 * (mcq3.conjugate() * v1), v1);
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(mq1*mq2, q1*q2);
|
||||||
|
VERIFY_IS_APPROX(mq3*mq2, q3*q2);
|
||||||
|
VERIFY_IS_APPROX(mcq1*mq2, q1*q2);
|
||||||
|
VERIFY_IS_APPROX(mcq3*mq2, q3*q2);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename Scalar> void quaternionAlignment(void){
|
template<typename Scalar> void quaternionAlignment(void){
|
||||||
|
|||||||
@@ -91,6 +91,12 @@ void testVectorType(const VectorType& base)
|
|||||||
scalar.setLinSpaced(1,low,high);
|
scalar.setLinSpaced(1,low,high);
|
||||||
VERIFY_IS_APPROX( scalar, ScalarMatrix::Constant(high) );
|
VERIFY_IS_APPROX( scalar, ScalarMatrix::Constant(high) );
|
||||||
VERIFY_IS_APPROX( ScalarMatrix::LinSpaced(1,low,high), ScalarMatrix::Constant(high) );
|
VERIFY_IS_APPROX( ScalarMatrix::LinSpaced(1,low,high), ScalarMatrix::Constant(high) );
|
||||||
|
|
||||||
|
// regression test for bug 526 (linear vectorized transversal)
|
||||||
|
if (size > 1) {
|
||||||
|
m.tail(size-1).setLinSpaced(low, high);
|
||||||
|
VERIFY_IS_APPROX(m(size-1), high);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename MatrixType>
|
template<typename MatrixType>
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ template<typename Scalar> bool areApprox(const Scalar* a, const Scalar* b, int s
|
|||||||
{
|
{
|
||||||
for (int i=0; i<size; ++i)
|
for (int i=0; i<size; ++i)
|
||||||
{
|
{
|
||||||
if (!internal::isApprox(a[i],b[i]))
|
if (a[i]!=b[i] && !internal::isApprox(a[i],b[i]))
|
||||||
{
|
{
|
||||||
std::cout << "[" << Map<const Matrix<Scalar,1,Dynamic> >(a,size) << "]" << " != " << Map<const Matrix<Scalar,1,Dynamic> >(b,size) << "\n";
|
std::cout << "[" << Map<const Matrix<Scalar,1,Dynamic> >(a,size) << "]" << " != " << Map<const Matrix<Scalar,1,Dynamic> >(b,size) << "\n";
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -135,6 +135,35 @@ void zero_sized_objects()
|
|||||||
a*b;
|
a*b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void unaligned_objects()
|
||||||
|
{
|
||||||
|
// Regression test for the bug reported here:
|
||||||
|
// http://forum.kde.org/viewtopic.php?f=74&t=107541
|
||||||
|
// Recall the matrix*vector kernel avoid unaligned loads by loading two packets and then reassemble then.
|
||||||
|
// There was a mistake in the computation of the valid range for fully unaligned objects: in some rare cases,
|
||||||
|
// memory was read outside the allocated matrix memory. Though the values were not used, this might raise segfault.
|
||||||
|
for(int m=450;m<460;++m)
|
||||||
|
{
|
||||||
|
for(int n=8;n<12;++n)
|
||||||
|
{
|
||||||
|
MatrixXf M(m, n);
|
||||||
|
VectorXf v1(n), r1(500);
|
||||||
|
RowVectorXf v2(m), r2(16);
|
||||||
|
|
||||||
|
M.setRandom();
|
||||||
|
v1.setRandom();
|
||||||
|
v2.setRandom();
|
||||||
|
for(int o=0; o<4; ++o)
|
||||||
|
{
|
||||||
|
r1.segment(o,m).noalias() = M * v1;
|
||||||
|
VERIFY_IS_APPROX(r1.segment(o,m), M * MatrixXf(v1));
|
||||||
|
r2.segment(o,n).noalias() = v2 * M;
|
||||||
|
VERIFY_IS_APPROX(r2.segment(o,n), MatrixXf(v2) * M);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void test_product_extra()
|
void test_product_extra()
|
||||||
{
|
{
|
||||||
for(int i = 0; i < g_repeat; i++) {
|
for(int i = 0; i < g_repeat; i++) {
|
||||||
@@ -143,6 +172,7 @@ void test_product_extra()
|
|||||||
CALL_SUBTEST_2( mat_mat_scalar_scalar_product() );
|
CALL_SUBTEST_2( mat_mat_scalar_scalar_product() );
|
||||||
CALL_SUBTEST_3( product_extra(MatrixXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2), internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2))) );
|
CALL_SUBTEST_3( product_extra(MatrixXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2), internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2))) );
|
||||||
CALL_SUBTEST_4( product_extra(MatrixXcd(internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2), internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2))) );
|
CALL_SUBTEST_4( product_extra(MatrixXcd(internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2), internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2))) );
|
||||||
CALL_SUBTEST_5( zero_sized_objects() );
|
|
||||||
}
|
}
|
||||||
|
CALL_SUBTEST_5( zero_sized_objects() );
|
||||||
|
CALL_SUBTEST_6( unaligned_objects() );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,5 +178,30 @@ initSparse(double density,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename Scalar> void
|
||||||
|
initSparse(double density,
|
||||||
|
Matrix<Scalar,1,Dynamic>& refVec,
|
||||||
|
SparseVector<Scalar,RowMajor>& sparseVec,
|
||||||
|
std::vector<int>* zeroCoords = 0,
|
||||||
|
std::vector<int>* nonzeroCoords = 0)
|
||||||
|
{
|
||||||
|
sparseVec.reserve(int(refVec.size()*density));
|
||||||
|
sparseVec.setZero();
|
||||||
|
for(int i=0; i<refVec.size(); i++)
|
||||||
|
{
|
||||||
|
Scalar v = (internal::random<double>(0,1) < density) ? internal::random<Scalar>() : Scalar(0);
|
||||||
|
if (v!=Scalar(0))
|
||||||
|
{
|
||||||
|
sparseVec.insertBack(i) = v;
|
||||||
|
if (nonzeroCoords)
|
||||||
|
nonzeroCoords->push_back(i);
|
||||||
|
}
|
||||||
|
else if (zeroCoords)
|
||||||
|
zeroCoords->push_back(i);
|
||||||
|
refVec[i] = v;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#include <unsupported/Eigen/SparseExtra>
|
#include <unsupported/Eigen/SparseExtra>
|
||||||
#endif // EIGEN_TESTSPARSE_H
|
#endif // EIGEN_TESTSPARSE_H
|
||||||
|
|||||||
@@ -193,6 +193,12 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
|
|||||||
// sparse cwise* dense
|
// sparse cwise* dense
|
||||||
VERIFY_IS_APPROX(m3.cwiseProduct(refM4), refM3.cwiseProduct(refM4));
|
VERIFY_IS_APPROX(m3.cwiseProduct(refM4), refM3.cwiseProduct(refM4));
|
||||||
// VERIFY_IS_APPROX(m3.cwise()/refM4, refM3.cwise()/refM4);
|
// VERIFY_IS_APPROX(m3.cwise()/refM4, refM3.cwise()/refM4);
|
||||||
|
|
||||||
|
// test aliasing
|
||||||
|
VERIFY_IS_APPROX((m1 = -m1), (refM1 = -refM1));
|
||||||
|
VERIFY_IS_APPROX((m1 = m1.transpose()), (refM1 = refM1.transpose().eval()));
|
||||||
|
VERIFY_IS_APPROX((m1 = -m1.transpose()), (refM1 = -refM1.transpose().eval()));
|
||||||
|
VERIFY_IS_APPROX((m1 += -m1), (refM1 += -refM1));
|
||||||
}
|
}
|
||||||
|
|
||||||
// test transpose
|
// test transpose
|
||||||
|
|||||||
@@ -46,8 +46,10 @@ template<typename SparseMatrixType> void sparse_product()
|
|||||||
double density = (std::max)(8./(rows*cols), 0.01);
|
double density = (std::max)(8./(rows*cols), 0.01);
|
||||||
typedef Matrix<Scalar,Dynamic,Dynamic> DenseMatrix;
|
typedef Matrix<Scalar,Dynamic,Dynamic> DenseMatrix;
|
||||||
typedef Matrix<Scalar,Dynamic,1> DenseVector;
|
typedef Matrix<Scalar,Dynamic,1> DenseVector;
|
||||||
|
typedef Matrix<Scalar,1,Dynamic> RowDenseVector;
|
||||||
Scalar s1 = internal::random<Scalar>();
|
typedef SparseVector<Scalar,0,Index> ColSpVector;
|
||||||
|
typedef SparseVector<Scalar,RowMajor,Index> RowSpVector;Scalar s1 = internal::random<Scalar>();
|
||||||
|
|
||||||
Scalar s2 = internal::random<Scalar>();
|
Scalar s2 = internal::random<Scalar>();
|
||||||
|
|
||||||
// test matrix-matrix product
|
// test matrix-matrix product
|
||||||
@@ -117,6 +119,21 @@ template<typename SparseMatrixType> void sparse_product()
|
|||||||
test_outer<SparseMatrixType,DenseMatrix>::run(m2,m4,refMat2,refMat4);
|
test_outer<SparseMatrixType,DenseMatrix>::run(m2,m4,refMat2,refMat4);
|
||||||
|
|
||||||
VERIFY_IS_APPROX(m6=m6*m6, refMat6=refMat6*refMat6);
|
VERIFY_IS_APPROX(m6=m6*m6, refMat6=refMat6*refMat6);
|
||||||
|
|
||||||
|
// sparse matrix * sparse vector
|
||||||
|
ColSpVector cv0(cols), cv1;
|
||||||
|
DenseVector dcv0(cols), dcv1;
|
||||||
|
initSparse(2*density,dcv0, cv0);
|
||||||
|
|
||||||
|
RowSpVector rv0(depth), rv1;
|
||||||
|
RowDenseVector drv0(depth), drv1(rv1);
|
||||||
|
initSparse(2*density,drv0, rv0);
|
||||||
|
|
||||||
|
VERIFY_IS_APPROX(cv1=rv0*m3, dcv1=drv0*refMat3);
|
||||||
|
VERIFY_IS_APPROX(rv1=rv0*m3, drv1=drv0*refMat3);
|
||||||
|
VERIFY_IS_APPROX(cv1=m3*cv0, dcv1=refMat3*dcv0);
|
||||||
|
VERIFY_IS_APPROX(cv1=m3t.adjoint()*cv0, dcv1=refMat3t.adjoint()*dcv0);
|
||||||
|
VERIFY_IS_APPROX(rv1=m3*cv0, drv1=refMat3*dcv0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// test matrix - diagonal product
|
// test matrix - diagonal product
|
||||||
|
|||||||
@@ -78,6 +78,17 @@ template<typename Scalar> void sparse_vector(int rows, int cols)
|
|||||||
|
|
||||||
VERIFY_IS_APPROX(v1.squaredNorm(), refV1.squaredNorm());
|
VERIFY_IS_APPROX(v1.squaredNorm(), refV1.squaredNorm());
|
||||||
|
|
||||||
|
// test aliasing
|
||||||
|
VERIFY_IS_APPROX((v1 = -v1), (refV1 = -refV1));
|
||||||
|
VERIFY_IS_APPROX((v1 = v1.transpose()), (refV1 = refV1.transpose().eval()));
|
||||||
|
VERIFY_IS_APPROX((v1 += -v1), (refV1 += -refV1));
|
||||||
|
|
||||||
|
// sparse matrix to sparse vector
|
||||||
|
SparseMatrixType mv1;
|
||||||
|
VERIFY_IS_APPROX((mv1=v1),v1);
|
||||||
|
VERIFY_IS_APPROX(mv1,(v1=mv1));
|
||||||
|
VERIFY_IS_APPROX(mv1,(v1=mv1.transpose()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void test_sparse_vector()
|
void test_sparse_vector()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// This file is part of Eugenio, a lightweight C++ template library
|
// This file is part of Eigen, a lightweight C++ template library
|
||||||
// for linear algebra.
|
// for linear algebra.
|
||||||
//
|
//
|
||||||
// Copyright (C) 2009 Thomas Capricelli <orzel@freehackers.org>
|
// Copyright (C) 2009 Thomas Capricelli <orzel@freehackers.org>
|
||||||
|
|||||||
@@ -62,7 +62,9 @@ void pseudo_inverse(const CMatrix &C, CINVMatrix &CINV)
|
|||||||
Scalar rho, rho_1, alpha;
|
Scalar rho, rho_1, alpha;
|
||||||
d.setZero();
|
d.setZero();
|
||||||
|
|
||||||
CINV.startFill(); // FIXME estimate the number of non-zeros
|
typedef Triplet<double> T;
|
||||||
|
std::vector<T> tripletList;
|
||||||
|
|
||||||
for (Index i = 0; i < rows; ++i)
|
for (Index i = 0; i < rows; ++i)
|
||||||
{
|
{
|
||||||
d[i] = 1.0;
|
d[i] = 1.0;
|
||||||
@@ -88,11 +90,12 @@ void pseudo_inverse(const CMatrix &C, CINVMatrix &CINV)
|
|||||||
// FIXME add a generic "prune/filter" expression for both dense and sparse object to sparse
|
// FIXME add a generic "prune/filter" expression for both dense and sparse object to sparse
|
||||||
for (Index j=0; j<l.size(); ++j)
|
for (Index j=0; j<l.size(); ++j)
|
||||||
if (l[j]<1e-15)
|
if (l[j]<1e-15)
|
||||||
CINV.fill(i,j) = l[j];
|
tripletList.push_back(T(i,j,l(j)));
|
||||||
|
|
||||||
|
|
||||||
d[i] = 0.0;
|
d[i] = 0.0;
|
||||||
}
|
}
|
||||||
CINV.endFill();
|
CINV.setFromTriplets(tripletList.begin(), tripletList.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -107,6 +110,7 @@ template<typename TMatrix, typename CMatrix,
|
|||||||
void constrained_cg(const TMatrix& A, const CMatrix& C, VectorX& x,
|
void constrained_cg(const TMatrix& A, const CMatrix& C, VectorX& x,
|
||||||
const VectorB& b, const VectorF& f, IterationController &iter)
|
const VectorB& b, const VectorF& f, IterationController &iter)
|
||||||
{
|
{
|
||||||
|
using std::sqrt;
|
||||||
typedef typename TMatrix::Scalar Scalar;
|
typedef typename TMatrix::Scalar Scalar;
|
||||||
typedef typename TMatrix::Index Index;
|
typedef typename TMatrix::Index Index;
|
||||||
typedef Matrix<Scalar,Dynamic,1> TmpVec;
|
typedef Matrix<Scalar,Dynamic,1> TmpVec;
|
||||||
|
|||||||
@@ -195,24 +195,24 @@ template <typename MatrixType>
|
|||||||
int MatrixLogarithmAtomic<MatrixType>::getPadeDegree(long double normTminusI)
|
int MatrixLogarithmAtomic<MatrixType>::getPadeDegree(long double normTminusI)
|
||||||
{
|
{
|
||||||
#if LDBL_MANT_DIG == 53 // double precision
|
#if LDBL_MANT_DIG == 53 // double precision
|
||||||
const double maxNormForPade[] = { 1.6206284795015624e-2 /* degree = 3 */ , 5.3873532631381171e-2,
|
const long double maxNormForPade[] = { 1.6206284795015624e-2L /* degree = 3 */ , 5.3873532631381171e-2L,
|
||||||
1.1352802267628681e-1, 1.8662860613541288e-1, 2.642960831111435e-1 };
|
1.1352802267628681e-1L, 1.8662860613541288e-1L, 2.642960831111435e-1L };
|
||||||
#elif LDBL_MANT_DIG <= 64 // extended precision
|
#elif LDBL_MANT_DIG <= 64 // extended precision
|
||||||
const double maxNormForPade[] = { 5.48256690357782863103e-3 /* degree = 3 */, 2.34559162387971167321e-2,
|
const long double maxNormForPade[] = { 5.48256690357782863103e-3L /* degree = 3 */, 2.34559162387971167321e-2L,
|
||||||
5.84603923897347449857e-2, 1.08486423756725170223e-1, 1.68385767881294446649e-1,
|
5.84603923897347449857e-2L, 1.08486423756725170223e-1L, 1.68385767881294446649e-1L,
|
||||||
2.32777776523703892094e-1 };
|
2.32777776523703892094e-1L };
|
||||||
#elif LDBL_MANT_DIG <= 106 // double-double
|
#elif LDBL_MANT_DIG <= 106 // double-double
|
||||||
const double maxNormForPade[] = { 8.58970550342939562202529664318890e-5 /* degree = 3 */,
|
const long double maxNormForPade[] = { 8.58970550342939562202529664318890e-5L /* degree = 3 */,
|
||||||
9.34074328446359654039446552677759e-4, 4.26117194647672175773064114582860e-3,
|
9.34074328446359654039446552677759e-4L, 4.26117194647672175773064114582860e-3L,
|
||||||
1.21546224740281848743149666560464e-2, 2.61100544998339436713088248557444e-2,
|
1.21546224740281848743149666560464e-2L, 2.61100544998339436713088248557444e-2L,
|
||||||
4.66170074627052749243018566390567e-2, 7.32585144444135027565872014932387e-2,
|
4.66170074627052749243018566390567e-2L, 7.32585144444135027565872014932387e-2L,
|
||||||
1.05026503471351080481093652651105e-1 };
|
1.05026503471351080481093652651105e-1L };
|
||||||
#else // quadruple precision
|
#else // quadruple precision
|
||||||
const double maxNormForPade[] = { 4.7419931187193005048501568167858103e-5 /* degree = 3 */,
|
const long double maxNormForPade[] = { 4.7419931187193005048501568167858103e-5L /* degree = 3 */,
|
||||||
5.8853168473544560470387769480192666e-4, 2.9216120366601315391789493628113520e-3,
|
5.8853168473544560470387769480192666e-4L, 2.9216120366601315391789493628113520e-3L,
|
||||||
8.8415758124319434347116734705174308e-3, 1.9850836029449446668518049562565291e-2,
|
8.8415758124319434347116734705174308e-3L, 1.9850836029449446668518049562565291e-2L,
|
||||||
3.6688019729653446926585242192447447e-2, 5.9290962294020186998954055264528393e-2,
|
3.6688019729653446926585242192447447e-2L, 5.9290962294020186998954055264528393e-2L,
|
||||||
8.6998436081634343903250580992127677e-2, 1.1880960220216759245467951592883642e-1 };
|
8.6998436081634343903250580992127677e-2L, 1.1880960220216759245467951592883642e-1L };
|
||||||
#endif
|
#endif
|
||||||
for (int degree = 3; degree <= maxPadeDegree; ++degree)
|
for (int degree = 3; degree <= maxPadeDegree; ++degree)
|
||||||
if (normTminusI <= maxNormForPade[degree - minPadeDegree])
|
if (normTminusI <= maxNormForPade[degree - minPadeDegree])
|
||||||
@@ -423,8 +423,8 @@ void MatrixLogarithmAtomic<MatrixType>::computePade11(MatrixType& result, const
|
|||||||
* This class holds the argument to the matrix function until it is
|
* This class holds the argument to the matrix function until it is
|
||||||
* assigned or evaluated for some other reason (so the argument
|
* assigned or evaluated for some other reason (so the argument
|
||||||
* should not be changed in the meantime). It is the return type of
|
* should not be changed in the meantime). It is the return type of
|
||||||
* matrixBase::matrixLogarithm() and most of the time this is the
|
* matrixBase::log() and most of the time this is the only way it
|
||||||
* only way it is used.
|
* is used.
|
||||||
*/
|
*/
|
||||||
template<typename Derived> class MatrixLogarithmReturnValue
|
template<typename Derived> class MatrixLogarithmReturnValue
|
||||||
: public ReturnByValue<MatrixLogarithmReturnValue<Derived> >
|
: public ReturnByValue<MatrixLogarithmReturnValue<Derived> >
|
||||||
|
|||||||
Reference in New Issue
Block a user