mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 06:01:19 +00:00
sage: work around glpk aarch64 issue instead of disabling test (#351248)
This commit is contained in:
commit
9ec0e7ca4e
@ -1,17 +0,0 @@
|
|||||||
diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py
|
|
||||||
index 2deb533f7f..663ff2cd13 100644
|
|
||||||
--- a/src/sage/graphs/generic_graph.py
|
|
||||||
+++ b/src/sage/graphs/generic_graph.py
|
|
||||||
@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx):
|
|
||||||
sage: G = DiGraph(d6, format='dig6')
|
|
||||||
sage: G.edge_connectivity()
|
|
||||||
5
|
|
||||||
- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip
|
|
||||||
- [Digraph on 28 vertices,
|
|
||||||
- Digraph on 28 vertices,
|
|
||||||
- Digraph on 28 vertices,
|
|
||||||
- Digraph on 28 vertices,
|
|
||||||
- Digraph on 28 vertices]
|
|
||||||
|
|
||||||
Small cases::
|
|
||||||
|
|
@ -54,13 +54,12 @@ stdenv.mkDerivation rec {
|
|||||||
# fix those bugs themselves. This is for critical bugfixes, where "critical"
|
# fix those bugs themselves. This is for critical bugfixes, where "critical"
|
||||||
# == "causes (transient) doctest failures / somebody complained".
|
# == "causes (transient) doctest failures / somebody complained".
|
||||||
bugfixPatches = [
|
bugfixPatches = [
|
||||||
# Sage uses mixed integer programs (MIPs) to find edge disjoint
|
# https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
|
||||||
# spanning trees. For some reason, aarch64 glpk takes much longer
|
(fetchpatch {
|
||||||
# than x86_64 glpk to solve such MIPs. Since the MIP formulation
|
name = "glpk-aarch64-hang-workaround.patch";
|
||||||
# has "numerous problems" and will be replaced by a polynomial
|
url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff";
|
||||||
# algorithm soon, disable this test for now.
|
hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0=";
|
||||||
# https://github.com/sagemath/sage/issues/34575
|
})
|
||||||
./patches/disable-slow-glpk-test.patch
|
|
||||||
|
|
||||||
# compile libs/gap/element.pyx with -O1
|
# compile libs/gap/element.pyx with -O1
|
||||||
# a more conservative version of https://github.com/sagemath/sage/pull/37951
|
# a more conservative version of https://github.com/sagemath/sage/pull/37951
|
||||||
|
Loading…
Reference in New Issue
Block a user