Skip to content

Commit 7c6cda9

Browse files
author
Release Manager
committed
gh-36541: `build/pkgs/nauty`: Upgrade to 2.8.6, require nauty >= 2.8 <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> https://pallini.di.uniroma1.it/changes24-28.txt <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> Fixes #36257. Continuation of #36262 We also tighten what versions of system nauty that we accept, because #36257 was motivated by a new feature. This change should also fix failures from accepting ancient versions of system nauty, such as - `ubuntu-xenial-toolchain-gcc_9` https://github.com/mkoeppe/sage/action s/runs/6622955701/job/18026345225#step:10:7570 in src/sage/graphs/digraph_generators.py and other files <!-- If your change requires a documentation PR, please link it appropriately. --> ### :memo: Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] 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 accordingly. ### :hourglass: Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36541 Reported by: Matthias Köppe Reviewer(s): David Coudert
2 parents c8299c7 + a95b9d6 commit 7c6cda9

File tree

5 files changed

+158
-10
lines changed

5 files changed

+158
-10
lines changed

‎build/pkgs/nauty/checksums.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=nautyVERSION.tar.gz
2-
sha1=c9fd2b4c99b8c624e430f3f4e1492a4219e3495e
3-
md5=2ead635a417e20a18b3aabee83fac1ef
4-
cksum=718823455
5-
upstream_url=http://pallini.di.uniroma1.it/nauty27r1.tar.gz
2+
sha1=10c39117c55c69c18c6a107110e7c08f3d873652
3+
md5=7a82f4209f5d552da3078c67e5af872e
4+
cksum=2164796643
5+
upstream_url=https://pallini.di.uniroma1.it/nauty2_8_6.tar.gz

‎build/pkgs/nauty/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
27r1.p1
1+
2.8.6.p0

