Skip to content

Commit b80a47c

Browse files
author
Release Manager
committed
Trac #29537: build not portable despite using SAGE_FAT_BINARY=yes, NTL/openblas/numpy-related
We fix several issues involving `SAGE_FAT_BINARY`: - `numpy` intrinsics need a special build flag in this mode - `ntl` needs to disable use of a problematic instruction set - After #31064, the GH Actions tests for `cygwin` did not pass SAGE_FAT_BINARY to the actual build, randomly causing SIGILLs when a partial build was passed to the next stage through the `sage-local` artifact URL: https://trac.sagemath.org/29537 Reported by: mkoeppe Ticket author(s): Jonathan Kliem, Matthias Koeppe Reviewer(s): Matthias Koeppe, Jonathan Kliem
2 parents 3071aad + d6dced2 commit b80a47c

7 files changed

+68
-37
lines changed

‎.github/workflows/ci-cygwin-minimal.yml

+29-16
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ on:
1212
env:
1313
MAKE: make -j8
1414
SAGE_NUM_THREADS: 3
15-
SAGE_CHECK: warn
16-
SAGE_CHECK_PACKAGES: "!cython,!r,!python3,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
1715
CYGWIN: winsymlinks:native
18-
SAGE_FAT_BINARY: yes
16+
CONFIGURE_ARGS: --enable-experimental-packages --enable-download-from-upstream-url --enable-fat-binary
1917
SAGE_LOCAL: /opt/sage-${{ github.sha }}
2018

2119
jobs:
@@ -49,6 +47,7 @@ jobs:
4947
choco install $PACKAGES --source cygwin
5048
- name: tox
5149
run: |
50+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
5251
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
5352
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
5453
- name: Prepare logs artifact
@@ -108,6 +107,7 @@ jobs:
108107
choco install $PACKAGES --source cygwin
109108
- name: tox
110109
run: |
110+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
111111
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
112112
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
113113
- name: Prepare logs artifact
@@ -176,9 +176,10 @@ jobs:
176176
path: C:\\tools\\cygwin\\tmp
177177
- name: Extract sage-local artifact
178178
run: |
179-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
179+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
180180
- name: tox
181181
run: |
182+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
182183
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
183184
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
184185
- name: Prepare logs artifact
@@ -245,9 +246,10 @@ jobs:
245246
path: C:\\tools\\cygwin\\tmp
246247
- name: Extract sage-local artifact
247248
run: |
248-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
249+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
249250
- name: tox
250251
run: |
252+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
251253
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
252254
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
253255
- name: Prepare logs artifact
@@ -312,9 +314,10 @@ jobs:
312314
path: C:\\tools\\cygwin\\tmp
313315
- name: Extract sage-local artifact
314316
run: |
315-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
317+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
316318
- name: tox
317319
run: |
320+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
318321
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
319322
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
320323
- name: Prepare logs artifact
@@ -379,9 +382,10 @@ jobs:
379382
path: C:\\tools\\cygwin\\tmp
380383
- name: Extract sage-local artifact
381384
run: |
382-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
385+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
383386
- name: tox
384387
run: |
388+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
385389
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
386390
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
387391
- name: Prepare logs artifact
@@ -446,9 +450,10 @@ jobs:
446450
path: C:\\tools\\cygwin\\tmp
447451
- name: Extract sage-local artifact
448452
run: |
449-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
453+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
450454
- name: tox
451455
run: |
456+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
452457
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
453458
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
454459
- name: Prepare logs artifact
@@ -517,9 +522,10 @@ jobs:
517522
path: C:\\tools\\cygwin\\tmp
518523
- name: Extract sage-local artifact
519524
run: |
520-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
525+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
521526
- name: tox
522527
run: |
528+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
523529
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
524530
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
525531
- name: Prepare logs artifact
@@ -588,9 +594,10 @@ jobs:
588594
path: C:\\tools\\cygwin\\tmp
589595
- name: Extract sage-local artifact
590596
run: |
591-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
597+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
592598
- name: tox
593599
run: |
600+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
594601
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
595602
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
596603
- name: Prepare logs artifact
@@ -659,9 +666,10 @@ jobs:
659666
path: C:\\tools\\cygwin\\tmp
660667
- name: Extract sage-local artifact
661668
run: |
662-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
669+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
663670
- name: tox
664671
run: |
672+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
665673
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
666674
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
667675
- name: Prepare logs artifact
@@ -728,9 +736,10 @@ jobs:
728736
path: C:\\tools\\cygwin\\tmp
729737
- name: Extract sage-local artifact
730738
run: |
731-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
739+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
732740
- name: tox
733741
run: |
742+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
734743
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
735744
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
736745
- name: Prepare logs artifact
@@ -795,9 +804,10 @@ jobs:
795804
path: C:\\tools\\cygwin\\tmp
796805
- name: Extract sage-local artifact
797806
run: |
798-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
807+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
799808
- name: tox
800809
run: |
810+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
801811
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
802812
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
803813
- name: Prepare logs artifact
@@ -862,9 +872,10 @@ jobs:
862872
path: C:\\tools\\cygwin\\tmp
863873
- name: Extract sage-local artifact
864874
run: |
865-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
875+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
866876
- name: tox
867877
run: |
878+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
868879
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
869880
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
870881
- name: Prepare logs artifact
@@ -929,9 +940,10 @@ jobs:
929940
path: C:\\tools\\cygwin\\tmp
930941
- name: Extract sage-local artifact
931942
run: |
932-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
943+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
933944
- name: tox
934945
run: |
946+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
935947
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
936948
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
937949
- name: Prepare logs artifact
@@ -996,9 +1008,10 @@ jobs:
9961008
path: C:\\tools\\cygwin\\tmp
9971009
- name: Extract sage-local artifact
9981010
run: |
999-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
1011+
C:\\tools\\cygwin\\bin\\dash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null "${{ env.SAGE_LOCAL }}"'
10001012
- name: tox
10011013
run: |
1014+
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
10021015
C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
10031016
C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
10041017
- name: Prepare logs artifact

0 commit comments

Comments
 (0)