Skip to content

Commit

Permalink
sagemathgh-38163: build/pkgs/tdlib: Update to 0.9.3
Browse files Browse the repository at this point in the history
    
<!-- ^ Please provide a concise and informative title. -->
<!-- ^ Don't put issue numbers in the title, do this in the PR
description below. -->
<!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method
to calculate 1 + 2". -->
<!-- v Describe your changes below in detail. -->
<!-- v Why is this change required? What problem does it solve? -->
<!-- v If this PR resolves an open issue, please link to it here. For
example, "Fixes sagemath#12345". -->

- FIxes sagemath#30813
- Fixes sagemath#38159

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->

- [x] The title is concise and informative.
- [ ] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation and checked the documentation
preview.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on. For example,
-->
<!-- - sagemath#12345: short description why this is a dependency -->
<!-- - sagemath#34567: ... -->

- Depends on sagemath#38144 (merged here for testing)
    
URL: sagemath#38163
Reported by: Matthias Köppe
Reviewer(s): David Coudert
  • Loading branch information
Release Manager committed Jun 9, 2024
2 parents fe3768c + 6e28e75 commit 4e53dc3
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 32 deletions.
27 changes: 9 additions & 18 deletions build/pkgs/tdlib/SPKG.rst
Original file line number Diff line number Diff line change
@@ -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 ([email protected])
- GNU General Public License v2
- GNU General Public License v3


Upstream Contact
----------------

- Lukas Larisch ([email protected])
- git-repo: https://github.com/freetdi/tdlib

Dependencies
------------

- None
- https://gitlab.com/freetdi/treedec
- https://github.com/freetdi/tdlib
- https://github.com/felix-salfelder
7 changes: 4 additions & 3 deletions build/pkgs/tdlib/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions build/pkgs/tdlib/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
boost_cropped
2 changes: 1 addition & 1 deletion build/pkgs/tdlib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.1.p0
0.9.3.p0
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From f9bea896a49ef909aeb910c140661ab06b3b6a0b Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <[email protected]>
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<G_t, config>::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<G_t>::vertex_iterator vIt, vEnd;
--
2.42.0

2 changes: 1 addition & 1 deletion build/pkgs/tdlib/spkg-install.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cd src

sdh_configure
sdh_configure --with-python=no
sdh_make
sdh_make_install -j1
11 changes: 2 additions & 9 deletions src/sage/graphs/graph_decompositions/sage_tdlib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <map>

#include <boost/graph/adjacency_list.hpp>
#include "tdlib/TD_combinations.hpp"
#include "tdlib/TD_misc.hpp"
#include <treedec/combinations.hpp>
#include <treedec/misc.hpp>

#ifndef TD_STRUCT_VERTEX
#define TD_STRUCT_VERTEX
Expand All @@ -18,13 +18,6 @@ struct Vertex{

typedef boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS, Vertex> TD_graph_t;

struct bag{
std::set<unsigned int> bag;
};

typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, bag> TD_tree_dec_t;


void make_tdlib_graph(TD_graph_t &G, std::vector<unsigned int> &V, std::vector<unsigned int> &E){
unsigned int max = 0;
for(unsigned int i = 0; i < V.size(); i++)
Expand Down

0 comments on commit 4e53dc3

Please sign in to comment.