‎build/pkgs/nauty/patches/nauty-2.8.6-gentreeg-gentourng.patch

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001
2+
From: Michael Orlitzky <[email protected]>
3+
Date: Tue, 17 Jan 2023 19:44:49 -0500
4+
Subject: [PATCH 1/1] Upstream fixes for gentreeg and gentourng.
5+
6+
https://mailman.anu.edu.au/pipermail/nauty/2023-January/000903.html
7+
---
8+
gentourng.c | 2 +-
9+
gentreeg.c | 95 ++++++++++++++++++++++++++++-------------------------
10+
2 files changed, 51 insertions(+), 46 deletions(-)
11+
12+
diff --git a/gentourng.c b/gentourng.c
13+
index 634e5e8..5c7ffff 100644
14+
--- a/gentourng.c
15+
+++ b/gentourng.c
16+
@@ -1408,7 +1408,7 @@ PLUGIN_INIT
17+
(*outproc)(outfile,g,1);
18+
}
19+
}
20+
- else
21+
+ else if (!connec || maxn != 2)
22+
{
23+
makeleveldata();
24+
25+
diff --git a/gentreeg.c b/gentreeg.c
26+
index 946d5f8..15bf87b 100644
27+
--- a/gentreeg.c
28+
+++ b/gentreeg.c
29+
@@ -1,4 +1,4 @@
30+
-/* gentree version 1.3; Brendan McKay Oct 2022 */
31+
+/* gentree version 1.4; Brendan McKay Dec 2022 */
32+
/* This program is a wrapper for the program FreeTrees.c written
33+
* by Gang Li & Frank Ruskey. See below for their original
34+
* comments. */
35+
@@ -32,49 +32,54 @@ Counts for n=1..45:
36+
1: 1
37+
2: 1
38+
3: 1
39+
- 4: 1
40+
- 5: 2
41+
- 6: 3
42+
- 7: 6
43+
- 8: 11
44+
- 9: 23
45+
-10: 47
46+
-11: 106
47+
-12: 235
48+
-13: 551
49+
-14: 1301
50+
-15: 3159
51+
-16: 7741
52+
-17: 19320
53+
-18: 48629
54+
-19: 123867
55+
-20: 317955
56+
-21: 823065
57+
-22: 2144505
58+
-23: 5623756
59+
-24: 14828074
60+
-25: 39299897
61+
-26: 104636890
62+
-27: 279793450
63+
-28: 751065460
64+
-29: 2023443032
65+
-30: 5469566585
66+
-31: 14830871802
67+
-32: 40330829030
68+
-33: 109972410221
69+
-34: 300628862480
70+
-35: 823779631721
71+
-36: 2262366343746
72+
-37: 6226306037178
73+
-38: 17169677490714
74+
-39: 47436313524262
75+
-40: 131290543779126
76+
-41: 363990257783343
77+
-42: 1010748076717151
78+
-43: 2810986483493475
79+
-44: 7828986221515605
80+
-45: 21835027912963086
81+
-********************************/
82+
+ 4: 2
83+
+ 5: 3
84+
+ 6: 6
85+
+ 7: 11
86+
+ 8: 23
87+
+ 9: 47
88+
+10: 106
89+
+11: 235
90+
+12: 551
91+
+13: 1301
92+
+14: 3159
93+
+15: 7741
94+
+16: 19320
95+
+17: 48629
96+
+18: 123867
97+
+19: 317955
98+
+20: 823065
99+
+21: 2144505
100+
+22: 5623756
101+
+23: 14828074
102+
+24: 39299897
103+
+25: 104636890
104+
+26: 279793450
105+
+27: 751065460
106+
+28: 2023443032
107+
+29: 5469566585
108+
+30: 14830871802
109+
+31: 40330829030
110+
+32: 109972410221
111+
+33: 300628862480
112+
+34: 823779631721
113+
+35: 2262366343746
114+
+36: 6226306037178
115+
+37: 17169677490714
116+
+38: 47436313524262
117+
+39: 131290543779126
118+
+40: 363990257783343
119+
+41: 1010748076717151
120+
+42: 2810986483493475
121+
+43: 7828986221515605
122+
+44: 21835027912963086
123+
+45: 60978390985918906
124+
+46: 170508699155987862
125+
+47: 477355090753926460
126+
+48: 1337946100045842285
127+
+49: 3754194185716399992
128+
+50: 10545233702911509534
129+
+*******************************/
130+
131+
/* Comments on original program by original authors */
132+
/*==============================================================*/
133+
@@ -676,7 +681,7 @@ PLUGIN_INIT
134+
}
135+
else if (nv == 2)
136+
{
137+
- if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 2)
138+
+ if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 1)
139+
{
140+
par[1] = 0;
141+
par[2] = 1;
142+
--
143+
2.38.2
144+

‎build/pkgs/nauty/spkg-configure.m4

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# We don't use the "converseg" program, but we need to ensure that we
22
# only detect nauty >= 2.6 because we use the digraph6 format from
33
# that version -- and converseg was added in nauty-2.6.
4+
#
5+
# We also don't use the "genposetg" program (added in nauty 2.8) yet.
6+
# We require it here to prepare Sage for the use of the major new features
7+
# added in 2.7 and 2.8 (https://pallini.di.uniroma1.it/changes24-28.txt).
48
AC_DEFUN([SAGE_TEST_NAUTY_PROGS], [
5-
m4_foreach([nautyprog], [directg, gentourng, geng, genbg, gentreeg, converseg], [
9+
m4_foreach([nautyprog], [directg, gentourng, geng, genbg, gentreeg, converseg, genposetg], [
610
AC_PATH_PROG([$2]nautyprog, [[$1]nautyprog])
711
AS_IF([test x$[$2]nautyprog = x], [sage_spkg_install_nauty=yes])
812
])

‎build/pkgs/nauty/spkg-install.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ sdh_make
77

88
# No install target so we resort to manual copy
99
PROGRAMS="
10-
addedgeg amtog biplabg catg complg converseg copyg countg cubhamg deledgeg
11-
delptg directg dreadnaut dretodot dretog genbg genbgL geng genquarticg genrang
12-
genspecialg gentourng gentreeg hamheuristic labelg linegraphg listg multig
13-
newedgeg pickg planarg ranlabg shortg showg subdivideg twohamg vcolg
10+
addedgeg addptg amtog ancestorg assembleg biplabg catg complg converseg copyg countg cubhamg deledgeg
11+
delptg dimacs2g directg dreadnaut dretodot dretog edgetransg genbg genbgL geng gengL genposetg genquarticg genrang
12+
genspecialg gentourng gentreeg hamheuristic labelg linegraphg listg multig nbrhoodg
13+
newedgeg pickg planarg productg ranlabg shortg showg subdivideg twohamg underlyingg vcolg
1414
watercluster2 NRswitchg"
1515
sdh_install $PROGRAMS "$SAGE_LOCAL/bin"
1616

0 commit comments

Comments
 (0)