GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-12 09:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

workaround strange compilation issue with ICC and -strict-ansi

Browse Source
This commit is contained in:
Gael Guennebaud 2013-04-10 17:30:25 +02:00
parent ff661a7b6f
commit 1e38928c64
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Eigen/src/OrderingMethods/Eigen_Colamd.h
View File

@ -436,7 +436,7 @@ static bool colamd(Index n_row, Index n_col, Index Alen, Index *A, Index *p, dou
/* === Construct the row and column data structures ===================== */ /* === Construct the row and column data structures ===================== */
if (!init_rows_cols (n_row, n_col, Row, Col, A, p, stats)) if (!Eigen::internal::init_rows_cols (n_row, n_col, Row, Col, A, p, stats))
{ {
/* input matrix is invalid */ /* input matrix is invalid */
COLAMD_DEBUG0 (("colamd: Matrix invalid\n")) ; COLAMD_DEBUG0 (("colamd: Matrix invalid\n")) ;
@ -445,17 +445,17 @@ static bool colamd(Index n_row, Index n_col, Index Alen, Index *A, Index *p, dou
/* === Initialize scores, kill dense rows/columns ======================= */ /* === Initialize scores, kill dense rows/columns ======================= */
init_scoring (n_row, n_col, Row, Col, A, p, knobs, Eigen::internal::init_scoring (n_row, n_col, Row, Col, A, p, knobs,
&n_row2, &n_col2, &max_deg) ; &n_row2, &n_col2, &max_deg) ;
/* === Order the supercolumns =========================================== */ /* === Order the supercolumns =========================================== */
ngarbage = find_ordering (n_row, n_col, Alen, Row, Col, A, p, ngarbage = Eigen::internal::find_ordering (n_row, n_col, Alen, Row, Col, A, p,
n_col2, max_deg, 2*nnz) ; n_col2, max_deg, 2*nnz) ;
/* === Order the non-principal columns ================================== */ /* === Order the non-principal columns ================================== */
order_children (n_col, Col, p) ; Eigen::internal::order_children (n_col, Col, p) ;
/* === Return statistics in stats ======================================= */ /* === Return statistics in stats ======================================= */
@ -993,7 +993,7 @@ static Index find_ordering /* return the number of garbage collections */
/* === Initialization and clear mark ==================================== */ /* === Initialization and clear mark ==================================== */
max_mark = INT_MAX - n_col ; /* INT_MAX defined in <limits.h> */ max_mark = INT_MAX - n_col ; /* INT_MAX defined in <limits.h> */
tag_mark = clear_mark (n_row, Row) ; tag_mark = Eigen::internal::clear_mark (n_row, Row) ;
min_score = 0 ; min_score = 0 ;
ngarbage = 0 ; ngarbage = 0 ;
COLAMD_DEBUG1 (("colamd: Ordering, n_col2=%d\n", n_col2)) ; COLAMD_DEBUG1 (("colamd: Ordering, n_col2=%d\n", n_col2)) ;
@ -1043,12 +1043,12 @@ static Index find_ordering /* return the number of garbage collections */
needed_memory = COLAMD_MIN (pivot_col_score, n_col - k) ; needed_memory = COLAMD_MIN (pivot_col_score, n_col - k) ;
if (pfree + needed_memory >= Alen) if (pfree + needed_memory >= Alen)
{ {
pfree = garbage_collection (n_row, n_col, Row, Col, A, &A [pfree]) ; pfree = Eigen::internal::garbage_collection (n_row, n_col, Row, Col, A, &A [pfree]) ;
ngarbage++ ; ngarbage++ ;
/* after garbage collection we will have enough */ /* after garbage collection we will have enough */
COLAMD_ASSERT (pfree + needed_memory < Alen) ; COLAMD_ASSERT (pfree + needed_memory < Alen) ;
/* garbage collection has wiped out the Row[].shared2.mark array */ /* garbage collection has wiped out the Row[].shared2.mark array */
tag_mark = clear_mark (n_row, Row) ; tag_mark = Eigen::internal::clear_mark (n_row, Row) ;
} }
@ -1336,9 +1336,7 @@ static Index find_ordering /* return the number of garbage collections */
COLAMD_DEBUG3 (("** Supercolumn detection phase. **\n")) ; COLAMD_DEBUG3 (("** Supercolumn detection phase. **\n")) ;
detect_super_cols ( Eigen::internal::detect_super_cols (Col, A, head, pivot_row_start, pivot_row_length) ;
Col, A, head, pivot_row_start, pivot_row_length) ;
/* === Kill the pivotal column ====================================== */ /* === Kill the pivotal column ====================================== */
@ -1350,7 +1348,7 @@ static Index find_ordering /* return the number of garbage collections */
if (tag_mark >= max_mark) if (tag_mark >= max_mark)
{ {
COLAMD_DEBUG2 (("clearing tag_mark\n")) ; COLAMD_DEBUG2 (("clearing tag_mark\n")) ;
tag_mark = clear_mark (n_row, Row) ; tag_mark = Eigen::internal::clear_mark (n_row, Row) ;
} }
/* === Finalize the new pivot row, and column scores ================ */ /* === Finalize the new pivot row, and column scores ================ */