Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MPowerSeries: Don't go through symbolics to compute exp(0), log(1) #36260

Merged
merged 8 commits into from
Sep 16, 2023
Merged

MPowerSeries: Don't go through symbolics to compute exp(0), log(1) #36260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12f6ef8
bootstrap: Use 'ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packa…
mkoeppe Sep 11, 2023
ca94eb4
MPowerSeries.exp: Don't use symbolics to compute exp(0)
mkoeppe Sep 3, 2023
eded0e7
MPowerSeries.log: Don't use symbolics to compute log(1)
mkoeppe Sep 3, 2023
5454b51
Merge branch 'fix_bootstrapped_pkg_metadata' into mpowerseries_exp_lo…
mkoeppe Sep 13, 2023
0785206
Update pyproject.toml files to use version info from build/pkgs/setup…
mkoeppe Sep 13, 2023
366725c
Merge branch 'fix_bootstrapped_pkg_metadata' into pyproject_toml_setu…
mkoeppe Sep 13, 2023
7dde129
./sage -fixdoctests --long --distribution 'sagemath-polyhedra[standar…
mkoeppe Sep 13, 2023
e2a76d2
Merge branch 'pyproject_toml_setuptools' into mpowerseries_exp_log_tr…
mkoeppe Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then
# A Python package
SPKG_TREE_VAR=SAGE_VENV
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4
echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(ENABLE_SYSTEM_SITE_PACKAGES=yes sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
fi
fi
spkg_configures="$spkg_configures
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/setuptools_wheel/install-requires.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# We use this file to mark the package as a Python package
setuptools >= 65.6
2 changes: 1 addition & 1 deletion pkgs/sagemath-bliss/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_sage_conf
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-categories/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-coxeter3/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-environment/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_wheel
]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion pkgs/sagemath-mcqd/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-meataxe/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-objects/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-repl/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_wheel
]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion pkgs/sagemath-sirocco/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
Expand Down
2 changes: 1 addition & 1 deletion pkgs/sagemath-tdlib/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
[build-system]
# Minimum requirements for the build system to execute.
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_setuptools_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
Expand Down
2 changes: 1 addition & 1 deletion src/pyproject.toml.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ requires = [
# https://github.com/pypa/pip/issues/6144
esyscmd(`sage-get-system-packages install-requires-toml \
sage_conf \
setuptools \
setuptools_wheel \
wheel \
sage_setup \
cypari \
Expand Down
18 changes: 12 additions & 6 deletions src/sage/rings/multi_power_series_ring_element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,7 @@ def exp(self, prec=infinity):
are not yet implemented and therefore such cases raise an error::

sage: g = 2 + f
sage: exp(g)
sage: exp(g) # needs sage.symbolic
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can avoid SR with g.exp() here and likewise in the other examples.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this error does not come from going through SR but illustrates that exp(2) does not exist in the base ring.

2 of the other # needs sage.symbolic turned out to be unnecessary due to advances in modularization. Removed in 7dde129

Traceback (most recent call last):
...
TypeError: unsupported operand parent(s) for *: 'Symbolic Ring' and
Expand Down Expand Up @@ -1944,9 +1944,12 @@ def exp(self, prec=infinity):
R = self.parent()
Rbg = R._bg_power_series_ring

from sage.functions.log import exp
c = self.constant_coefficient()
exp_c = exp(c)
if not c:
exp_c = self.base_ring().one()
else:
from sage.functions.log import exp
exp_c = exp(c)
x = self._bg_value - c
if x.is_zero():
return exp_c
Expand Down Expand Up @@ -2000,7 +2003,7 @@ def log(self, prec=infinity):
are not yet implemented and therefore such cases raise an error::

sage: g = 2 + f
sage: log(g)
sage: log(g) # needs sage.symbolic
Traceback (most recent call last):
...
TypeError: unsupported operand parent(s) for -: 'Symbolic Ring' and 'Power
Expand Down Expand Up @@ -2036,11 +2039,14 @@ def log(self, prec=infinity):
R = self.parent()
Rbg = R._bg_power_series_ring

from sage.functions.log import log
c = self.constant_coefficient()
if c.is_zero():
raise ValueError('Can only take formal power series for non-zero constant term.')
log_c = log(c)
if c.is_one():
log_c = self.base_ring().zero()
else:
from sage.functions.log import log
log_c = log(c)
x = 1 - self._bg_value/c
if x.is_zero():
return log_c
Expand Down
Loading