Replace imports from sage.all #123

mkoeppe · 2024-10-29T23:10:35Z

Preparation for using modularized distributions of the Sage library.

Done in part using sage -fiximports.

unhyperbolic · 2024-10-31T07:26:43Z

Thanks for looking into this.

How stable are these import paths? How many versions of sage do they go back?

The CI is configured to run SnapPy against various docker containers with different SageMath versions. It reports that 4 out of 11 suites failed. Unfortunately, github doesn't let me see which :(

In the past, we had large try: ... except ImportError: ... blocks to account for different sage versions.

mkoeppe · 2024-10-31T08:10:58Z

How stable are these import paths? How many versions of sage do they go back?

AFAICS these imports are all unchanged in Sage over at least the past 5 years

The CI is configured to run SnapPy against various docker containers with different SageMath versions. It reports that 4 out of 11 suites failed. Unfortunately, github doesn't let me see which :(

Are you saying that the current branch was already tested?

By the way, my motivation here is to get SnapPy to run on top of my modularized fork of Sage https://github.com/passagemath/passagemath

NathanDunfield · 2024-10-31T16:03:24Z

Our CI tests SnapPy on the official Sage Docker images, from 9.3 (circa 2021) up to 10.4. We do not test against the development branch of Sage.

I enabled the CI for this PR and tweaked the CI config. The PR fails when running the doctests for Sage 9.* and passes for Sage 10.*. The common error is:

  File "/home/sage/sage/local/var/lib/sage/venv-python3.9.9/lib/python3.9/site-packages/snappy/snap/polished_reps.py", line 18, in <module>
    from sage.combinat.subset import powerset
ImportError: cannot import name 'powerset' from 'sage.combinat.subset' (/home/sage/sage/local/var/lib/sage/venv-python3.9.9/lib/python3.9/site-packages/sage/combinat/subset.py)

mkoeppe · 2024-10-31T23:31:14Z

Thanks @NathanDunfield. Would changes like just pushed in ada49ea be acceptable?

NathanDunfield · 2024-11-01T01:29:09Z

Would changes like just pushed in ada49ea be acceptable?

Overall, it looks good to me. For the frequently imported things, it might be better to do the import in sage_helper.py , especially if it needs a try-except block. See the example of ComplexField in that file.

mkoeppe · 2024-11-01T06:48:34Z

Here's a more complete version (still has a failure in doctesting snappy.database that I don't understand at the moment).
With this version, I can get snappy.test to run on top of only passagemath-flint, passagemath-repl, passagemath-groups, passagemath-symbolics, passagemath-plot, passagemath-graphs.

…r imports from Sage

…lper

… instead of using try..except for imports

…ercion

…ugh sage_helper

…ercion (fixup)

… import

…port

mkoeppe · 2024-12-31T06:15:32Z

@NathanDunfield @unhyperbolic This passes tests now

NathanDunfield · 2024-12-31T14:17:47Z

python/snap/find_field.py

Now that you've added a bunch of Sage imports to sage_helper.py, I think it makes sense to import those objects through it here and in analogous places throughout. E.g.

from ..sage_helper import ZZ, QQ, matrix

Done, I think. Preview: https://github.com/mkoeppe/SnapPy/actions/runs/12575148681

Happy new year!

…lper

…nal_linear_algebra*.py

…x, prime_range

NathanDunfield · 2025-01-02T04:26:57Z

@mkoeppe Looks good to me so far.

@unhyperbolic and @culler any comments?

unhyperbolic · 2025-01-14T07:19:42Z

python/sage_helper.py

+        from sage.all import sqrt
+        from sage.all import I, Infinity
+        from sage.all import arccosh
+        from sage.all import RIF, CIF


Do we actually need this?

Note: I do use the name RIF and CIF for RealIntervalField and ComplexIntervalField instances with precisions different from RealIntervalField() and ComplexIntervalField().

unhyperbolic · 2025-01-14T07:23:48Z

python/verify/upper_halfspace/ideal_point.py

@@ -17,8 +17,8 @@
 from ...sage_helper import _within_sage

 if _within_sage:
-    import sage.all
-    from sage.all import matrix
+    from ...sage_helper import I, matrix, RIF, CIF


This RIF and CIF import should go into run_tests again.

unhyperbolic · 2025-01-14T07:24:55Z

python/verify/upper_halfspace/finite_point.py

-    import sage.all
-    from sage.all import matrix, sqrt
-    from sage.rings.real_mpfi import is_RealIntervalFieldElement
+    import sage


Is this "import sage" needed?

I think it can be removed.

mkoeppe · 2025-01-14T19:17:05Z

Thanks for merging! I'll follow up with some more proposed changes

mkoeppe mentioned this pull request Oct 31, 2024

Open PRs in downstream projects, adding dependencies on passagemath distributions passagemath/passagemath#248

Open

51 tasks

mkoeppe force-pushed the sage.all-imports branch from 1f24d84 to 92ab31b Compare November 18, 2024 00:57

mkoeppe added 22 commits December 29, 2024 20:26

Replace imports from sage.all

5c96067

python/snap/polished_reps.py: Use try..except for imports from Sage

b14f59d

src/snappy/verify/upper_halfspace/finite_point.py: Use try..except fo…

801783d

…r imports from Sage

python/snap/polished_reps.py: Move try..except for imports to sage_he…

664ea76

…lper

python/number.py: Go through .sage_helper instead of sage.all

27eed35

python/verify/upper_halfspace/finite_point.py: Go through sage_helper…

3125594

… instead of using try..except for imports

python/sage_helper.py: Fix for is_RealIntervalFieldElement

5a43792

