diff --git a/build/pkgs/tdlib/SPKG.rst b/build/pkgs/tdlib/SPKG.rst index ebcdd1213e0..9f4c30a3d01 100644 --- a/build/pkgs/tdlib/SPKG.rst +++ b/build/pkgs/tdlib/SPKG.rst @@ -1,32 +1,23 @@ -tdlib: Algorithms for computing tree decompositions -=================================================== +tdlib: Algorithms for computing tree decompositions of graphs +============================================================= Description ----------- -Providing algorithms concerning treedecompositions +This library, now known as treedec, +provides algorithms concerning tree decompositions. -website: https://github.com/freetdi/tdlib License ------- -GNU General Public License v2 - - -SPKG Maintainers ----------------- - -Lukas Larisch (lukas.larisch@kaust.edu.sa) +- GNU General Public License v2 +- GNU General Public License v3 Upstream Contact ---------------- -- Lukas Larisch (lukas.larisch@kaust.edu.sa) -- git-repo: https://github.com/freetdi/tdlib - -Dependencies ------------- - -- None +- https://gitlab.com/freetdi/treedec +- https://github.com/freetdi/tdlib +- https://github.com/felix-salfelder diff --git a/build/pkgs/tdlib/checksums.ini b/build/pkgs/tdlib/checksums.ini index 6f3275ad092..36ade31259e 100644 --- a/build/pkgs/tdlib/checksums.ini +++ b/build/pkgs/tdlib/checksums.ini @@ -1,3 +1,4 @@ -tarball=tdlib-VERSION.tar.gz -sha1=8e200d0e3ac009030f3ada6658d20717e433220f -sha256=5a40375e738e9e6dbd37f53e54deb1efa6b58f154d83b7bfeaee9f47d47b444b +tarball=treedec-VERSION.tar.gz +sha1=355930ce66a14afed89d32ead280bfdd801d53d7 +sha256=16f9683af4c33e3e79fe36439cb4bb4b63216ad88d59f5dc00dd3fb9256aa4ae +upstream_url=https://www.algok.uni-bamberg.de/treedec/treedec-VERSION.tar.gz diff --git a/build/pkgs/tdlib/dependencies b/build/pkgs/tdlib/dependencies new file mode 100644 index 00000000000..d568ea3cf53 --- /dev/null +++ b/build/pkgs/tdlib/dependencies @@ -0,0 +1 @@ +boost_cropped diff --git a/build/pkgs/tdlib/package-version.txt b/build/pkgs/tdlib/package-version.txt index af2629893df..998ed53f13a 100644 --- a/build/pkgs/tdlib/package-version.txt +++ b/build/pkgs/tdlib/package-version.txt @@ -1 +1 @@ -0.3.1.p0 +0.9.3.p0 diff --git a/build/pkgs/tdlib/patches/0001-src-exact_cutset.hpp-Suppress-incomplete-message.patch b/build/pkgs/tdlib/patches/0001-src-exact_cutset.hpp-Suppress-incomplete-message.patch new file mode 100644 index 00000000000..9369b84d496 --- /dev/null +++ b/build/pkgs/tdlib/patches/0001-src-exact_cutset.hpp-Suppress-incomplete-message.patch @@ -0,0 +1,25 @@ +From f9bea896a49ef909aeb910c140661ab06b3b6a0b Mon Sep 17 00:00:00 2001 +From: Matthias Koeppe +Date: Fri, 7 Jun 2024 12:21:28 -0700 +Subject: [PATCH] src/exact_cutset.hpp: Suppress 'incomplete' message + +--- + src/exact_cutset.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/exact_cutset.hpp b/src/exact_cutset.hpp +index 782bb96..2caa7bd 100755 +--- a/src/exact_cutset.hpp ++++ b/src/exact_cutset.hpp +@@ -994,7 +994,7 @@ bool exact_cutset::try_it(T_t &T, unsigned bagsize) + }else{ + // incomplete(); //no// + // messes up random tests, send to cerr instead +- std::cerr << "incomplete ../../src/exact_cutset.hpp:978:try_it\n"; ++ // std::cerr << "incomplete ../../src/exact_cutset.hpp:978:try_it\n"; + } + + typename boost::graph_traits::vertex_iterator vIt, vEnd; +-- +2.42.0 + diff --git a/build/pkgs/tdlib/spkg-install.in b/build/pkgs/tdlib/spkg-install.in index 9ee5b9f1566..09c5e4899a0 100644 --- a/build/pkgs/tdlib/spkg-install.in +++ b/build/pkgs/tdlib/spkg-install.in @@ -1,5 +1,5 @@ cd src -sdh_configure +sdh_configure --with-python=no sdh_make sdh_make_install -j1 diff --git a/src/sage/graphs/graph_decompositions/sage_tdlib.cpp b/src/sage/graphs/graph_decompositions/sage_tdlib.cpp index 3644edf6ac7..886859e8d74 100644 --- a/src/sage/graphs/graph_decompositions/sage_tdlib.cpp +++ b/src/sage/graphs/graph_decompositions/sage_tdlib.cpp @@ -4,8 +4,8 @@ #include #include -#include "tdlib/TD_combinations.hpp" -#include "tdlib/TD_misc.hpp" +#include +#include #ifndef TD_STRUCT_VERTEX #define TD_STRUCT_VERTEX @@ -18,13 +18,6 @@ struct Vertex{ typedef boost::adjacency_list TD_graph_t; -struct bag{ - std::set bag; -}; - -typedef boost::adjacency_list TD_tree_dec_t; - - void make_tdlib_graph(TD_graph_t &G, std::vector &V, std::vector &E){ unsigned int max = 0; for(unsigned int i = 0; i < V.size(); i++)