From e52012895af4c92f008daac78c3d8b6d691a5dd1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Jun 2023 19:33:08 +0100 Subject: gentoo auto-resync : 26:06:2023 - 19:33:07 --- sci-libs/bliss/Manifest | 5 - sci-libs/bliss/files/bliss-0.73-autotools.patch | 99 ----- sci-libs/bliss/files/bliss-0.73-clang.patch | 11 - sci-libs/bliss/files/bliss-0.73-error.patch | 471 ------------------------ sci-libs/bliss/files/bliss-0.73-rehn.patch | 74 ---- sci-libs/bliss/files/bliss-0.73.1.in | 55 --- 6 files changed, 715 deletions(-) delete mode 100644 sci-libs/bliss/files/bliss-0.73-autotools.patch delete mode 100644 sci-libs/bliss/files/bliss-0.73-clang.patch delete mode 100644 sci-libs/bliss/files/bliss-0.73-error.patch delete mode 100644 sci-libs/bliss/files/bliss-0.73-rehn.patch delete mode 100644 sci-libs/bliss/files/bliss-0.73.1.in (limited to 'sci-libs/bliss') diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest index 493b3fb2ab76..49850b78ee7c 100644 --- a/sci-libs/bliss/Manifest +++ b/sci-libs/bliss/Manifest @@ -1,8 +1,3 @@ -AUX bliss-0.73-autotools.patch 3117 BLAKE2B d74cd207311cd1f6ef5be1c5c411493542146e8ba69fe0e40392458f758eec84411eedbe075ae8f3669fb4e8b6cdfb9e09db077c918db5d1b7203275d6004b05 SHA512 98333e4d97eca83776148b06e8ec41b283fa2a85a77a2c1281084a5af5efefb22ca34b9b6a11e2b9fdb71af944c6c56247291ea6721bd6d6dcf855e73116351e -AUX bliss-0.73-clang.patch 457 BLAKE2B 2875a16231e17d6cb8079fc67ad74df69b126d626cbbd7ccf588d9e96da7fcf8e3d645af876e2311d415a37985e68c0df72aa53b5fbb5691d9dc45773e42e226 SHA512 f496b178645a34ed65dbd4829f7bd1a9aaaf7c1e91e50e2c0e8957f20c5908728ba307c2afcbf6912fac3cb927d6e9a07ba27b4bce327c6061912f6afe883402 -AUX bliss-0.73-error.patch 14317 BLAKE2B b053cf310604c57fb4a51d3c9dee8f780b7ad55d8c2b955cb033ac342f64d50aa18c064604f68206c8fce8c08f89bdb0faeb48701c8255beff1034326f93e261 SHA512 d4adcd652016d4b62e4b366cdbd5bd60f1dbaf89619e1d8d4dad6092a3dbb4e27e12aa13c1fc1f12481f144696b2e1392ecbc67dab0485959450d39013613a14 -AUX bliss-0.73-rehn.patch 1669 BLAKE2B 6e109c0bc59c0000603dd59467b989a572f502aa352a4b09cec85a608f90163175cb4babcfbc8495a246e8a3406186feeda366131c3c637a9aab93d9c698d36e SHA512 ae70ebcd3d9ef2f744e951dfb9cc2b48bee741ee7ead557a0fdfdacbd1895b015bb9a8da986fa36b084d4c92f7a28adad1df14c0814847d84c46f73cb69123b7 -AUX bliss-0.73.1.in 1482 BLAKE2B 740fc9aa59ab9ea7819a1785aa3f0609774f0b89b08ffe3276b002f0f55eb5332ffda4952a54aa91f621ec533e1cf08b734a9686ca727e528a311d209401782c SHA512 7eb1d08f9c40358ef986d8fe31d42eb90dc57879cb399f45dcf5df85eecdc6fd86208f1bf06c21a6875e5a3fb5a634d818edd75ce2ccd855910feeb22b714f4b AUX bliss-0.77-install.patch 822 BLAKE2B df619f62b9de4d7bcf988c47b938586a4d5f2c648fd6ec3f04fd7dde44d63b8d0724a936cb6c139d04a4d8d854eb114899c4c15eacf7ccbce3192d3bcf33ddd5 SHA512 d3c441569e15dbf5530129c4d0db75f996ced82c94b92d9a44202a31fa49d24c660c983f19d8b6b845018926b54d80d6ab07bfad04e9ac3a1d9559c155b38cdd DIST bliss-0.77.zip 117888 BLAKE2B ce4b2fa568c5520fe41748bf59a493af1c33ec9cc0732aca5e5ba657ca726e118e26763355778e3def5716d62e7d3aceceb592ef67e5e148c250d3ffffab67d7 SHA512 d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17 EBUILD bliss-0.77.ebuild 651 BLAKE2B 88b49033455c58285f292c9f78077ec9d34c32a86dbc7cbbf58399e49db2261f965e6aa51ff3941ef79df1a732613315b89bcd45a5876ca2907fb1ffb6be4873 SHA512 71ff000764b75d580faa1da44caeba1338ca32253e4e930c37014a9229eced2e827048303bc7b1269a3e2de4e9f06caca8b69e09a467b4aa60ab48ea7ea5cbf1 diff --git a/sci-libs/bliss/files/bliss-0.73-autotools.patch b/sci-libs/bliss/files/bliss-0.73-autotools.patch deleted file mode 100644 index efdbcb81b42a..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-autotools.patch +++ /dev/null @@ -1,99 +0,0 @@ -Replace simple Makefile by autotools -- allow shared library -- parallel build -- added pkg-config support - -Author: Christoph Junghans - -diff -Naur bliss-0.72-fedora/config/.dummy bliss-0.72/config/.dummy ---- bliss-0.72-fedora/config/.dummy 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/config/.dummy 2013-04-28 14:43:06.143760368 -0600 -@@ -0,0 +1 @@ -+Dummy file to make patch create config dir, which is needed for autotools -diff -Naur bliss-0.72-fedora/configure.ac bliss-0.72/configure.ac ---- bliss-0.72-fedora/configure.ac 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/configure.ac 2013-04-28 14:40:42.283242722 -0600 -@@ -0,0 +1,32 @@ -+AC_PREREQ([2.65]) -+AC_INIT([bliss], [0.73], [Tommi.Junttil@kk.fi]) -+ -+AC_CONFIG_AUX_DIR(config) -+AC_CONFIG_MACRO_DIR(config) -+ -+AM_INIT_AUTOMAKE([1.8 foreign]) -+ -+SHARED_VERSION_INFO="1:0:0" -+AC_SUBST(SHARED_VERSION_INFO) -+ -+# Checks for programs. -+AC_PROG_CXX -+ -+LT_INIT -+# Checks for libraries. -+AC_ARG_WITH([gmp], -+ [AS_HELP_STRING([--with-gmp], [enable support for GNU Multiple Precision Arithmetic Library @<:@default=check@:>@])], -+ [], [with_gmp=no]) -+AS_IF([test "x$with_gmp" != xno], -+ [AC_CHECK_HEADERS([gmp.h],,AC_MSG_ERROR([Cannot find gmp.h header])) -+ AC_CHECK_LIB([gmp],_init,,AC_MSG_ERROR([Cannot find gmp library])) -+ AC_SUBST([GMP],[-lgmp]) -+ [CPPFLAGS="$CPPFLAGS -DBLISS_USE_GMP"]]) -+ -+AC_CHECK_PROG(DOXYGEN,doxygen,doxygen,no) -+AM_CONDITIONAL(HAVE_DOXYGEN,[test .$DOXYGEN != .no]) -+ -+AC_CONFIG_FILES([Makefile]) -+AC_CONFIG_FILES([bliss.pc]) -+AC_CONFIG_FILES([bliss.1]) -+AC_OUTPUT -diff -Naur bliss-0.72-fedora/bliss.pc.in bliss-0.72/bliss.pc.in ---- bliss-0.72-fedora/bliss.pc.in 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/bliss.pc.in 2013-04-28 14:40:54.223285686 -0600 -@@ -0,0 +1,13 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: bliss -+Description: Library for Computing Automorphism Groups and Canonical Labelings of Graphs -+URL: http://www.tcs.hut.fi/Software/bliss/index.shtml -+Version: @VERSION@ -+Requires: -+Libs: -L${libdir} -lbliss @GMP@ -+Libs.private: -lm -+Cflags: -I${includedir} -diff -Naur bliss-0.72-fedora/Makefile.am bliss-0.72/Makefile.am ---- bliss-0.72-fedora/Makefile.am 1969-12-31 17:00:00.000000000 -0700 -+++ bliss-0.72/Makefile.am 2013-04-28 14:47:26.944698789 -0600 -@@ -0,0 +1,30 @@ -+ACLOCAL_AMFLAGS = -I config -+ -+lib_LTLIBRARIES = libbliss.la -+ -+libbliss_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ -+libbliss_la_SOURCES = \ -+ defs.cc graph.cc partition.cc orbit.cc uintseqhash.cc heap.cc \ -+ timer.cc utils.cc bliss_C.cc -+ -+pkginclude_HEADERS = \ -+ bignum.hh bliss_C.h defs.hh graph.hh heap.hh kqueue.hh kstack.hh \ -+ orbit.hh partition.hh timer.hh uintseqhash.hh utils.hh -+ -+bin_PROGRAMS = bliss -+bliss_SOURCES = bliss.cc -+bliss_LDADD = libbliss.la -+dist_man1_MANS = bliss.1 -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = bliss.pc -+ -+html-local: Doxyfile -+if HAVE_DOXYGEN -+ $(DOXYGEN) $(srcdir)/Doxyfile -+else -+ @echo "doxygen was not found, please re-run configure" -+endif -+ -+clean-local: -+ -rm -rf html diff --git a/sci-libs/bliss/files/bliss-0.73-clang.patch b/sci-libs/bliss/files/bliss-0.73-clang.patch deleted file mode 100644 index 8a2e4bb6ca47..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bliss.cc.orig 2020-07-10 10:34:44.946000000 -0600 -+++ ./bliss.cc 2020-07-10 10:35:36.076000000 -0600 -@@ -59,7 +59,7 @@ - else program_name = argv0; - if(!program_name or *program_name == 0) program_name = "bliss"; - -- fprintf(fp, "bliss version %s (compiled "__DATE__")\n", bliss::version); -+ fprintf(fp, "bliss version %s (compiled %s)\n", bliss::version, __DATE__); - fprintf(fp, "Copyright 2003-2015 Tommi Junttila\n"); - fprintf(fp, - "\n" diff --git a/sci-libs/bliss/files/bliss-0.73-error.patch b/sci-libs/bliss/files/bliss-0.73-error.patch deleted file mode 100644 index cd0f5457219f..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-error.patch +++ /dev/null @@ -1,471 +0,0 @@ ---- ./bliss.cc.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./bliss.cc 2015-09-04 15:04:09.946602735 -0600 -@@ -276,13 +276,16 @@ main(const int argc, const char** argv) - if(opt_canonize == false) - { - /* No canonical labeling, only automorphism group */ -- g->find_automorphisms(stats, &report_aut, stdout); -+ if (!g->find_automorphisms(stats, &report_aut, stdout)) -+ exit(1); - } - else - { - /* Canonical labeling and automorphism group */ - const unsigned int* cl = g->canonical_form(stats, &report_aut, stdout); - -+ if (!cl) -+ exit(1); - fprintf(stdout, "Canonical labeling: "); - bliss::print_permutation(stdout, g->get_nof_vertices(), cl, 1); - fprintf(stdout, "\n"); -@@ -290,6 +293,8 @@ main(const int argc, const char** argv) - if(opt_output_can_file) - { - bliss::AbstractGraph* cf = g->permute(cl); -+ if (!cf) -+ exit(1); - FILE* const fp = fopen(opt_output_can_file, "w"); - if(!fp) - _fatal("Cannot open '%s' for outputting the canonical form, aborting", opt_output_can_file); ---- ./bliss_C.cc.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./bliss_C.cc 2015-09-04 15:04:09.945602814 -0600 -@@ -131,7 +131,7 @@ BlissGraph *bliss_permute(BlissGraph *gr - } - - extern "C" --void -+int - bliss_find_automorphisms(BlissGraph *graph, - void (*hook)(void *user_param, - unsigned int n, -@@ -142,7 +142,8 @@ bliss_find_automorphisms(BlissGraph *gra - bliss::Stats s; - assert(graph); - assert(graph->g); -- graph->g->find_automorphisms(s, hook, hook_user_param); -+ if (!graph->g->find_automorphisms(s, hook, hook_user_param)) -+ return 0; - - if(stats) - { -@@ -154,6 +155,7 @@ bliss_find_automorphisms(BlissGraph *gra - stats->nof_generators = s.get_nof_generators(); - stats->max_level = s.get_max_level(); - } -+ return 1; - } - - -@@ -173,7 +175,7 @@ bliss_find_canonical_labeling(BlissGraph - - canonical_labeling = graph->g->canonical_form(s, hook, hook_user_param); - -- if(stats) -+ if(canonical_labeling && stats) - { - stats->group_size_approx = s.get_group_size_approx(); - stats->nof_nodes = s.get_nof_nodes(); ---- ./bliss_C.h.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./bliss_C.h 2015-09-04 15:04:09.947602656 -0600 -@@ -156,6 +156,7 @@ unsigned int bliss_hash(BlissGraph *grap - * The argument \a perm should be an array of - * N=bliss::bliss_get_nof_vertices(\a graph) elements describing - * a bijection on {0,...,N-1}. -+ * Returns NULL if insufficient memory or internal error. - */ - BlissGraph *bliss_permute(BlissGraph *graph, const unsigned int *perm); - -@@ -174,8 +175,9 @@ BlissGraph *bliss_permute(BlissGraph *gr - * if you want to use the automorphism later, you have to take a copy of it. - * Do not call bliss_* functions in the hook. - * If \a stats is non-null, then some search statistics are copied there. -+ * \return nonzero if successful, zero if insufficient memory or internal error - */ --void -+int - bliss_find_automorphisms(BlissGraph *graph, - void (*hook)(void *user_param, - unsigned int N, -@@ -194,6 +196,7 @@ bliss_find_automorphisms(BlissGraph *gra - * then bliss_permute() with the returned canonical labeling. - * Note that the computed canonical version may depend on the applied version - * of bliss. -+ * Returns NULL if insufficient memory or internal error. - */ - const unsigned int * - bliss_find_canonical_labeling(BlissGraph *graph, ---- ./defs.cc.orig 2015-09-01 10:23:12.000000000 -0600 -+++ ./defs.cc 2015-09-04 15:04:09.947602656 -0600 -@@ -32,7 +32,6 @@ fatal_error(const char* fmt, ...) - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\nAborting!\n"); - va_end(ap); -- exit(1); - } - - } ---- ./graph.cc.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./graph.cc 2015-09-04 15:04:09.927604245 -0600 -@@ -34,7 +34,10 @@ - namespace bliss { - - #define _INTERNAL_ERROR() fatal_error("%s:%d: internal error",__FILE__,__LINE__) --#define _OUT_OF_MEMORY() fatal_error("%s:%d: out of memory",__FILE__,__LINE__) -+#define _OUT_OF_MEMORY(label) do { \ -+ fatal_error("%s:%d: out of memory",__FILE__,__LINE__); \ -+ goto label; \ -+ } while (0) - - /*------------------------------------------------------------------------- - * -@@ -279,20 +282,6 @@ AbstractGraph::reset_permutation(unsigne - *perm = i; - } - --bool --AbstractGraph::is_automorphism(unsigned int* const perm) --{ -- _INTERNAL_ERROR(); -- return false; --} -- --bool --AbstractGraph::is_automorphism(const std::vector& perm) const --{ -- _INTERNAL_ERROR(); -- return false; --} -- - - - -@@ -618,7 +607,7 @@ typedef struct { - } PathInfo; - - --void -+bool - AbstractGraph::search(const bool canonical, Stats& stats) - { - const unsigned int N = get_nof_vertices(); -@@ -658,7 +647,7 @@ AbstractGraph::search(const bool canonic - if(N == 0) - { - /* Nothing to do, return... */ -- return; -+ return true; - } - - /* Initialize the partition ... */ -@@ -696,10 +685,10 @@ AbstractGraph::search(const bool canonic - */ - if(first_path_labeling) free(first_path_labeling); - first_path_labeling = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!first_path_labeling) _OUT_OF_MEMORY(); -+ if(!first_path_labeling) _OUT_OF_MEMORY(oom1); - if(best_path_labeling) free(best_path_labeling); - best_path_labeling = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!best_path_labeling) _OUT_OF_MEMORY(); -+ if(!best_path_labeling) _OUT_OF_MEMORY(oom2); - - /* - * Is the initial partition discrete? -@@ -710,7 +699,7 @@ AbstractGraph::search(const bool canonic - update_labeling(best_path_labeling); - /* Update statistics */ - stats.nof_leaf_nodes = 1; -- return; -+ return true; - } - - /* -@@ -718,20 +707,39 @@ AbstractGraph::search(const bool canonic - */ - if(first_path_labeling_inv) free(first_path_labeling_inv); - first_path_labeling_inv = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!first_path_labeling_inv) _OUT_OF_MEMORY(); -+ if(!first_path_labeling_inv) _OUT_OF_MEMORY(oom3); - if(best_path_labeling_inv) free(best_path_labeling_inv); - best_path_labeling_inv = (unsigned int*)calloc(N, sizeof(unsigned int)); -- if(!best_path_labeling_inv) _OUT_OF_MEMORY(); -+ if(!best_path_labeling_inv) _OUT_OF_MEMORY(oom4); - - /* - * Allocate space for the automorphisms - */ - if(first_path_automorphism) free(first_path_automorphism); - first_path_automorphism = (unsigned int*)malloc(N * sizeof(unsigned int)); -- if(!first_path_automorphism) _OUT_OF_MEMORY(); -+ if(!first_path_automorphism) _OUT_OF_MEMORY(oom5); - if(best_path_automorphism) free(best_path_automorphism); - best_path_automorphism = (unsigned int*)malloc(N * sizeof(unsigned int)); -- if(!best_path_automorphism) _OUT_OF_MEMORY(); -+ if(!best_path_automorphism) { -+ _OUT_OF_MEMORY(oom6); -+ oom6: -+ free(first_path_automorphism); -+ first_path_automorphism = NULL; -+ oom5: -+ free(best_path_labeling_inv); -+ best_path_labeling_inv = NULL; -+ oom4: -+ free(first_path_labeling_inv); -+ first_path_labeling_inv = NULL; -+ oom3: -+ free(best_path_labeling); -+ best_path_labeling = NULL; -+ oom2: -+ free(first_path_labeling); -+ first_path_labeling = NULL; -+ oom1: -+ return false; -+ } - - /* - * Initialize orbit information so that all vertices are in their own orbits -@@ -1203,8 +1211,10 @@ AbstractGraph::search(const bool canonic - - #if defined(BLISS_VERIFY_EQUITABLEDNESS) - /* The new partition should be equitable */ -- if(!is_equitable()) -+ if(!is_equitable()) { - fatal_error("consistency check failed - partition after refinement is not equitable"); -+ return false; -+ } - #endif - - /* -@@ -1596,8 +1606,10 @@ AbstractGraph::search(const bool canonic - - #if defined(BLISS_VERIFY_AUTOMORPHISMS) - /* Verify that it really is an automorphism */ -- if(!is_automorphism(best_path_automorphism)) -+ if(!is_automorphism(best_path_automorphism)) { - fatal_error("Best path automorhism validation check failed"); -+ return false; -+ } - #endif - - unsigned int gca_level_with_first = 0; -@@ -1664,6 +1676,7 @@ AbstractGraph::search(const bool canonic - - - _INTERNAL_ERROR(); -+ return false; - - - handle_first_path_automorphism: -@@ -1699,8 +1712,10 @@ AbstractGraph::search(const bool canonic - - #if defined(BLISS_VERIFY_AUTOMORPHISMS) - /* Verify that it really is an automorphism */ -- if(!is_automorphism(first_path_automorphism)) -+ if(!is_automorphism(first_path_automorphism)) { - fatal_error("First path automorphism validation check failed"); -+ return false; -+ } - #endif - - if(opt_use_long_prune) -@@ -1747,12 +1762,13 @@ AbstractGraph::search(const bool canonic - /* Release component recursion data in partition */ - if(opt_use_comprec) - p.cr_free(); -+ return true; - } - - - - --void -+bool - AbstractGraph::find_automorphisms(Stats& stats, - void (*hook)(void *user_param, - unsigned int n, -@@ -1762,7 +1778,8 @@ AbstractGraph::find_automorphisms(Stats& - report_hook = hook; - report_user_param = user_param; - -- search(false, stats); -+ if (!search(false, stats)) -+ return false; - - if(first_path_labeling) - { -@@ -1774,6 +1791,7 @@ AbstractGraph::find_automorphisms(Stats& - free(best_path_labeling); - best_path_labeling = 0; - } -+ return true; - } - - -@@ -1788,7 +1806,8 @@ AbstractGraph::canonical_form(Stats& sta - report_hook = hook; - report_user_param = user_param; - -- search(true, stats); -+ if (!search(true, stats)) -+ return NULL; - - return best_path_labeling; - } -@@ -3479,15 +3498,17 @@ Digraph::initialize_certificate() - * Check whether perm is an automorphism. - * Slow, mainly for debugging and validation purposes. - */ --bool -+int - Digraph::is_automorphism(unsigned int* const perm) - { - std::set > edges1; - std::set > edges2; - - #if defined(BLISS_CONSISTENCY_CHECKS) -- if(!is_permutation(get_nof_vertices(), perm)) -+ if(!is_permutation(get_nof_vertices(), perm)) { - _INTERNAL_ERROR(); -+ return -1; -+ } - #endif - - for(unsigned int i = 0; i < get_nof_vertices(); i++) -@@ -3506,7 +3527,7 @@ Digraph::is_automorphism(unsigned int* c - ei++) - edges2.insert(*ei); - if(!(edges1 == edges2)) -- return false; -+ return 0; - - edges1.clear(); - for(std::vector::iterator ei = v1.edges_out.begin(); -@@ -3519,10 +3540,10 @@ Digraph::is_automorphism(unsigned int* c - ei++) - edges2.insert(*ei); - if(!(edges1 == edges2)) -- return false; -+ return 0; - } - -- return true; -+ return 1; - } - - bool -@@ -4337,8 +4358,10 @@ Graph* - Graph::permute(const unsigned int* perm) const - { - #if defined(BLISS_CONSISTENCY_CHECKS) -- if(!is_permutation(get_nof_vertices(), perm)) -+ if(!is_permutation(get_nof_vertices(), perm)) { - _INTERNAL_ERROR(); -+ return NULL; -+ } - #endif - - Graph* const g = new Graph(get_nof_vertices()); -@@ -5278,15 +5301,17 @@ Graph::initialize_certificate() - * - *-------------------------------------------------------------------------*/ - --bool -+int - Graph::is_automorphism(unsigned int* const perm) - { - std::set > edges1; - std::set > edges2; - - #if defined(BLISS_CONSISTENCY_CHECKS) -- if(!is_permutation(get_nof_vertices(), perm)) -+ if(!is_permutation(get_nof_vertices(), perm)) { - _INTERNAL_ERROR(); -+ return -1; -+ } - #endif - - for(unsigned int i = 0; i < get_nof_vertices(); i++) -@@ -5306,10 +5331,10 @@ Graph::is_automorphism(unsigned int* con - edges2.insert(*ei); - - if(!(edges1 == edges2)) -- return false; -+ return 0; - } - -- return true; -+ return 1; - } - - ---- ./graph.hh.orig 2015-09-01 10:23:10.000000000 -0600 -+++ ./graph.hh 2015-09-04 15:09:17.261182632 -0600 -@@ -159,7 +159,7 @@ public: - * Check whether \a perm is an automorphism of this graph. - * Unoptimized, mainly for debugging purposes. - */ -- virtual bool is_automorphism(const std::vector& perm) const; -+ virtual bool is_automorphism(const std::vector& perm) const = 0; - - - /** Activate/deactivate failure recording. -@@ -211,8 +211,10 @@ public: - * if you want to use the automorphism later, you have to take a copy of it. - * Do not call any member functions in the hook. - * The search statistics are copied in \a stats. -+ * \return true if successful, false if insufficient memory to search or -+ * other internal error. - */ -- void find_automorphisms(Stats& stats, -+ bool find_automorphisms(Stats& stats, - void (*hook)(void* user_param, - unsigned int n, - const unsigned int* aut), -@@ -232,6 +234,8 @@ public: - * Note that the computed canonical version may depend on the applied version - * of bliss as well as on some other options (for instance, the splitting - * heuristic selected with bliss::Graph::set_splitting_heuristic()). -+ * This function returns NULL if there is insufficient memory, or another -+ * internal error occurs. - */ - const unsigned int* canonical_form(Stats& stats, - void (*hook)(void* user_param, -@@ -436,7 +440,7 @@ protected: - void reset_permutation(unsigned int *perm); - - /* Mainly for debugging purposes */ -- virtual bool is_automorphism(unsigned int* const perm); -+ virtual int is_automorphism(unsigned int* const perm) = 0; - - std::vector certificate_current_path; - std::vector certificate_first_path; -@@ -450,7 +454,11 @@ protected: - virtual Partition::Cell* find_next_cell_to_be_splitted(Partition::Cell *cell) = 0; - - -- void search(const bool canonical, Stats &stats); -+ /** -+ * \return true if successful, false if insufficient memory to complete or -+ * other internal error -+ */ -+ bool search(const bool canonical, Stats &stats); - - - void (*report_hook)(void *user_param, -@@ -634,7 +642,7 @@ protected: - - void initialize_certificate(); - -- bool is_automorphism(unsigned int* const perm); -+ int is_automorphism(unsigned int* const perm); - - - bool nucr_find_first_component(const unsigned int level); -@@ -875,7 +883,7 @@ protected: - - void initialize_certificate(); - -- bool is_automorphism(unsigned int* const perm); -+ int is_automorphism(unsigned int* const perm); - - void sort_edges(); - diff --git a/sci-libs/bliss/files/bliss-0.73-rehn.patch b/sci-libs/bliss/files/bliss-0.73-rehn.patch deleted file mode 100644 index f37eedb4a6bd..000000000000 --- a/sci-libs/bliss/files/bliss-0.73-rehn.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- ./graph.cc.orig 2015-09-04 15:04:09.927604245 -0600 -+++ ./graph.cc 2015-09-04 15:09:46.999819514 -0600 -@@ -597,16 +597,6 @@ public: - }; - - -- -- --typedef struct { -- unsigned int splitting_element; -- unsigned int certificate_index; -- unsigned int subcertificate_length; -- UintSeqHash eqref_hash; --} PathInfo; -- -- - bool - AbstractGraph::search(const bool canonical, Stats& stats) - { -@@ -753,7 +743,6 @@ AbstractGraph::search(const bool canonic - initialize_certificate(); - - std::vector search_stack; -- std::vector first_path_info; - std::vector best_path_info; - - search_stack.clear(); -@@ -5477,7 +5466,7 @@ Graph::nucr_find_first_component(const u - component.clear(); - component_elements = 0; - sh_return = 0; -- unsigned int sh_first = 0; -+ unsigned int sh_first = 1 << 31; - unsigned int sh_size = 0; - unsigned int sh_nuconn = 0; - ---- ./graph.hh.orig 2015-09-04 15:09:17.261182632 -0600 -+++ ./graph.hh 2015-09-04 15:09:47.001819355 -0600 -@@ -109,9 +109,12 @@ public: - unsigned long int get_max_level() const {return max_level;} - }; - -- -- -- -+typedef struct { -+ unsigned int splitting_element; -+ unsigned int certificate_index; -+ unsigned int subcertificate_length; -+ UintSeqHash eqref_hash; -+} PathInfo; - - - /** -@@ -524,7 +527,7 @@ protected: - */ - unsigned int cr_component_elements; - -- -+ std::vector first_path_info; - - - }; -@@ -756,6 +759,10 @@ public: - void set_splitting_heuristic(const SplittingHeuristic shs) {sh = shs; } - - -+ /** -+ * Get an information vector about the first path. -+ */ -+ std::vector get_first_path_info() { return first_path_info; } - }; - - diff --git a/sci-libs/bliss/files/bliss-0.73.1.in b/sci-libs/bliss/files/bliss-0.73.1.in deleted file mode 100644 index f652c3d1307a..000000000000 --- a/sci-libs/bliss/files/bliss-0.73.1.in +++ /dev/null @@ -1,55 +0,0 @@ -.TH "BLISS" "1" "@VERSION@" "Tommi Junttila & Petteri Kaski" "User Commands" -.SH "NAME" -bliss \- Compute automorphism groups and canonical labelings of graphs -.SH "SYNOPSIS" -.B bliss -[\fIOPTIONS\fR] [<\fIGRAPH FILE\fR>] -.SH "DESCRIPTION" -.PP -Bliss is an open source tool for computing automorphism groups and -canonical forms of graphs. The graphs are specified in DIMACS format. -.TP -\fB\-directed\fR -the input graph is directed -.TP -\fB\-can\fR -compute canonical form -.TP -\fB\-ocan\fR=\fIf\fR -compute canonical form and output it in file \fIf\fR -.TP -\fB\-v\fR=\fIN\fR -set verbosity level to N [N >= 0, default: 1] -.TP -\fB\-sh\fR=\fIX\fR -select splitting heuristics, where X is: -.TS -tab(;); -R L. -f;first non-singleton cell -fl;first largest non-singleton cell -fs;first smallest non-singleton cell -fm;first maximally non-trivially connected non-singleton cell -flm;first largest maximally non-trivially connected -;non-singleton cell -fsm;first smallest maximally non-trivially connected -;non-singleton cell (default) -.TE -.TP -\fB\-fr\fR=\fIX\fR -use failure recording? [X=y/n, default: y] -.TP -\fB\-cr\fR=\fIX\fR -use component recursion? [X=y/n, default: y] -.TP -\fB\-version\fR -print the version number and exit -.TP -\fB\-help\fR -print this help and exit -.SH "AUTHORS" -Bliss was written by Tommi Junttila and -Petteri Kaski . -.PP -This man page was written by Jerry James . -It is distributed under the same terms as bliss. -- cgit v1.2.3