diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,13 +1,14 @@ -libboost_context.so.1.66.0 -libboost_iostreams.so.1.66.0 -libboost_python3.so.1.66.0 -libboost_regex.so.1.66.0 +ld-linux-x86-64.so.2 +libboost_context.so.1.72.0 +libboost_iostreams.so.1.72.0 +libboost_python37.so.1.72.0 +libboost_regex.so.1.72.0 libc.so.6 libcairomm-1.0.so.1 libexpat.so.1 libgcc_s.so.1 libgmp.so.10 +libgomp.so.1 libm.so.6 -libomp.so libpython3.7m.so.1.0 libstdc++.so.6 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : graph-tool -version : 2.29 -release : 8 +version : '2.33' +release : 10 source : - - https://downloads.skewed.de/graph-tool/graph-tool-2.29.tar.bz2 : 6c0c4336bed6e2f79c91ace6d6914145ee03d0bd5025473b5918aec2b0657f7a + - https://downloads.skewed.de/graph-tool/graph-tool-2.33.tar.bz2 : f07025160a8cb376551508c6d8aa5fd05a146c67c4706ea4635d2766aa5c9fcb license : GPL-3.0-or-later component : programming.python summary : Efficient python module for analysis of graphs @@ -22,11 +22,21 @@ - matplotlib - python3-cairo - scipy -clang : yes +# If clang set to yes, the submodules give an error when imported +#clang : yes +environment: | + # workaround for bug in boost 1.72 + export CPPFLAGS="$CPPFLAGS -DHAVE_BOOST_COROUTINE" + # Linking jobs routinely use 10+ GiB of RAM, so limit them to 1 at a time + export LLVM_PARALLEL_LINK_JOBS=1 setup : | %configure PREFIX=/usr PYTHON=python3 build : | - # build with -j1 to limit memory usage (this is a memory monster) - %make -j1 + # Maximum observed single compile job size is around 8 GiB Resident with sizes in the range 1.5-5 GiB the most common. + # Likely due to poor job parallelism in make, the build will fan out to $CPUs -> 4-6 CPUs -> 1-2 CPUs. + # For systems with 16 GiB RAM, make -j3 is barely suitable and make -j2 is recommended if the system will be in use during the build. + # For systems with 32 GiB RAM, make -j12 is probably the maximum. + # For systems with 64 GiB RAM, make -j24 is probably the maximum. (Should be used for the Buildserver) + %make -j2 install : | %make_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ graph-tool - Bryan T. Meyers - bmeyers@datadrake.com + Padraig Mac Carron + padraig.maccarron@ul.ie GPL-3.0-or-later programming.python @@ -106,6 +106,7 @@ /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/graphviz.hpp /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/isomorphism.hpp /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/kamada_kawai_spring_layout.hpp + /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/maximum_weighted_matching.hpp /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/metric_tsp_approx.hpp /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/named_function_params-alt.hpp /usr/lib/python3.7/site-packages/graph_tool/include/boost-workaround/boost/graph/overloading.hpp @@ -169,52 +170,58 @@ /usr/lib/python3.7/site-packages/graph_tool/include/hash_map_wrap.hh /usr/lib/python3.7/site-packages/graph_tool/include/histogram.hh /usr/lib/python3.7/site-packages/graph_tool/include/idx_map.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/bundled_vacate_loop.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/cache.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/exhaustive_loop.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/gibbs_loop.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_continuous.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_discrete.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_epidemics_mcmc_h.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_mcmc.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_pseudo_ising_mcmc_h.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_elist.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_em.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_emat.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_entries.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_entropy.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_exhaustive.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_gibbs.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_layers.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_layers_util.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_mcmc.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_measured.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_merge.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_multicanonical.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_multiflip_mcmc.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_overlap.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_overlap_mcmc_bundled.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_overlap_partition.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_overlap_util.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_overlap_vacate.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_partition.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_sample_edge.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_marginal.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_mcmc.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_util.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_util.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_blockmodel_weights.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_elist.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_em.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_emat.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_entries.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_entropy.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_exhaustive.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_gibbs.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_mcmc.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_merge.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_multicanonical.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_partition.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_util.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/blockmodel/graph_blockmodel_weights.hh /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_latent_multigraph.hh /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_modularity.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_neighbor_sampler.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/graph_state.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/int_part.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/mcmc_loop.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/merge_loop.hh - /usr/lib/python3.7/site-packages/graph_tool/include/inference/util.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/layers/graph_blockmodel_layers.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/layers/graph_blockmodel_layers_util.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/loops/bundled_vacate_loop.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/loops/exhaustive_loop.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/loops/gibbs_loop.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/loops/mcmc_loop.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/loops/merge_loop.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/modularity/graph_modularity.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/overlap/graph_blockmodel_overlap.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/overlap/graph_blockmodel_overlap_mcmc_bundled.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/overlap/graph_blockmodel_overlap_partition.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/overlap/graph_blockmodel_overlap_util.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/overlap/graph_blockmodel_overlap_vacate.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/partition_centroid/graph_partition_centroid.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/partition_centroid/graph_partition_centroid_rmi.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/partition_modes/graph_partition_mode.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/partition_modes/graph_partition_mode_clustering.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/planted_partition/graph_planted_partition.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/support/cache.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/support/graph_neighbor_sampler.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/support/graph_state.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/support/int_part.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/support/util.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_dynamics.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_dynamics_continuous.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_dynamics_discrete.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_dynamics_epidemics_mcmc_h.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_dynamics_mcmc.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_dynamics_pseudo_ising_mcmc_h.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_measured.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_sample_edge.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_uncertain.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_uncertain_marginal.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_uncertain_mcmc.hh + /usr/lib/python3.7/site-packages/graph_tool/include/inference/uncertain/graph_blockmodel_uncertain_util.hh /usr/lib/python3.7/site-packages/graph_tool/include/layout/graph_arf.hh /usr/lib/python3.7/site-packages/graph_tool/include/layout/graph_sfdp.hh /usr/lib/python3.7/site-packages/graph_tool/include/mpl_nested_loop.hh @@ -237,6 +244,7 @@ /usr/lib/python3.7/site-packages/graph_tool/include/stats/graph_histograms.hh /usr/lib/python3.7/site-packages/graph_tool/include/stats/graph_parallel.hh /usr/lib/python3.7/site-packages/graph_tool/include/str_repr.hh + /usr/lib/python3.7/site-packages/graph_tool/include/topology/graph_bipartite_weighted_matching.hh /usr/lib/python3.7/site-packages/graph_tool/include/topology/graph_components.hh /usr/lib/python3.7/site-packages/graph_tool/include/topology/graph_kcore.hh /usr/lib/python3.7/site-packages/graph_tool/include/topology/graph_maximal_cliques.hh @@ -268,6 +276,12 @@ /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/nested_blockmodel.cpython-37.pyc /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/overlap_blockmodel.cpython-37.opt-1.pyc /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/overlap_blockmodel.cpython-37.pyc + /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/partition_centroid.cpython-37.opt-1.pyc + /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/partition_centroid.cpython-37.pyc + /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/partition_modes.cpython-37.opt-1.pyc + /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/partition_modes.cpython-37.pyc + /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/planted_partition.cpython-37.opt-1.pyc + /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/planted_partition.cpython-37.pyc /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/uncertain_blockmodel.cpython-37.opt-1.pyc /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/uncertain_blockmodel.cpython-37.pyc /usr/lib/python3.7/site-packages/graph_tool/inference/__pycache__/util.cpython-37.opt-1.pyc @@ -283,6 +297,9 @@ /usr/lib/python3.7/site-packages/graph_tool/inference/modularity.py /usr/lib/python3.7/site-packages/graph_tool/inference/nested_blockmodel.py /usr/lib/python3.7/site-packages/graph_tool/inference/overlap_blockmodel.py + /usr/lib/python3.7/site-packages/graph_tool/inference/partition_centroid.py + /usr/lib/python3.7/site-packages/graph_tool/inference/partition_modes.py + /usr/lib/python3.7/site-packages/graph_tool/inference/planted_partition.py /usr/lib/python3.7/site-packages/graph_tool/inference/uncertain_blockmodel.py /usr/lib/python3.7/site-packages/graph_tool/inference/util.py /usr/lib/python3.7/site-packages/graph_tool/libgraph_tool_core.so @@ -307,8 +324,9 @@ /usr/lib/python3.7/site-packages/graph_tool/util/__pycache__/__init__.cpython-37.pyc /usr/lib/python3.7/site-packages/graph_tool/util/libgraph_tool_util.so /usr/share/doc/graph-tool/AUTHORS + /usr/share/doc/graph-tool/COPYING + /usr/share/doc/graph-tool/COPYING.LESSER /usr/share/doc/graph-tool/INSTALL - /usr/share/doc/graph-tool/LICENSE /usr/share/doc/graph-tool/README.md /usr/share/doc/graph-tool/doc/.static/graph-icon.ico /usr/share/doc/graph-tool/doc/.static/graph-icon.png @@ -359,19 +377,19 @@ programming.devel - graph-tool + graph-tool /usr/lib64/pkgconfig/graph-tool-py3.7.pc - - 2020-02-06 - 2.29 + + 2020-07-30 + 2.33 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Padraig Mac Carron + padraig.maccarron@ul.ie \ No newline at end of file