Skip to content

Commit e8ed035

Browse files
Release Managervbraun
Release Manager
authored and
vbraun
committed
Trac #22969: Upgrade to Pynac-0.7.7
Pynac-0.7.7 changes: * fix regression in Singular interface (last minute fix of #22838) * fix series problems (#22959) * fix dilog/polylog numerics (#18386, #19906) * avoid Python errors when comparing complex in richcmp * general handling of evalf of one-arg functions (obsoletes py_sin etc) https://github.com/pynac/pynac/releases/download/pynac-0.7.7/pynac-0.7.7 .tar.bz2 URL: https://trac.sagemath.org/22969 Reported by: rws Ticket author(s): Ralf Stephan Reviewer(s): Travis Scrimshaw
2 parents 6207566 + c1cff2d commit e8ed035

File tree

5 files changed

+218
-28
lines changed

5 files changed

+218
-28
lines changed

‎build/pkgs/pynac/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=pynac-VERSION.tar.bz2
2-
sha1=6ff23c35da9f424751522267ab925b46d5aaeff1
3-
md5=0400e2c1333ee0b657c543cd788ee250
4-
cksum=4257838880
2+
sha1=13d73ad7b1bdac7726f5140dc5230ad93a987f40
3+
md5=78f29f401fa67d5bf7dc6ee2d5e3da81
4+
cksum=1873135840

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.6
1+
0.7.7.p0

‎build/pkgs/pynac/patches/coeff-to-ex.patch

-22
This file was deleted.

‎build/pkgs/pynac/patches/polylog-evalf.patch

+212
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
2+
index eb247a5..07a6588 100644
3+
--- a/ginac/numeric.cpp
4+
+++ b/ginac/numeric.cpp
5+
@@ -166,84 +166,11 @@ inline void py_error(const char* errmsg) {
6+
#if PY_MAJOR_VERSION < 3
7+
#define PyNumber_TrueDivide PyNumber_Divide
8+
9+
-inline int Pynac_PyObj_Cmp(PyObject *optr1, PyObject *optr2, const char *errmsg) {
10+
- int result;
11+
- if (PyObject_Cmp(optr1, optr2, &result) == -1)
12+
- py_error(errmsg);
13+
- return result;
14+
-}
15+
-
16+
-inline bool Pynac_PyObj_RichCmp(PyObject *optr1, PyObject *optr2, int opid, const char *errmsg) {
17+
- PyObject *obj1(nullptr), *obj2(nullptr);
18+
- if (PyComplex_CheckExact(optr1)) {
19+
- if (PyComplex_ImagAsDouble(optr1) != 0.0)
20+
- return false;
21+
- obj1 = PyFloat_FromDouble(PyComplex_RealAsDouble(optr1));
22+
- optr1 = obj1;
23+
- }
24+
- if (PyComplex_CheckExact(optr2)) {
25+
- if (PyComplex_ImagAsDouble(optr2) != 0.0)
26+
- return false;
27+
- obj2 = PyFloat_FromDouble(PyComplex_RealAsDouble(optr2));
28+
- optr2 = obj2;
29+
- }
30+
- int result;
31+
- if (PyObject_Cmp(optr1, optr2, &result) == -1)
32+
- py_error(errmsg);
33+
- if (obj1 != nullptr)
34+
- Py_DECREF(obj1);
35+
- if (obj2 != nullptr)
36+
- Py_DECREF(obj2);
37+
- switch (result) {
38+
- case -1: return opid == Py_LT || opid == Py_LE || opid == Py_NE;
39+
- case 0: return opid == Py_LE || opid == Py_EQ || opid == Py_GE;
40+
- case 1: return opid == Py_GT || opid == Py_GE || opid == Py_NE;
41+
- default: return false;
42+
- }
43+
-}
44+
#else
45+
#define PyInt_Check PyLong_Check
46+
#define PyInt_AsLong PyLong_AsLong
47+
#define PyInt_FromLong PyLong_FromLong
48+
#define PyString_FromString PyBytes_FromString
49+
-
50+
-inline int Pynac_PyObj_Cmp(PyObject *optr1, PyObject *optr2, const char *errmsg) {
51+
- int result = PyObject_RichCompareBool(optr1, optr2, Py_LT);
52+
- if (result == 1)
53+
- return -1;
54+
- else if (result == -1)
55+
- py_error(errmsg);
56+
- else { // result == 0
57+
- result = PyObject_RichCompareBool(optr1, optr2, Py_GT);
58+
- if (result == -1)
59+
- py_error(errmsg);
60+
- }
61+
- return result;
62+
-}
63+
-
64+
-inline bool Pynac_PyObj_RichCmp(PyObject *optr1, PyObject *optr2, int opid, const char *errmsg) {
65+
- PyObject *obj1(nullptr), *obj2(nullptr);
66+
- if (PyComplex_CheckExact(optr1)) {
67+
- if (PyComplex_ImagAsDouble(optr1) != 0.0)
68+
- return false;
69+
- obj1 = PyFloat_FromDouble(PyComplex_RealAsDouble(optr1));
70+
- optr1 = obj1;
71+
- }
72+
- if (PyComplex_CheckExact(optr2)) {
73+
- if (PyComplex_ImagAsDouble(optr2) != 0.0)
74+
- return false;
75+
- obj2 = PyFloat_FromDouble(PyComplex_RealAsDouble(optr2));
76+
- optr2 = obj2;
77+
- }
78+
- int result = PyObject_RichCompareBool(optr1, optr2, opid);
79+
- if (result == -1)
80+
- py_error(errmsg);
81+
- if (obj1 != nullptr)
82+
- Py_DECREF(obj1);
83+
- if (obj2 != nullptr)
84+
- Py_DECREF(obj2);
85+
- return result;
86+
-}
87+
#endif
88+
89+
// The following variable gets changed to true once
90+
@@ -609,7 +536,21 @@ int numeric::compare_same_type(const numeric& right) const {
91+
ret = -1;
92+
return ret;
93+
case PYOBJECT:
94+
- return Pynac_PyObj_Cmp(v._pyobject, right.v._pyobject, "compare_same_type");
95+
+ {
96+
+ int result = PyObject_RichCompareBool(v._pyobject,
97+
+ right.v._pyobject, Py_LT);
98+
+ if (result == 1)
99+
+ return -1;
100+
+ else if (result == -1)
101+
+ py_error("richcmp failed");
102+
+ else { // result == 0
103+
+ result = PyObject_RichCompareBool(v._pyobject,
104+
+ right.v._pyobject, Py_GT);
105+
+ if (result == -1)
106+
+ py_error("richcmp failed");
107+
+ }
108+
+ return result;
109+
+ }
110+
default:
111+
stub("invalid type: compare_same_type type not handled");
112+
}
113+
@@ -1601,15 +1542,17 @@ int numeric::csgn() const {
114+
case PYOBJECT:
115+
int result;
116+
if (is_real()) {
117+
- result = Pynac_PyObj_Cmp(v._pyobject, ZERO, "csgn");
118+
+ numeric z(ZERO);
119+
+ Py_INCREF(ZERO);
120+
+ return compare_same_type(z);
121+
} else {
122+
- PyObject *tmp = py_funcs.py_real(v._pyobject);
123+
- result = Pynac_PyObj_Cmp(tmp, ZERO, "csgn");
124+
- Py_DECREF(tmp);
125+
+ numeric re = real();
126+
+ numeric z(ZERO);
127+
+ Py_INCREF(ZERO);
128+
+ result = re.compare_same_type(z);
129+
if (result == 0) {
130+
- tmp = py_funcs.py_imag(v._pyobject);
131+
- result = Pynac_PyObj_Cmp(tmp, ZERO, "csgn");
132+
- Py_DECREF(tmp);
133+
+ numeric im = imag();
134+
+ result = im.compare_same_type(z);
135+
}
136+
}
137+
return result;
138+
@@ -1689,7 +1632,7 @@ bool numeric::is_positive() const {
139+
case MPQ:
140+
return mpq_cmp_si(v._bigrat, 0, 1) > 0;
141+
case PYOBJECT:
142+
- return is_real() and Pynac_PyObj_RichCmp(v._pyobject, ZERO, Py_GT, "is_positive");
143+
+ return is_real() and PyObject_RichCompareBool(v._pyobject, ZERO, Py_GT) == 1;
144+
default:
145+
stub("invalid type: is_positive() type not handled");
146+
}
147+
@@ -1706,7 +1649,7 @@ bool numeric::is_negative() const {
148+
case MPQ:
149+
return mpq_cmp_si(v._bigrat, 0, 1) < 0;
150+
case PYOBJECT:
151+
- return is_real() and Pynac_PyObj_RichCmp(v._pyobject, ZERO, Py_LT, "is_negative");
152+
+ return is_real() and PyObject_RichCompareBool(v._pyobject, ZERO, Py_LT) == 1;
153+
default:
154+
stub("invalid type: is_negative() type not handled");
155+
}
156+
@@ -1765,7 +1708,7 @@ bool numeric::is_nonneg_integer() const {
157+
case MPQ:
158+
return (is_integer() and (is_positive() or is_zero()));
159+
case PYOBJECT:
160+
- return is_integer() and Pynac_PyObj_RichCmp(v._pyobject, ZERO, Py_GE, "is_nonneg_integer");
161+
+ return is_integer() and PyObject_RichCompareBool(v._pyobject, ZERO, Py_GE) == 1;
162+
default:
163+
stub("invalid type: is_nonneg_integer() type not handled");
164+
}
165+
@@ -2026,7 +1969,7 @@ bool numeric::operator<(const numeric &right) const {
166+
case MPQ:
167+
return mpq_cmp(v._bigrat, right.v._bigrat) < 0;
168+
case PYOBJECT:
169+
- return Pynac_PyObj_RichCmp(v._pyobject, right.v._pyobject, Py_LT, "<");
170+
+ return PyObject_RichCompareBool(v._pyobject, right.v._pyobject, Py_LT) == 1;
171+
default:
172+
stub("invalid type: operator< type not handled");
173+
}
174+
@@ -2050,7 +1993,7 @@ bool numeric::operator<=(const numeric &right) const {
175+
case MPQ:
176+
return mpq_cmp(v._bigrat, right.v._bigrat) <= 0;
177+
case PYOBJECT:
178+
- return Pynac_PyObj_RichCmp(v._pyobject, right.v._pyobject, Py_LE, "<=");
179+
+ return PyObject_RichCompareBool(v._pyobject, right.v._pyobject, Py_LE) == 1;
180+
default:
181+
stub("invalid type: operator<= type not handled");
182+
}
183+
@@ -2074,7 +2017,7 @@ bool numeric::operator>(const numeric &right) const {
184+
case MPQ:
185+
return mpq_cmp(v._bigrat, right.v._bigrat) > 0;
186+
case PYOBJECT:
187+
- return Pynac_PyObj_RichCmp(v._pyobject, right.v._pyobject, Py_GT, ">");
188+
+ return PyObject_RichCompareBool(v._pyobject, right.v._pyobject, Py_GT) == 1;
189+
default:
190+
stub("invalid type: operator> type not handled");
191+
}
192+
@@ -2098,7 +2041,7 @@ bool numeric::operator>=(const numeric &right) const {
193+
case MPQ:
194+
return mpq_cmp(v._bigrat, right.v._bigrat) >= 0;
195+
case PYOBJECT:
196+
- return Pynac_PyObj_RichCmp(v._pyobject, right.v._pyobject, Py_GE, ">=");
197+
+ return PyObject_RichCompareBool(v._pyobject, right.v._pyobject, Py_GE) == 1;
198+
default:
199+
stub("invalid type: operator!= type not handled");
200+
}
201+
@@ -2640,9 +2583,9 @@ const numeric numeric::Li2(const numeric &n, PyObject* parent) const {
202+
203+
numeric rnum(ret);
204+
if (is_real() and n.is_integer() and rnum.real()<(*_num1_p))
205+
- return rnum.real();
206+
+ return ex_to<numeric>(rnum.real().evalf(0, parent));
207+
else
208+
- return rnum;
209+
+ return ex_to<numeric>(rnum.evalf(0, parent));
210+
}
211+
212+
const numeric numeric::lgamma() const {

‎src/sage/functions/log.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ def __init__(self):
432432
sage: polylog(2.0, 1)
433433
1.64493406684823
434434
sage: polylog(2, 1.0)
435-
NaN + NaN*I
435+
NaN
436436
sage: polylog(2.0, 1.0)
437-
NaN + NaN*I
437+
NaN
438438
"""
439439
GinacFunction.__init__(self, "polylog", nargs=2)
440440

0 commit comments

Comments
 (0)