Skip to content

build/pkgs/nauty: Handle SAGE_FAT_BINARY #36707

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

Jump to bottom
Merged
merged 1 commit into from
Nov 14, 2023
Merged

build/pkgs/nauty: Handle SAGE_FAT_BINARY #36707

merged 1 commit into from
Nov 14, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Nov 11, 2023 •
edited
Loading

Handling SAGE_FAT_BINARY as suggested by @tornaria in #36696 (comment)

Disabling popcnt is consistent with the handling of SAGE_FAT_BINARY in our primesieve install script.

Bumping the patch level so it gets recompiled when applied as a CI hotfix.

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • 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 accordingly.

⌛ Dependencies

@vbraun vbraun force-pushed the develop branch 3 times, most recently from 883e05f to e349b00 Compare November 12, 2023 16:25
dimpase
dimpase suggested changes Nov 12, 2023
View reviewed changes
@dimpase
Copy link
Member

dimpase commented Nov 12, 2023

ditto for build/pkgs/sage_conf/install-requires.txt

and other build/pkgs/sage_*/install-requires.txt - these changes should not be in a PR.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Nov 12, 2023

I know; this is actually all coming from Volker's force pushes to develop. I'll rebase again once stabilized

@dimpase
Copy link
Member

dimpase commented Nov 12, 2023

I know; this is actually all coming from Volker's force pushes to develop. I'll rebase again once stabilized

hmm, why does then e.g. #36699 branch look fine?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Nov 12, 2023

@vbraun 10.2.rc2 is still pointing to a commit not on the develop branch

$ git fetch --tags -f upstream
From https://github.com/sagemath/sage
 t [tag update]              10.2.rc1   -> 10.2.rc1
$ git --no-pager log --oneline 10.2.rc0..upstream/develop --first-parent
23f671571c3 (upstream/develop) Updated SageMath version to 10.2.rc2
883e05f8ee0 (vbraun/develop) gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix typo in lazy_import
a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using explicit `make -j N`; but use `make -j 1` on `ubuntu-trusty`
405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
e349b002499 (tag: push, tag: 10.2.rc1) Updated SageMath version to 10.2.rc1
81bf4e52c66 gh-36668: CI Linux: Fix "optional", "experimental" jobs
dfde868e2f2 gh-36663: Upgrade `zeromq` to 4.3.5, `pyzmq` to 25.1.1, patch out broken tests in setup
7cad4fc0026 gh-36661: .github/workflows/doc-build.yml: Fix live doc building
781dbff5cb4 gh-36659: prompt_toolkit: Set version constraint for conda
a88fe91eae2 gh-36652: src/sage/misc/sageinspect.py: Fix pycodestyle complaint
9d2750c52bd gh-36648: CI macOS: Update
07ea7e18328 gh-36636: Deploy live doc on push to develop
88984731816 gh-36599: sage-env: identify the version of command-line tools (OS X) and set LDFLAGS accordingly
31a1ae59c46 gh-36534: CI Linux: Fix `centos-7` after #36435, remove `gentoo-python3.12` for now, use `conda-forge` with `-python3.11`
b7d34011471 gh-36533: `pkgs/sage-conf_pypi`: Repair after #36400, #36435
$ git --no-pager log --oneline --first-parent 10.2.rc1^..10.2.rc2
cd205f6e3eb (tag: 10.2.rc2) Updated SageMath version to 10.2.rc2
883e05f8ee0 (vbraun/develop) gh-36698: src/sage/combinat/root_system/coxeter_group.py: Fix typo in lazy_import
a0872bed5c9 gh-36671: build/pkgs/openblas: Stop openblas from using explicit `make -j N`; but use `make -j 1` on `ubuntu-trusty`
405e166238e gh-36669: Sage knows Hadamard matrices <1201, not 1001
bb7cf9b7c64 gh-36529: src/sage/misc/latex.py: fix view()
e349b002499 (tag: push, tag: 10.2.rc1) Updated SageMath version to 10.2.rc1

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Nov 12, 2023

Rebased onto 10.2.rc1 until there's clarity

dimpase
dimpase approved these changes Nov 12, 2023
View reviewed changes
Copy link
Member

@dimpase dimpase left a comment

Choose a reason for hiding this comment

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

lgtm

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Nov 12, 2023

Thanks!

@github-actions GitHub Actions
Copy link

Documentation preview for this PR (built with commit df67f19; changes) is ready! 🎉

@vbraun
Copy link
Member

vbraun commented Nov 13, 2023

For the record, the correct rc2 is:

$ git ls-remote github | grep 4430e4cc37c
4430e4cc37c968b71de6d2e4bf52e8825b42c719	HEAD
4430e4cc37c968b71de6d2e4bf52e8825b42c719	refs/heads/develop
4430e4cc37c968b71de6d2e4bf52e8825b42c719	refs/tags/10.2.rc2^{}

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Nov 13, 2023

Thanks, Volker, it's all good now

@vbraun vbraun merged commit dccb412 into sagemath:develop Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tornaria tornaria Awaiting requested review from tornaria

@dcoudert dcoudert Awaiting requested review from dcoudert

1 more reviewer

@dimpase dimpase dimpase approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@mkoeppe mkoeppe

Labels
c: packages: standard p: blocker / 1
Projects
None yet
Milestone
sage-10.2
Development

Successfully merging this pull request may close these issues.
3 participants
@mkoeppe @dimpase @vbraun