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.

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

build/pkgs/numpy 2.0.1, scipy 1.13.1, cmake 3.30.2, gsl 2.8, meson 1.5.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.28, pybind11 2.13.1, pythran 0.16.1 #38227

Open
wants to merge 23 commits into
base: develop
Choose a base branch
from

Conversation

mkoeppe
Copy link
Member

@mkoeppe mkoeppe commented Jun 15, 2024

📝 Checklist

  • The title is concise and informative.
  • The description explains in detail what this PR is about.
  • I have linked a relevant issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation and checked the documentation preview.

⌛ Dependencies

@mkoeppe mkoeppe added this to the sage-10.5 milestone Jun 15, 2024
@mkoeppe mkoeppe self-assigned this Jun 15, 2024
@mkoeppe mkoeppe marked this pull request as draft June 15, 2024 23:43
@mkoeppe mkoeppe changed the title build/pkgs/numpy 2.0, scipy 1.13.1, meson 1.4.1, meson_python 0.16.0, pythran 0.16.1 build/pkgs/numpy 2.0, scipy 1.13.1, cmake 3.29.5, gsl 2.8, meson 1.4.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pythran 0.16.1 Jun 16, 2024
@mkoeppe mkoeppe changed the title build/pkgs/numpy 2.0, scipy 1.13.1, cmake 3.29.5, gsl 2.8, meson 1.4.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pythran 0.16.1 build/pkgs/numpy 2.0, scipy 1.13.1, cmake 3.29.5, gsl 2.8, meson 1.4.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.12.0, pythran 0.16.1 Jun 16, 2024
@mkoeppe mkoeppe changed the title build/pkgs/numpy 2.0, scipy 1.13.1, cmake 3.29.5, gsl 2.8, meson 1.4.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.12.0, pythran 0.16.1 build/pkgs/numpy 2.0, scipy 1.13.1, cmake 3.29.5, contourpy 1.2.1, gsl 2.8, matplotlib 3.9.0, meson 1.4.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.12.0, pythran 0.16.1 Jun 21, 2024
Copy link

github-actions bot commented Jun 21, 2024

Documentation preview for this PR (built with commit 16eb5e4; changes) is ready! 🎉
This preview will update shortly after each push to this PR.

@mkoeppe mkoeppe mentioned this pull request Jun 21, 2024
2 tasks
@mkoeppe mkoeppe removed the pending label Jul 22, 2024
@mkoeppe mkoeppe marked this pull request as ready for review July 22, 2024 13:06
@mkoeppe mkoeppe changed the title build/pkgs/numpy 2.0, scipy 1.13.1, cmake 3.29.5, contourpy 1.2.1, gsl 2.8, matplotlib 3.9.0, meson 1.4.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.12.0, pythran 0.16.1 build/pkgs/numpy 2.0.1, scipy 1.13.1, cmake 3.30.1, contourpy 1.2.1, gsl 2.8, matplotlib 3.9.1, meson 1.5.0, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.13.1, pythran 0.16.1 Jul 23, 2024
@mkoeppe
Copy link
Member Author

mkoeppe commented Jul 23, 2024

@mkoeppe mkoeppe changed the title build/pkgs/numpy 2.0.1, scipy 1.13.1, cmake 3.30.1, contourpy 1.2.1, gsl 2.8, matplotlib 3.9.1, meson 1.5.0, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.13.1, pythran 0.16.1 build/pkgs/numpy 2.0.1, scipy 1.13.1, cmake 3.30.2, contourpy 1.2.1, gsl 2.8, matplotlib 3.9.1, meson 1.5.1, meson_python 0.16.0, ninja_build 1.12.1, openblas 0.3.27, pybind11 2.13.1, pythran 0.16.1 Aug 3, 2024
@kwankyu
Copy link
Collaborator

kwankyu commented Aug 8, 2024

I get

sage -t --warn-long 69.9 --random-seed=274666681782489637879204037307995713165 src/sage/graphs/generic_graph.py
**********************************************************************
File "src/sage/graphs/generic_graph.py", line 15996, in sage.graphs.generic_graph.GenericGraph.?
Failed example:
    (graphs.FruchtGraph()).clustering_coeff(weight=True)                  # needs networkx
Expected:
    {0: 0.3333333333333333, 1: 0.3333333333333333, 2: 0,
     3: 0.3333333333333333, 4: 0.3333333333333333,
     5: 0.3333333333333333, 6: 0.3333333333333333,
     7: 0.3333333333333333, 8: 0, 9: 0.3333333333333333,
     10: 0.3333333333333333, 11: 0}
Got:
    {0: np.float64(0.3333333333333333),
     1: np.float64(0.3333333333333333),
     2: 0,
     3: np.float64(0.3333333333333333),
     4: np.float64(0.3333333333333333),
     5: np.float64(0.3333333333333333),
     6: np.float64(0.3333333333333333),
     7: np.float64(0.3333333333333333),
     8: 0,
     9: np.float64(0.3333333333333333),
     10: np.float64(0.3333333333333333),
     11: 0}
**********************************************************************
File "src/sage/graphs/generic_graph.py", line 16006, in sage.graphs.generic_graph.GenericGraph.?
Failed example:
    (graphs.FruchtGraph()).clustering_coeff(nodes=[0,1,2],                # needs networkx
                                            weight=True)
Expected:
    {0: 0.3333333333333333, 1: 0.3333333333333333, 2: 0}
Got:
    {0: np.float64(0.3333333333333333), 1: np.float64(0.3333333333333333), 2: 0}
**********************************************************************
1 item had failures:
   2 of 1269 in sage.graphs.generic_graph.GenericGraph.?
    [3915 tests, 2 failures, 23.88 s]
----------------------------------------------------------------------
sage -t --warn-long 69.9 --random-seed=274666681782489637879204037307995713165 src/sage/graphs/generic_graph.py  # 2 doctests failed
----------------------------------------------------------------------

@kwankyu
Copy link
Collaborator

kwankyu commented Sep 6, 2024

@tobiasdiez scipy is a dependency of the distribution package sagemath-standard. As explained in the comment, scipy imposes certain constrains on cython. So it is reasonable to reflect those constraints into src/pyproject.toml. No?

I can now answer to this. After Tobias's PR #36982, src/pyproject.toml is the source of the version constraints on some dependencies (in this case, cython) of sage-the-distribution. So yes.

This may impose a version constraint stricter than necessary on the dependency of sagemath-standard. However, according to Matthias: #37902 (comment), it is dubious whether sagemath-standard gets real harm from the stricter version constraint.

Anyway there is no mechanism in sage that can be used to maintain two sets of version constraints, one for sage-the-distribution and one for modularized distributions.

Copy link
Collaborator

@kwankyu kwankyu left a comment

Choose a reason for hiding this comment

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

Working well. LGTM.

@mkoeppe mkoeppe added s: needs review disputed PR is waiting for community vote, see https://groups.google.com/g/sage-devel/c/IgBYUJl33SQ and removed s: needs work labels Sep 6, 2024
@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 6, 2024

The demand by Tobias Diez (https://groups.google.com/g/sage-devel/c/sVcJiJdUxRs/m/oEntIDE9AgAJ), to deviate from the long-standing practice of synchronized version constraints, are out of scope of this upgrade PR. Setting to "disputed".

@kwankyu
Copy link
Collaborator

kwankyu commented Sep 9, 2024

+1 from me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: packages: standard disputed PR is waiting for community vote, see https://groups.google.com/g/sage-devel/c/IgBYUJl33SQ s: needs review v: moderate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

using numpy 2.0
4 participants