diff --git a/.gitignore b/.gitignore index 562ed98..b39ebb5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /igraph_1.2.4.tar.gz /igraph_1.2.4.1.tar.gz /igraph_1.2.4.2.tar.gz +/igraph_1.2.5.tar.gz diff --git a/0001-Update-FSF-address.patch b/0001-Update-FSF-address.patch index a3980df..ac34777 100644 --- a/0001-Update-FSF-address.patch +++ b/0001-Update-FSF-address.patch @@ -1,7 +1,7 @@ -From a923a7b2f88f5ab2d69fe6496ea3ad72a22ebf4f Mon Sep 17 00:00:00 2001 +From 8c48172d82979ff412b927d8777c8430d1cfe717 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 24 Jul 2018 17:14:33 -0400 -Subject: [PATCH 1/5] Update FSF address. +Subject: [PATCH 1/4] Update FSF address. Signed-off-by: Elliott Sales de Andrade --- @@ -22,5 +22,5 @@ index 558acc7..ba7b6e3 100644 ################################################################### -- -2.20.1 +2.21.1 diff --git a/0002-Unbundle-uuid.patch b/0002-Unbundle-uuid.patch index e88488e..0c49bf2 100644 --- a/0002-Unbundle-uuid.patch +++ b/0002-Unbundle-uuid.patch @@ -1,7 +1,7 @@ -From 97f5bc3ab6bcf70c604615b3cb7967f71ebd9615 Mon Sep 17 00:00:00 2001 +From e4e55eb976ec369f33fe490ef641873e4baaa886 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 3 May 2018 01:01:56 -0400 -Subject: [PATCH 2/5] Unbundle uuid. +Subject: [PATCH 2/4] Unbundle uuid. Signed-off-by: Elliott Sales de Andrade --- @@ -17,7 +17,7 @@ Signed-off-by: Elliott Sales de Andrade src/uuid/compare.c | 55 ---- src/uuid/config.h.in | 82 ------ src/uuid/copy.c | 45 ---- - src/uuid/gen_uuid.c | 557 ---------------------------------------- + src/uuid/gen_uuid.c | 559 ---------------------------------------- src/uuid/isnull.c | 48 ---- src/uuid/pack.c | 69 ----- src/uuid/parse.c | 79 ------ @@ -27,7 +27,7 @@ Signed-off-by: Elliott Sales de Andrade src/uuid/uuidP.h | 63 ----- src/uuid/uuidd.h | 54 ---- src/uuid/win32/config.h | 84 ------ - 22 files changed, 5 insertions(+), 1507 deletions(-) + 22 files changed, 5 insertions(+), 1509 deletions(-) delete mode 100644 src/uuid/COPYING delete mode 100644 src/uuid/Makevars.in delete mode 100644 src/uuid/Makevars.win @@ -48,7 +48,7 @@ Signed-off-by: Elliott Sales de Andrade delete mode 100644 src/uuid/win32/config.h diff --git a/MD5 b/MD5 -index b66d66e..582d2d9 100644 +index 9636415..bca1ab5 100644 --- a/MD5 +++ b/MD5 @@ -1066,24 +1066,6 @@ f97445842b82e98c855b014788b70de5 *src/topology.c @@ -63,7 +63,7 @@ index b66d66e..582d2d9 100644 -d2b39a0b3d72632db235a9c6d36ef344 *src/uuid/compare.c -76087d772af7d37cab53b1a56cf72ade *src/uuid/config.h.in -d0026e30bb2f3feb7ac1db9827dd4820 *src/uuid/copy.c --0bf618d5e3f7bbff90c60455fa89b697 *src/uuid/gen_uuid.c +-980283da18d0691416e6149e17a791b9 *src/uuid/gen_uuid.c -7374a713629b202c4fb82d650e510acb *src/uuid/isnull.c -b671656493c2119636a4e981e9aad857 *src/uuid/pack.c -dcc91eb622c08bf2fca11680c71b92cc *src/uuid/parse.c @@ -91,7 +91,7 @@ index a6b61b7..211b5fb 100644 if (!warn_version(graph)) { .Call(C_R_igraph_get_graph_id, graph) diff --git a/src/Makevars.in b/src/Makevars.in -index 108ba1a..acf9946 100644 +index cd1e5b9..0d01558 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -4,11 +4,13 @@ PKG_CFLAGS=-DUSING_R -I. -Iinclude -Ics -Iplfit \ @@ -109,8 +109,8 @@ index 108ba1a..acf9946 100644 all: $(SHLIB) --OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o dgetv0.o dlaqrb.o dmout.o dnaitr.o dnapps.o dnaup2.o dnaupd.o dnconv.o dneigh.o dneupd.o dngets.o dsaitr.o dsapps.o dsaup2.o dsaupd.o dsconv.o dseigt.o dsesrt.o dseupd.o dsgets.o dsortc.o dsortr.o dstatn.o dstats.o dstqrb.o dvout.o ivout.o second.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o uuid/R.o uuid/clear.o uuid/compare.o uuid/copy.o uuid/gen_uuid.o uuid/isnull.o uuid/pack.o uuid/parse.o uuid/unpack.o uuid/unparse.o rinterface.o rinterface_extra.o lazyeval.o -+OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o dgetv0.o dlaqrb.o dmout.o dnaitr.o dnapps.o dnaup2.o dnaupd.o dnconv.o dneigh.o dneupd.o dngets.o dsaitr.o dsapps.o dsaup2.o dsaupd.o dsconv.o dseigt.o dsesrt.o dseupd.o dsgets.o dsortc.o dsortr.o dstatn.o dstats.o dstqrb.o dvout.o ivout.o second.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o rinterface.o rinterface_extra.o lazyeval.o +-OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o dgetv0.o dlaqrb.o dmout.o dnaitr.o dnapps.o dnaup2.o dnaupd.o dnconv.o dneigh.o dneupd.o dngets.o dsaitr.o dsapps.o dsaup2.o dsaupd.o dsconv.o dseigt.o dsesrt.o dseupd.o dsgets.o dsortc.o dsortr.o dstatn.o dstats.o dstqrb.o dvout.o ivout.o second.o wrap.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o uuid/R.o uuid/clear.o uuid/compare.o uuid/copy.o uuid/gen_uuid.o uuid/isnull.o uuid/pack.o uuid/parse.o uuid/unpack.o uuid/unparse.o rinterface.o rinterface_extra.o lazyeval.o ++OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o dgetv0.o dlaqrb.o dmout.o dnaitr.o dnapps.o dnaup2.o dnaupd.o dnconv.o dneigh.o dneupd.o dngets.o dsaitr.o dsapps.o dsaup2.o dsaupd.o dsconv.o dseigt.o dsesrt.o dseupd.o dsgets.o dsortc.o dsortr.o dstatn.o dstats.o dstqrb.o dvout.o ivout.o second.o wrap.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o rinterface.o rinterface_extra.o lazyeval.o diff --git a/src/init.c b/src/init.c index a6c00a5..d419442 100644 --- a/src/init.c @@ -461,10 +461,10 @@ index ead33aa..0000000 -} diff --git a/src/uuid/gen_uuid.c b/src/uuid/gen_uuid.c deleted file mode 100644 -index e7c12b3..0000000 +index 78768f5..0000000 --- a/src/uuid/gen_uuid.c +++ /dev/null -@@ -1,557 +0,0 @@ +@@ -1,559 +0,0 @@ -/* - * gen_uuid.c --- generate a DCE-compatible uuid - * @@ -783,10 +783,12 @@ index e7c12b3..0000000 -#define LOCK_UN 2 -static int flock(int fd, int op) -{ -- HANDLE h = (HANDLE) _get_osfhandle(fd); +- intptr_t ret = _get_osfhandle(fd); +- HANDLE h; - OVERLAPPED offset; -- if (h < 0) +- if (ret == INVALID_HANDLE_VALUE) - return -1; +- h = (HANDLE) ret; - memset(&offset, 0, sizeof(offset)); - switch (op) { - case LOCK_EX: @@ -1717,5 +1719,5 @@ index ffb2aba..0000000 -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 -- -2.20.1 +2.21.1 diff --git a/0003-Unbundle-arpack.patch b/0003-Unbundle-arpack.patch index 16e03c7..0654bd7 100644 --- a/0003-Unbundle-arpack.patch +++ b/0003-Unbundle-arpack.patch @@ -1,7 +1,7 @@ -From 56574db6031268bb267266d94a45b2ffda6b9c8c Mon Sep 17 00:00:00 2001 +From c95eb73e8539beeb8581266f07dd894d5d7a528b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 3 May 2018 01:23:27 -0400 -Subject: [PATCH 3/5] Unbundle arpack. +Subject: [PATCH 3/4] Unbundle arpack. Signed-off-by: Elliott Sales de Andrade --- @@ -35,7 +35,8 @@ Signed-off-by: Elliott Sales de Andrade src/dvout.f | 122 ------ src/ivout.f | 120 ------ src/second.f | 35 -- - 30 files changed, 3 insertions(+), 11932 deletions(-) + src/wrap.f | 8 +- + 31 files changed, 7 insertions(+), 11936 deletions(-) delete mode 100644 src/dgetv0.f delete mode 100644 src/dlaqrb.f delete mode 100644 src/dmout.f @@ -66,25 +67,25 @@ Signed-off-by: Elliott Sales de Andrade delete mode 100644 src/second.f diff --git a/MD5 b/MD5 -index 582d2d9..ec65c25 100644 +index bca1ab5..deeb9ad 100644 --- a/MD5 +++ b/MD5 @@ -706,18 +706,7 @@ ed31244ed5ef4ab0c2caa42b1a92dec0 *src/cs/cs_sqr.c 74e3d5634309a7716491939ecd8b993a *src/cs/cs_utsolve.c ae2b99c6930b9d78a067b9f304e4d021 *src/debug.h c36fc0d316783ca73c33594df813b191 *src/decomposition.c --634a82287e116db541c1c954a3cd9bdc *src/dgetv0.f +-bc623b699b4c2d87ac2c4a0b82002276 *src/dgetv0.f 53aa0b92a01343a9780f33409ff71448 *src/distances.c -ae7917a56c25a07b9860819bebf32f40 *src/dlaqrb.f -334cfcb89b71acd8bcf5e8398923f7f5 *src/dmout.f --33affe232f61fa5cab387c8c3e140ad6 *src/dnaitr.f --8661cfa88ca0ffa0f8847dc88ed53bcc *src/dnapps.f --dfccde1654a64a6e14709c827311dc6a *src/dnaup2.f --cbd4968767585d82b4ea9762ce7a973b *src/dnaupd.f +-0e11f9b76a7e46477224bebd83080f25 *src/dnaitr.f +-7d4f11d47644fbbf52ed09e58e174dc4 *src/dnapps.f +-22de713abf558787ed9c5b33eb4b83d4 *src/dnaup2.f +-13ef3f91e6a93a0fb365d456cbd51d9d *src/dnaupd.f -8285764ecec3f0da1831503affd69067 *src/dnconv.f -7e7766bc466e28155a85211734e36426 *src/dneigh.f --92be5de027d3bf234c3adb3c1df81216 *src/dneupd.f --599f6e77589fa5338379452ab77ec143 *src/dngets.f +-00daa2578ee9f4ade26d3cab1b4076b8 *src/dneupd.f +-238271976008654f1e512760f71943b4 *src/dngets.f 375ff494ab18d30adad217d6c5406a6d *src/dotproduct.c 03a845c6af6e800d15575f831ea2f18e *src/dqueue.c e2ddc9e8d520337ca4fafc08d4bab6d1 *src/dqueue.pmt @@ -92,14 +93,14 @@ index 582d2d9..ec65c25 100644 7e4c69a183df51fc7662e2a3f5c6e6be *src/drl_layout_3d.h 4b5e3c6311f4c7a87eac902316f38b95 *src/drl_parse.cpp 14f8e5de9f1b7e850614ccf71c93bff0 *src/drl_parse.h --d1e7ea74631a08da9e1166300adc0af4 *src/dsaitr.f +-ef22d5267a5f3e54a66b5c6fc97e8785 *src/dsaitr.f -f226039f08b329d7a276b9c920c757b0 *src/dsapps.f --26e0e4fd884197eccdf79c211e4bf09e *src/dsaup2.f +-4ccdc4e43c8b3f590f7ed53783b30cee *src/dsaup2.f -221f58799c95c17f73a5043d9edb959f *src/dsaupd.f -573fb11e41307018f2fdb32ce3111be5 *src/dsconv.f -f976b4529dead76e497c2f35fe067b00 *src/dseigt.f -0f7c847fa63252f466a7c312a9baa052 *src/dsesrt.f --fd78b52dd2795d4db9d6706e5d7bbe26 *src/dseupd.f +-6e2dd99b6e2450fa315e9132806eae90 *src/dseupd.f -604cef634a570edd5e9e1f0e57b85800 *src/dsgets.f -d37e30b6becbd695f77bb83e86fc8845 *src/dsortc.f -8baf60e7aaca0c70f8ce165fa60f0eb4 *src/dsortr.f @@ -127,7 +128,7 @@ index 582d2d9..ec65c25 100644 af447f07a45af2b4f7edaee5d0a877a7 *src/simpleraytracer/Color.cpp be39147aa9a658a401d5d8e304bfbb68 *src/simpleraytracer/Color.h diff --git a/src/Makevars.in b/src/Makevars.in -index acf9946..d7a0323 100644 +index 0d01558..3067221 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -3,14 +3,14 @@ PKG_CFLAGS=-DUSING_R -I. -Iinclude -Ics -Iplfit \ @@ -146,11 +147,11 @@ index acf9946..d7a0323 100644 all: $(SHLIB) --OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o dgetv0.o dlaqrb.o dmout.o dnaitr.o dnapps.o dnaup2.o dnaupd.o dnconv.o dneigh.o dneupd.o dngets.o dsaitr.o dsapps.o dsaup2.o dsaupd.o dsconv.o dseigt.o dsesrt.o dseupd.o dsgets.o dsortc.o dsortr.o dstatn.o dstats.o dstqrb.o dvout.o ivout.o second.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o rinterface.o rinterface_extra.o lazyeval.o -+OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o rinterface.o rinterface_extra.o lazyeval.o +-OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o dgetv0.o dlaqrb.o dmout.o dnaitr.o dnapps.o dnaup2.o dnaupd.o dnconv.o dneigh.o dneupd.o dngets.o dsaitr.o dsapps.o dsaup2.o dsaupd.o dsconv.o dseigt.o dsesrt.o dseupd.o dsgets.o dsortc.o dsortr.o dstatn.o dstats.o dstqrb.o dvout.o ivout.o second.o wrap.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o rinterface.o rinterface_extra.o lazyeval.o ++OBJECTS=AMD/Source/amd.o AMD/Source/amd_1.o AMD/Source/amd_2.o AMD/Source/amd_aat.o AMD/Source/amd_control.o AMD/Source/amd_defaults.o AMD/Source/amd_dump.o AMD/Source/amd_global.o AMD/Source/amd_info.o AMD/Source/amd_order.o AMD/Source/amd_post_tree.o AMD/Source/amd_postorder.o AMD/Source/amd_preprocess.o AMD/Source/amd_valid.o AMD/Source/amdbar.o CHOLMOD/Check/cholmod_check.o CHOLMOD/Check/cholmod_read.o CHOLMOD/Check/cholmod_write.o CHOLMOD/Cholesky/cholmod_amd.o CHOLMOD/Cholesky/cholmod_analyze.o CHOLMOD/Cholesky/cholmod_colamd.o CHOLMOD/Cholesky/cholmod_etree.o CHOLMOD/Cholesky/cholmod_factorize.o CHOLMOD/Cholesky/cholmod_postorder.o CHOLMOD/Cholesky/cholmod_rcond.o CHOLMOD/Cholesky/cholmod_resymbol.o CHOLMOD/Cholesky/cholmod_rowcolcounts.o CHOLMOD/Cholesky/cholmod_rowfac.o CHOLMOD/Cholesky/cholmod_solve.o CHOLMOD/Cholesky/cholmod_spsolve.o CHOLMOD/Core/cholmod_aat.o CHOLMOD/Core/cholmod_add.o CHOLMOD/Core/cholmod_band.o CHOLMOD/Core/cholmod_change_factor.o CHOLMOD/Core/cholmod_common.o CHOLMOD/Core/cholmod_complex.o CHOLMOD/Core/cholmod_copy.o CHOLMOD/Core/cholmod_dense.o CHOLMOD/Core/cholmod_error.o CHOLMOD/Core/cholmod_factor.o CHOLMOD/Core/cholmod_memory.o CHOLMOD/Core/cholmod_sparse.o CHOLMOD/Core/cholmod_transpose.o CHOLMOD/Core/cholmod_triplet.o CHOLMOD/Core/cholmod_version.o CHOLMOD/MatrixOps/cholmod_drop.o CHOLMOD/MatrixOps/cholmod_horzcat.o CHOLMOD/MatrixOps/cholmod_norm.o CHOLMOD/MatrixOps/cholmod_scale.o CHOLMOD/MatrixOps/cholmod_sdmult.o CHOLMOD/MatrixOps/cholmod_ssmult.o CHOLMOD/MatrixOps/cholmod_submatrix.o CHOLMOD/MatrixOps/cholmod_symmetry.o CHOLMOD/MatrixOps/cholmod_vertcat.o CHOLMOD/Modify/cholmod_rowadd.o CHOLMOD/Modify/cholmod_rowdel.o CHOLMOD/Modify/cholmod_updown.o CHOLMOD/Partition/cholmod_camd.o CHOLMOD/Partition/cholmod_ccolamd.o CHOLMOD/Partition/cholmod_csymamd.o CHOLMOD/Partition/cholmod_metis.o CHOLMOD/Partition/cholmod_nesdis.o CHOLMOD/Supernodal/cholmod_super_numeric.o CHOLMOD/Supernodal/cholmod_super_solve.o CHOLMOD/Supernodal/cholmod_super_symbolic.o COLAMD/Source/colamd.o COLAMD/Source/colamd_global.o DensityGrid.o DensityGrid_3d.o NetDataTypes.o NetRoutines.o SuiteSparse_config/SuiteSparse_config.o adjlist.o arpack.o array.o atlas.o attributes.o basic_query.o bfgs.o bigint.o bignum.o bipartite.o blas.o bliss.o bliss/bliss_heap.o bliss/defs.o bliss/graph.o bliss/orbit.o bliss/partition.o bliss/uintseqhash.o bliss/utils.o cattributes.o centrality.o cliquer/cliquer.o cliquer/cliquer_graph.o cliquer/reorder.o cliques.o clustertool.o cocitation.o cohesive_blocks.o coloring.o community.o complex.o components.o conversion.o cores.o cs/cs_add.o cs/cs_amd.o cs/cs_chol.o cs/cs_cholsol.o cs/cs_compress.o cs/cs_counts.o cs/cs_cumsum.o cs/cs_dfs.o cs/cs_dmperm.o cs/cs_droptol.o cs/cs_dropzeros.o cs/cs_dupl.o cs/cs_entry.o cs/cs_ereach.o cs/cs_etree.o cs/cs_fkeep.o cs/cs_gaxpy.o cs/cs_happly.o cs/cs_house.o cs/cs_ipvec.o cs/cs_leaf.o cs/cs_load.o cs/cs_lsolve.o cs/cs_ltsolve.o cs/cs_lu.o cs/cs_lusol.o cs/cs_malloc.o cs/cs_maxtrans.o cs/cs_multiply.o cs/cs_norm.o cs/cs_permute.o cs/cs_pinv.o cs/cs_post.o cs/cs_print.o cs/cs_pvec.o cs/cs_qr.o cs/cs_qrsol.o cs/cs_randperm.o cs/cs_reach.o cs/cs_scatter.o cs/cs_scc.o cs/cs_schol.o cs/cs_spsolve.o cs/cs_sqr.o cs/cs_symperm.o cs/cs_tdfs.o cs/cs_transpose.o cs/cs_updown.o cs/cs_usolve.o cs/cs_util.o cs/cs_utsolve.o decomposition.o distances.o dotproduct.o dqueue.o drl_graph.o drl_graph_3d.o drl_layout.o drl_layout_3d.o drl_parse.o eigen.o embedding.o fast_community.o feedback_arc_set.o flow.o foreign-dl-lexer.o foreign-dl-parser.o foreign-gml-lexer.o foreign-gml-parser.o foreign-graphml.o foreign-lgl-lexer.o foreign-lgl-parser.o foreign-ncol-lexer.o foreign-ncol-parser.o foreign-pajek-lexer.o foreign-pajek-parser.o foreign.o forestfire.o fortran_intrinsics.o games.o gengraph_box_list.o gengraph_degree_sequence.o gengraph_graph_molloy_hash.o gengraph_graph_molloy_optimized.o gengraph_mr-connected.o gengraph_powerlaw.o gengraph_random.o glet.o glpk_support.o gml_tree.o hacks.o heap.o igraph_buckets.o igraph_cliquer.o igraph_error.o igraph_estack.o igraph_fixed_vectorlist.o igraph_grid.o igraph_hashtable.o igraph_heap.o igraph_hrg.o igraph_hrg_types.o igraph_marked_queue.o igraph_psumtree.o igraph_set.o igraph_stack.o igraph_strvector.o igraph_trie.o infomap.o infomap_FlowGraph.o infomap_Greedy.o infomap_Node.o interrupt.o iterators.o lad.o lapack.o layout.o layout_dh.o layout_fr.o layout_gem.o layout_kk.o lsap.o matching.o math.o matrix.o maximal_cliques.o memory.o microscopic_update.o mixing.o motifs.o operators.o optimal_modularity.o other.o paths.o plfit/error.o plfit/gss.o plfit/kolmogorov.o plfit/lbfgs.o plfit/options.o plfit/plfit.o plfit/zeta.o pottsmodel_2.o progress.o prpack.o prpack/prpack_base_graph.o prpack/prpack_igraph_graph.o prpack/prpack_preprocessed_ge_graph.o prpack/prpack_preprocessed_gs_graph.o prpack/prpack_preprocessed_scc_graph.o prpack/prpack_preprocessed_schur_graph.o prpack/prpack_result.o prpack/prpack_solver.o prpack/prpack_utils.o qsort.o qsort_r.o random.o random_walk.o sbm.o scan.o scg.o scg_approximate_methods.o scg_exact_scg.o scg_kmeans.o scg_optimal_method.o scg_utils.o separators.o sir.o spanning_trees.o sparsemat.o spectral_properties.o spmatrix.o st-cuts.o statusbar.o structural_properties.o structure_generators.o sugiyama.o topology.o triangles.o type_indexededgelist.o types.o vector.o vector_ptr.o version.o visitors.o walktrap.o walktrap_communities.o walktrap_graph.o walktrap_heap.o zeroin.o wrap.o simpleraytracer/Color.o simpleraytracer/Light.o simpleraytracer/Point.o simpleraytracer/RIgraphRay.o simpleraytracer/Ray.o simpleraytracer/RayTracer.o simpleraytracer/RayVector.o simpleraytracer/Shape.o simpleraytracer/Sphere.o simpleraytracer/Triangle.o simpleraytracer/unit_limiter.o rinterface.o rinterface_extra.o lazyeval.o diff --git a/src/dgetv0.f b/src/dgetv0.f deleted file mode 100644 -index 9b07809..0000000 +index b64d47a..0000000 --- a/src/dgetv0.f +++ /dev/null @@ -1,419 +0,0 @@ @@ -520,9 +521,9 @@ index 9b07809..0000000 -c %--------------------------------------% -c - if (msglvl .gt. 2) then -- call igraphdvout (logfil, 1, rnorm0, ndigit, +- call igraphdvout (logfil, 1, [rnorm0], ndigit, - & '_getv0: re-orthonalization ; rnorm0 is') -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_getv0: re-orthonalization ; rnorm is') - end if -c @@ -553,7 +554,7 @@ index 9b07809..0000000 - 50 continue -c - if (msglvl .gt. 0) then -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_getv0: B-norm of initial / restarted starting vector') - end if - if (msglvl .gt. 2) then @@ -1275,7 +1276,7 @@ index 6204d64..0000000 - END diff --git a/src/dnaitr.f b/src/dnaitr.f deleted file mode 100644 -index fa4ec92..0000000 +index 8ec2569..0000000 --- a/src/dnaitr.f +++ /dev/null @@ -1,840 +0,0 @@ @@ -1652,9 +1653,9 @@ index fa4ec92..0000000 - 1000 continue -c - if (msglvl .gt. 1) then -- call igraphivout (logfil, 1, j, ndigit, +- call igraphivout (logfil, 1, [j], ndigit, - & '_naitr: generating Arnoldi vector number') -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_naitr: B-norm of the current residual is') - end if -c @@ -1674,7 +1675,7 @@ index fa4ec92..0000000 -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, j, ndigit, +- call igraphivout (logfil, 1, [j], ndigit, - & '_naitr: ****** RESTART AT STEP ******') - end if -c @@ -2002,7 +2003,7 @@ index fa4ec92..0000000 - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call igraphivout (logfil, 1, j, ndigit, +- call igraphivout (logfil, 1, [j], ndigit, - & '_naitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm @@ -2121,7 +2122,7 @@ index fa4ec92..0000000 - end diff --git a/src/dnapps.f b/src/dnapps.f deleted file mode 100644 -index 41023b8..0000000 +index 247e66b..0000000 --- a/src/dnapps.f +++ /dev/null @@ -1,647 +0,0 @@ @@ -2393,11 +2394,11 @@ index 41023b8..0000000 - sigmai = shifti(jj) -c - if (msglvl .gt. 2 ) then -- call igraphivout (logfil, 1, jj, ndigit, +- call igraphivout (logfil, 1, [jj], ndigit, - & '_napps: shift number.') -- call igraphdvout (logfil, 1, sigmar, ndigit, +- call igraphdvout (logfil, 1, [sigmar], ndigit, - & '_napps: The real part of the shift ') -- call igraphdvout (logfil, 1, sigmai, ndigit, +- call igraphdvout (logfil, 1, [sigmai], ndigit, - & '_napps: The imaginary part of the shift ') - end if -c @@ -2462,9 +2463,9 @@ index 41023b8..0000000 - & tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl ) - if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, i, ndigit, +- call igraphivout (logfil, 1, [i], ndigit, - & '_napps: matrix splitting at row/column no.') -- call igraphivout (logfil, 1, jj, ndigit, +- call igraphivout (logfil, 1, [jj], ndigit, - & '_napps: matrix splitting with shift number.') - call igraphdvout (logfil, 1, h(i+1,i), ndigit, - & '_napps: off diagonal element.') @@ -2478,9 +2479,9 @@ index 41023b8..0000000 - 40 continue -c - if (msglvl .gt. 2) then -- call igraphivout (logfil, 1, istart, ndigit, +- call igraphivout (logfil, 1, [istart], ndigit, - & '_napps: Start of current block ') -- call igraphivout (logfil, 1, iend, ndigit, +- call igraphivout (logfil, 1, [iend], ndigit, - & '_napps: End of current block ') - end if -c @@ -2752,7 +2753,7 @@ index 41023b8..0000000 - & '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}') - call igraphdvout (logfil, 1, h(kev+1,kev), ndigit, - & '_napps: betak = e_{kev+1}^T*H*e_{kev}') -- call igraphivout (logfil, 1, kev, ndigit, +- call igraphivout (logfil, 1, [kev], ndigit, - & '_napps: Order of the final Hessenberg matrix ') - if (msglvl .gt. 2) then - call igraphdmout (logfil, kev, kev, h, ldh, ndigit, @@ -2774,7 +2775,7 @@ index 41023b8..0000000 - end diff --git a/src/dnaup2.f b/src/dnaup2.f deleted file mode 100644 -index 1078a1c..0000000 +index e060689..0000000 --- a/src/dnaup2.f +++ /dev/null @@ -1,838 +0,0 @@ @@ -3167,7 +3168,7 @@ index 1078a1c..0000000 - iter = iter + 1 -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, iter, ndigit, +- call igraphivout (logfil, 1, [iter], ndigit, - & '_naup2: **** Start of major iteration number ****') - end if -c @@ -3180,9 +3181,9 @@ index 1078a1c..0000000 - np = kplusp - nev -c - if (msglvl .gt. 1) then -- call igraphivout (logfil, 1, nev, ndigit, +- call igraphivout (logfil, 1, [nev], ndigit, - & '_naup2: The length of the current Arnoldi factorization') -- call igraphivout (logfil, 1, np, ndigit, +- call igraphivout (logfil, 1, [np], ndigit, - & '_naup2: Extend the Arnoldi factorization by') - end if -c @@ -3213,7 +3214,7 @@ index 1078a1c..0000000 - update = .false. -c - if (msglvl .gt. 1) then -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_naup2: Corresponding B-norm of the residual') - end if -c @@ -3461,7 +3462,7 @@ index 1078a1c..0000000 - end if -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, nconv, ndigit, +- call igraphivout (logfil, 1, [nconv], ndigit, - & '_naup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev @@ -3513,7 +3514,7 @@ index 1078a1c..0000000 - end if -c - if (msglvl .gt. 2) then -- call igraphivout (logfil, 1, np, ndigit, +- call igraphivout (logfil, 1, [np], ndigit, - & '_naup2: The number of shifts to apply ') - call igraphdvout (logfil, np, ritzr, ndigit, - & '_naup2: Real part of the shifts') @@ -3579,7 +3580,7 @@ index 1078a1c..0000000 - cnorm = .false. -c - if (msglvl .gt. 2) then -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_naup2: B-norm of residual for compressed factorization') - call igraphdmout (logfil, nev, nev, h, ldh, ndigit, - & '_naup2: Compressed upper Hessenberg matrix H') @@ -3618,7 +3619,7 @@ index 1078a1c..0000000 - end diff --git a/src/dnaupd.f b/src/dnaupd.f deleted file mode 100644 -index 2413bff..0000000 +index 4133022..0000000 --- a/src/dnaupd.f +++ /dev/null @@ -1,655 +0,0 @@ @@ -4252,9 +4253,9 @@ index 2413bff..0000000 - if (info .eq. 2) info = 3 -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, mxiter, ndigit, +- call igraphivout (logfil, 1, [mxiter], ndigit, - & '_naupd: Number of update iterations taken') -- call igraphivout (logfil, 1, np, ndigit, +- call igraphivout (logfil, 1, [np], ndigit, - & '_naupd: Number of wanted "converged" Ritz values') - call igraphdvout (logfil, np, workl(ritzr), ndigit, - & '_naupd: Real part of the final Ritz values') @@ -4752,7 +4753,7 @@ index 53c7c89..0000000 - end diff --git a/src/dneupd.f b/src/dneupd.f deleted file mode 100644 -index 8f484bb..0000000 +index 92b4bc3..0000000 --- a/src/dneupd.f +++ /dev/null @@ -1,1044 +0,0 @@ @@ -5291,7 +5292,7 @@ index 8f484bb..0000000 - end if -c - if (msglvl .gt. 2) then -- call igraphdvout(logfil, 1, thres, ndigit, +- call igraphdvout(logfil, 1, [thres], ndigit, - & '_neupd: Threshold eigenvalue used for re-ordering') - end if -c @@ -5369,9 +5370,9 @@ index 8f484bb..0000000 - 10 continue -c - if (msglvl .gt. 2) then -- call igraphivout(logfil, 1, ktrord, ndigit, +- call igraphivout(logfil, 1, [ktrord], ndigit, - & '_neupd: Number of specified eigenvalues') -- call igraphivout(logfil, 1, nconv, ndigit, +- call igraphivout(logfil, 1, [nconv], ndigit, - & '_neupd: Number of "converged" eigenvalues') - end if -c @@ -5802,7 +5803,7 @@ index 8f484bb..0000000 - end diff --git a/src/dngets.f b/src/dngets.f deleted file mode 100644 -index 62913dd..0000000 +index 0202090..0000000 --- a/src/dngets.f +++ /dev/null @@ -1,231 +0,0 @@ @@ -6020,8 +6021,8 @@ index 62913dd..0000000 - tngets = tngets + (t1 - t0) -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, kev, ndigit, '_ngets: KEV is') -- call igraphivout (logfil, 1, np, ndigit, '_ngets: NP is') +- call igraphivout (logfil, 1, [kev], ndigit, '_ngets: KEV is') +- call igraphivout (logfil, 1, [np], ndigit, '_ngets: NP is') - call igraphdvout (logfil, kev+np, ritzr, ndigit, - & '_ngets: Eigenvalues of current H matrix -- real part') - call igraphdvout (logfil, kev+np, ritzi, ndigit, @@ -6039,7 +6040,7 @@ index 62913dd..0000000 - end diff --git a/src/dsaitr.f b/src/dsaitr.f deleted file mode 100644 -index 5abd458..0000000 +index 4a4698c..0000000 --- a/src/dsaitr.f +++ /dev/null @@ -1,854 +0,0 @@ @@ -6410,9 +6411,9 @@ index 5abd458..0000000 - 1000 continue -c - if (msglvl .gt. 2) then -- call igraphivout (logfil, 1, j, ndigit, +- call igraphivout (logfil, 1, [j], ndigit, - & '_saitr: generating Arnoldi vector no.') -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_saitr: B-norm of the current residual =') - end if -c @@ -6430,7 +6431,7 @@ index 5abd458..0000000 -c %---------------------------------------------------% -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, j, ndigit, +- call igraphivout (logfil, 1, [j], ndigit, - & '_saitr: ****** restart at step ******') - end if -c @@ -6781,7 +6782,7 @@ index 5abd458..0000000 - end if -c - if (msglvl .gt. 0 .and. iter .gt. 0) then -- call igraphivout (logfil, 1, j, ndigit, +- call igraphivout (logfil, 1, [j], ndigit, - & '_saitr: Iterative refinement for Arnoldi residual') - if (msglvl .gt. 2) then - xtemp(1) = rnorm @@ -7421,7 +7422,7 @@ index 850e3fd..0000000 - end diff --git a/src/dsaup2.f b/src/dsaup2.f deleted file mode 100644 -index 1bd2490..0000000 +index 116dd31..0000000 --- a/src/dsaup2.f +++ /dev/null @@ -1,853 +0,0 @@ @@ -7831,13 +7832,13 @@ index 1bd2490..0000000 - iter = iter + 1 -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, iter, ndigit, +- call igraphivout (logfil, 1, [iter], ndigit, - & '_saup2: **** Start of major iteration number ****') - end if - if (msglvl .gt. 1) then -- call igraphivout (logfil, 1, nev, ndigit, +- call igraphivout (logfil, 1, [nev], ndigit, - & '_saup2: The length of the current Lanczos factorization') -- call igraphivout (logfil, 1, np, ndigit, +- call igraphivout (logfil, 1, [np], ndigit, - & '_saup2: Extend the Lanczos factorization by') - end if -c @@ -7875,7 +7876,7 @@ index 1bd2490..0000000 - update = .false. -c - if (msglvl .gt. 1) then -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_saup2: Current B-norm of residual for factorization') - end if -c @@ -8124,7 +8125,7 @@ index 1bd2490..0000000 - end if -c - if (msglvl .gt. 0) then -- call igraphivout (logfil, 1, nconv, ndigit, +- call igraphivout (logfil, 1, [nconv], ndigit, - & '_saup2: no. of "converged" Ritz values at this iter.') - if (msglvl .gt. 1) then - kp(1) = nev @@ -8172,7 +8173,7 @@ index 1bd2490..0000000 - if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1) -c - if (msglvl .gt. 2) then -- call igraphivout (logfil, 1, np, ndigit, +- call igraphivout (logfil, 1, [np], ndigit, - & '_saup2: The number of shifts to apply ') - call igraphdvout (logfil, np, workl, ndigit, - & '_saup2: shifts selected') @@ -8239,7 +8240,7 @@ index 1bd2490..0000000 - 130 continue -c - if (msglvl .gt. 2) then -- call igraphdvout (logfil, 1, rnorm, ndigit, +- call igraphdvout (logfil, 1, [rnorm], ndigit, - & '_saup2: B-norm of residual for NEV factorization') - call igraphdvout (logfil, nev, h(1,2), ndigit, - & '_saup2: main diagonal of compressed H matrix') @@ -9493,7 +9494,7 @@ index 05e2c36..0000000 - end diff --git a/src/dseupd.f b/src/dseupd.f deleted file mode 100644 -index cbea61b..0000000 +index 0336c3a..0000000 --- a/src/dseupd.f +++ /dev/null @@ -1,905 +0,0 @@ @@ -9973,7 +9974,7 @@ index cbea61b..0000000 - thres1 = workl(ritz) -c - if (msglvl .gt. 2) then -- call igraphdvout(logfil, 1, thres1, ndigit, +- call igraphdvout(logfil, 1, [thres1], ndigit, - & '_seupd: Threshold eigenvalue used for re-ordering') - end if -c @@ -10070,9 +10071,9 @@ index cbea61b..0000000 -c %-------------------------------------------% -c - if (msglvl .gt. 2) then -- call igraphivout(logfil, 1, ktrord, ndigit, +- call igraphivout(logfil, 1, [ktrord], ndigit, - & '_seupd: Number of specified eigenvalues') -- call igraphivout(logfil, 1, nconv, ndigit, +- call igraphivout(logfil, 1, [nconv], ndigit, - & '_seupd: Number of "converged" eigenvalues') - end if -c @@ -12217,6 +12218,46 @@ index 37023c3..0000000 -* End of SECOND -* - END +diff --git a/src/wrap.f b/src/wrap.f +index 39c4720..8c39bb0 100644 +--- a/src/wrap.f ++++ b/src/wrap.f +@@ -20,7 +20,7 @@ c + applyx = .false. + end if + c +- call igraphdsortr(which, applyx, n, x1, x2) ++ call dsortr(which, applyx, n, x1, x2) + c + return + c +@@ -45,7 +45,7 @@ c + applyx = .false. + end if + c +- call igraphdsortc(which, applyx, n, xreal, ximag, y) ++ call dsortc(which, applyx, n, xreal, ximag, y) + c + return + c +@@ -93,7 +93,7 @@ c + go to 100 + 110 continue + c +- call igraphdneupd(rvecx, howmny, selectx, dr, di, z, ldz, ++ call dneupd(rvecx, howmny, selectx, dr, di, z, ldz, + & sigmar, sigmai, workev, bmat, n, which, nev, tol, + & resid, ncv, v, ldv, iparam, ipntr, workd, + & workl, lworkl, info) +@@ -142,7 +142,7 @@ c + go to 100 + 110 continue + c +- call igraphdseupd(rvecx, howmny, selectx, d, z, ldz, ++ call dseupd(rvecx, howmny, selectx, d, z, ldz, + & sigma, bmat, n, which, nev, tol, resid, ncv, v, ldv, iparam, + & ipntr, workd, workl, lworkl, info ) + c -- -2.20.1 +2.21.1 diff --git a/0004-Increase-tolerances-to-work-on-all-arches.patch b/0004-Increase-tolerances-to-work-on-all-arches.patch index 339992b..cf57745 100644 --- a/0004-Increase-tolerances-to-work-on-all-arches.patch +++ b/0004-Increase-tolerances-to-work-on-all-arches.patch @@ -1,114 +1,35 @@ -From 1d4b227e21a4563e2b0526413783c603acd01f8c Mon Sep 17 00:00:00 2001 +From 6e0bc82b253ae9169c74979713a8e3cfeffc6925 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade -Date: Tue, 24 Jul 2018 01:35:02 -0400 -Subject: [PATCH 4/5] Increase tolerances to work on all arches. +Date: Sat, 21 Mar 2020 23:43:25 -0400 +Subject: [PATCH 4/4] Increase tolerances to work on all arches. Signed-off-by: Elliott Sales de Andrade --- - tests/testthat/test_layout.fr.R | 11 ++++------- - tests/testthat/test_layout.kk.R | 34 ++++++++++++++++----------------- - tests/testthat/test_sir.R | 2 +- - 3 files changed, 21 insertions(+), 26 deletions(-) + tests/testthat/test_layout.fr.R | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/testthat/test_layout.fr.R b/tests/testthat/test_layout.fr.R -index 4b3318a..f6a7ad2 100644 +index 3febdc3..f26ea6f 100644 --- a/tests/testthat/test_layout.fr.R +++ b/tests/testthat/test_layout.fr.R -@@ -9,19 +9,16 @@ test_that("", { - set.seed(42) +@@ -10,14 +10,15 @@ test_that("", { g <- make_ring(10) l <- layout_with_fr(g, niter=50, start.temp=sqrt(10)/10) -- if (.Machine$sizeof.pointer == 4) { -- expect_that(sum(l), equals(10.794223604849)) -- } else { -- expect_that(sum(l), equals(10.7943032688805)) -- } -+ expect_that(sum(l), equals(10.8, tolerance = 0.1)) + expect_true( +- isTRUE(all.equal(sum(l), 10.794223604849)) || +- isTRUE(all.equal(sum(l), 10.7943032688805)) ++ isTRUE(all.equal(sum(l), 10.8, tolerance = 0.1)) + ) set.seed(42) g <- make_star(30) l <- layout_with_fr(g, niter=500, dim=3, start.temp=20) -- if (.Machine$sizeof.pointer == 4) { -+ if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { -+ expect_that(sum(l), equals(1079, tolerance = 1)) -+ } else if (Sys.info()["machine"] == "i686") { - expect_that(sum(l), equals(1004.00737470853)) - } else { - expect_that(sum(l), equals(941.472420651506)) - } -- - }) -diff --git a/tests/testthat/test_layout.kk.R b/tests/testthat/test_layout.kk.R -index 51c915b..cfb77fb 100644 ---- a/tests/testthat/test_layout.kk.R -+++ b/tests/testthat/test_layout.kk.R -@@ -9,24 +9,20 @@ test_that("Kamada-Kawai layout generator works", { - l <- layout_with_kk(g, maxiter=50) - if (Sys.info()["sysname"] == "Darwin") { - expect_that(sum(l), equals(-1.13071769106689)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "x86_64") { -- expect_that(sum(l), equals(-6.77278645472984e-05)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "i686") { -- expect_that(sum(l), equals(0.914809637353466)) -+ } else if (Sys.info()["sysname"] == "Linux") { -+ if (Sys.info()["machine"] %in% c("aarch64", "i686", "ppc64", "ppc64le", "s390x")) { -+ expect_that(sum(l), equals(0.914809637353466)) -+ } else { -+ expect_that(sum(l), equals(-6.77278645472984e-05)) -+ } - } - - g <- make_star(30) - l <- layout_with_kk(g, maxiter=500) - if (Sys.info()["sysname"] == "Darwin") { - expect_that(sum(l), equals(-85.6883999492408)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "x86_64") { -- expect_that(sum(l), equals(-86.1405864709501)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "i686") { -- expect_that(sum(l), equals(-85.142223229617)) -+ } else if (Sys.info()["sysname"] == "Linux") { -+ expect_that(sum(l), equals(-84.8, tolerance = 0.1)) - } - - g <- make_ring(10) -@@ -34,12 +30,14 @@ test_that("Kamada-Kawai layout generator works", { - l <- layout_with_kk(g, maxiter=500) - if (Sys.info()["sysname"] == "Darwin") { - expect_that(sum(l), equals(1.61069099387368)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "x86_64") { -- expect_that(sum(l), equals(-1.83036635516248)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "i686") { -- expect_that(sum(l), equals(0.0631144692360025)) -+ } else if (Sys.info()["sysname"] == "Linux") { -+ if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { -+ expect_that(sum(l), equals(1.54, tolerance = 0.01)) -+ } else if (Sys.info()["machine"] == "i686") { -+ expect_that(sum(l), equals(0.0631144692360025)) -+ } else { -+ expect_that(sum(l), equals(-1.83036635516248)) -+ } - } - - }) -diff --git a/tests/testthat/test_sir.R b/tests/testthat/test_sir.R -index bff59c2..a64d873 100644 ---- a/tests/testthat/test_sir.R -+++ b/tests/testthat/test_sir.R -@@ -11,7 +11,7 @@ test_that("SIR works", { - - g <- sample_gnm(50, 50) - res <- sir(g, beta=5, gamma=1, no.sim=10) -- if (.Machine$sizeof.pointer == 4) { -+ if (Sys.info()["machine"] == "i686") { - expect_that(digest(res), equals("b73a8ad03b832b3543f2f03d07330398")) - } else { - expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea")) + expect_true( ++ (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x") && ++ isTRUE(all.equal(sum(l), 1079, tolerance = 1))) || + isTRUE(all.equal(sum(l), 1004.00737470853)) || + isTRUE(all.equal(sum(l), 941.472420651506)) + ) -- -2.20.1 +2.21.1 diff --git a/0005-Update-test-results-for-Rawhide.patch b/0005-Update-test-results-for-Rawhide.patch deleted file mode 100644 index 2b89526..0000000 --- a/0005-Update-test-results-for-Rawhide.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3cb50cb46fef23d9e9064393f44d61d4340993e2 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Tue, 24 Jul 2018 19:53:52 -0400 -Subject: [PATCH 5/5] Update test results for Rawhide. - -Signed-off-by: Elliott Sales de Andrade ---- - tests/testthat/test_layout.fr.R | 2 -- - tests/testthat/test_layout.kk.R | 4 +--- - tests/testthat/test_sir.R | 6 +----- - 3 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/tests/testthat/test_layout.fr.R b/tests/testthat/test_layout.fr.R -index f6a7ad2..71b9be4 100644 ---- a/tests/testthat/test_layout.fr.R -+++ b/tests/testthat/test_layout.fr.R -@@ -16,8 +16,6 @@ test_that("", { - l <- layout_with_fr(g, niter=500, dim=3, start.temp=20) - if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { - expect_that(sum(l), equals(1079, tolerance = 1)) -- } else if (Sys.info()["machine"] == "i686") { -- expect_that(sum(l), equals(1004.00737470853)) - } else { - expect_that(sum(l), equals(941.472420651506)) - } -diff --git a/tests/testthat/test_layout.kk.R b/tests/testthat/test_layout.kk.R -index cfb77fb..8460a5b 100644 ---- a/tests/testthat/test_layout.kk.R -+++ b/tests/testthat/test_layout.kk.R -@@ -10,7 +10,7 @@ test_that("Kamada-Kawai layout generator works", { - if (Sys.info()["sysname"] == "Darwin") { - expect_that(sum(l), equals(-1.13071769106689)) - } else if (Sys.info()["sysname"] == "Linux") { -- if (Sys.info()["machine"] %in% c("aarch64", "i686", "ppc64", "ppc64le", "s390x")) { -+ if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { - expect_that(sum(l), equals(0.914809637353466)) - } else { - expect_that(sum(l), equals(-6.77278645472984e-05)) -@@ -33,8 +33,6 @@ test_that("Kamada-Kawai layout generator works", { - } else if (Sys.info()["sysname"] == "Linux") { - if (Sys.info()["machine"] %in% c("aarch64", "ppc64", "ppc64le", "s390x")) { - expect_that(sum(l), equals(1.54, tolerance = 0.01)) -- } else if (Sys.info()["machine"] == "i686") { -- expect_that(sum(l), equals(0.0631144692360025)) - } else { - expect_that(sum(l), equals(-1.83036635516248)) - } -diff --git a/tests/testthat/test_sir.R b/tests/testthat/test_sir.R -index a64d873..2059270 100644 ---- a/tests/testthat/test_sir.R -+++ b/tests/testthat/test_sir.R -@@ -11,10 +11,6 @@ test_that("SIR works", { - - g <- sample_gnm(50, 50) - res <- sir(g, beta=5, gamma=1, no.sim=10) -- if (Sys.info()["machine"] == "i686") { -- expect_that(digest(res), equals("b73a8ad03b832b3543f2f03d07330398")) -- } else { -- expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea")) -- } -+ expect_that(digest(res), equals("bc42d0cbe0bb3321e83979c0432f9cea")) - }) - --- -2.20.1 - diff --git a/R-igraph.spec b/R-igraph.spec index ed82a55..abdcfc2 100644 --- a/R-igraph.spec +++ b/R-igraph.spec @@ -1,4 +1,5 @@ -%global packname igraph +%global packname igraph +%global packver 1.2.5 %global rlibdir %{_libdir}/R/library # Some loops; some unavailable yet. @@ -7,21 +8,20 @@ %bcond_with network Name: R-%{packname} -Version: 1.2.4.2 +Version: 1.2.5 Release: 1%{?dist} Summary: Network Analysis and Visualization # Main: GPLv2+; html_library.tcl: TCL License: GPLv2+ and TCL URL: https://CRAN.R-project.org/package=%{packname} -Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz +Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz # https://github.com/igraph/rigraph/pull/290 Patch0001: 0001-Update-FSF-address.patch # Unbundle some things: Patch0002: 0002-Unbundle-uuid.patch Patch0003: 0003-Unbundle-arpack.patch Patch0004: 0004-Increase-tolerances-to-work-on-all-arches.patch -Patch0005: 0005-Update-test-results-for-Rawhide.patch # Here's the R view of the dependencies world: # Depends: R-methods @@ -74,7 +74,7 @@ BuildRequires: openblas-devel # https://github.com/igraph/rigraph/issues/268 # Not a released version. -Provides: bundled(igraph) = 9acfa54fa6b3d182fe458434a497f4e9b5c39955 +Provides: bundled(igraph) = aecc58c67974bd97f8fd81aacbee6dcb2f928098 %description Routines for simple graphs and network analysis. It can handle large graphs @@ -90,9 +90,6 @@ pushd %{packname} %patch0002 -p1 %patch0003 -p1 %patch0004 -p1 -%if %{fedora} > 28 -%patch0005 -p1 -%endif # Fix executable files. chmod -x src/simpleraytracer/*.* @@ -146,6 +143,9 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} $ARGS %changelog +* Sat Mar 21 2020 Elliott Sales de Andrade - 1.2.5-1 +- Update to latest version + * Wed Nov 27 2019 Elliott Sales de Andrade - 1.2.4.2-1 - Update to latest version diff --git a/sources b/sources index 3e98166..719edea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (igraph_1.2.4.2.tar.gz) = 099fff8567685a8628ca0c8c4fd9373c7f9a281583ff303b3ccd6894931ab10c1f11938b4f9a3f017ff3367ddfeee14849b50494ddb47e5f46c1803be4987407 +SHA512 (igraph_1.2.5.tar.gz) = 627396fd4043fff640cb5a4f864613a43fd9042a50b60a55dab6c82857bb81dd72d0c1447b6267282a613550130e420c7b229306152213252d7733ec99c55102