python/verify/upper_halfspace/ideal_point.py: Go through sage_helper

ca7c6d3

python/number.py: If SR cannot be imported, just do not register a co…

ccacbcc

…ercion

python/verify/hyperbolicity.py: Go through sage_helper

54fbfd0

python/cusps/maximal_cusp_area_matrix.py: Go through sage_helper

84898c9

python/hyperboloid/distances.py: Go through sage_helper

dc738d2

python/tiling/tile.py: Go through sage_helper

ac081ab

python/verify/complex_volume/adjust_torsion.py: Go through sage_helper

8274cb5

python/verify/maximal_cusp_area_matrix/cusp_tiling_engine.py: Go thro…

4e31893

…ugh sage_helper

python/verify/upper_halfspace/finite_point.py: Go through sage_helper

9a01d66

python/pari.py: Use try..except for import of PariError

1f63268

python/number.py: If SR cannot be imported, just do not register a co…

64477f6

…ercion (fixup)

python/verify/complex_volume/extended_bloch.py: Go through sage_helper

c9ccfb0

python/verify/complex_volume/cusped.py: Go through sage_helper

bbcd6c8

python/upper_halfspace/__init__.py: Go through sage_helper for arccosh

5ce0eb0

python/database.py: Go through sage_helper

80d3d61

mkoeppe added 4 commits December 30, 2024 21:17

python/sage_helper.py: Fix import of RealNumber

5b332d8

python/sage_helper.py: Import Complex* later

8d02aee

python/verify/upper_halfspace/extended_matrix.py: Use try..except for…

7d883d1

… import

python/verify/upper_halfspace/ideal_point.py: Use try...except for im…

2ac51c3

…port

NathanDunfield requested changes Dec 31, 2024

View reviewed changes

mkoeppe added 9 commits December 31, 2024 19:42

python/sage_helper.py: Import CIF, RIF

f94a43b

python/verify/upper_halfspace/extended_matrix.py: Import from sage_he…

1afb2d4

…lper

python/sage_helper.py: Add imports from python/snap/find_field.py

9a434d9

python/sage_helper.py: Add imports from python/exterior_to_link/ratio…

b74ed93

…nal_linear_algebra*.py

python/sage_helper.py: Import RealField_class

dc0347f

More imports via sage_helper

7a6b0b0

python/sage_helper.py: Import xgcd

1b40d50

More imports via sage_helper

30bb154

Even more imports via sage_helper

b6c24c6

mkoeppe force-pushed the sage.all-imports branch from c7bf7a5 to d10df05 Compare January 1, 2025 05:55

python/sage_helper.py: Import ComplexBallField, exp, sin, block_matri…

2ded24e

…x, prime_range

mkoeppe force-pushed the sage.all-imports branch from d10df05 to 2ded24e Compare January 1, 2025 06:21

python/sage_helper.py: Move imports from nsagetools here

3bb486e

mkoeppe force-pushed the sage.all-imports branch from be964e4 to 3bb486e Compare January 1, 2025 22:42

mkoeppe added 2 commits January 1, 2025 14:51

python/sage_helper.py: Move remaining imports from slice_obs_HKL here

6739b66

python/snap/peripheral: Import ChainComplex via sage_helper

033bff7

unhyperbolic reviewed Jan 14, 2025

View reviewed changes

Merge branch 'master' into sage.all-imports

8e92b2c

unhyperbolic merged commit 28b2932 into 3-manifolds:master Jan 14, 2025

mkoeppe deleted the sage.all-imports branch January 14, 2025 21:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace imports from sage.all #123

Replace imports from sage.all #123

mkoeppe commented Oct 29, 2024 •

edited

Loading

unhyperbolic commented Oct 31, 2024 •

edited

Loading

mkoeppe commented Oct 31, 2024

NathanDunfield commented Oct 31, 2024 •

edited

Loading

mkoeppe commented Oct 31, 2024

NathanDunfield commented Nov 1, 2024

mkoeppe commented Nov 1, 2024

mkoeppe commented Dec 31, 2024

NathanDunfield Dec 31, 2024

mkoeppe Jan 1, 2025

NathanDunfield commented Jan 2, 2025

unhyperbolic Jan 14, 2025

unhyperbolic Jan 14, 2025

unhyperbolic Jan 14, 2025

mkoeppe Jan 14, 2025

mkoeppe commented Jan 14, 2025

Replace imports from sage.all #123

Replace imports from sage.all #123

Conversation

mkoeppe commented Oct 29, 2024 • edited Loading

unhyperbolic commented Oct 31, 2024 • edited Loading

mkoeppe commented Oct 31, 2024

NathanDunfield commented Oct 31, 2024 • edited Loading

mkoeppe commented Oct 31, 2024

NathanDunfield commented Nov 1, 2024

mkoeppe commented Nov 1, 2024

mkoeppe commented Dec 31, 2024

NathanDunfield Dec 31, 2024

Choose a reason for hiding this comment

mkoeppe Jan 1, 2025

Choose a reason for hiding this comment

NathanDunfield commented Jan 2, 2025

unhyperbolic Jan 14, 2025

Choose a reason for hiding this comment

unhyperbolic Jan 14, 2025

Choose a reason for hiding this comment

unhyperbolic Jan 14, 2025

Choose a reason for hiding this comment

mkoeppe Jan 14, 2025

Choose a reason for hiding this comment

mkoeppe commented Jan 14, 2025

mkoeppe commented Oct 29, 2024 •

edited

Loading

unhyperbolic commented Oct 31, 2024 •

edited

Loading

NathanDunfield commented Oct 31, 2024 •

edited

Loading