Apply some upstream NumPy patches for CPU detection

[jhpalmieri]

Followup to #32021

Depends on #32488

Component: packages: standard

Branch/Commit: u/jhpalmieri/numpy-cpu-patches @ f7dd6dd

Issue created by migration from https://trac.sagemath.org/ticket/32080

[jhpalmieri]

Branch: u/jhpalmieri/numpy-cpu-patches

[jhpalmieri]

New commits:

07a66e0	header guard for sage-build-env
ba795b5	move ifs from sage-build-env-config to sage-build-env
b3e2a53	disable march=native for numpy
9c87b65	correct explanation as popcnt wasnt the problem here
56ffafb	more consistent header guard name
f7dd6dd	trac 32080: add two upstream patches to NumPy

[jhpalmieri]

Commit: f7dd6dd

[jhpalmieri]

Dependencies: #32021

[mkoeppe]

Reviewer: https://github.com/mkoeppe/sage/actions/runs/984105414, https://github.com/mkoeppe/sage/actions/runs/984105423

[mkoeppe]

comment:5

The cygwin-standard build of this ticket (https://github.com/mkoeppe/sage/runs/2947289812?check_suite_focus=true) failed
because of a mistake in my CI scripts. I'm pushing the necessary changes to #32021 so that we can test it properly.

[mkoeppe]

Changed dependencies from #32021 to #32257

[mkoeppe]

Changed reviewer from https://github.com/mkoeppe/sage/actions/runs/984105414, https://github.com/mkoeppe/sage/actions/runs/984105423 to https://github.com/mkoeppe/sage/actions/runs/1056686451

[mkoeppe]

Changed dependencies from #32257 to #32488

[mkoeppe]

comment:9

• 19074 was merged in https://github.com/numpy/numpy/releases/tag/v1.21.0rc1
• 19365 was merged in https://github.com/numpy/numpy/releases/tag/v1.21.1

So the upgrade to #32488 makes these patches obsolete.

The question whether this change:

--- a/build/pkgs/numpy/spkg-install.in
+++ b/build/pkgs/numpy/spkg-install.in
@@ -22,10 +22,6 @@ python3 ../lapack_conf.py
 export FFLAGS="$FFLAGS -fPIC"
 export FCFLAGS="$FCFLAGS -fPIC"
 
-# Numpy 1.20.3 enables some intrinsics on machines without support with `-march=native`.
-# We disable it until this is fixed.
-export CFLAGS="$CFLAGS_NON_NATIVE"
-
 export NUMPY_FCONFIG="config_fc --noopt --noarch"
 if [ "$SAGE_FAT_BINARY" = "yes" ]; then
     export NUMPY_FCONFIG="--cpu-baseline=NONE"

should be done can be reopened after #32488, #32434, #32424 have been resolved.

[mkoeppe]

Changed author from John Palmieri to none

[mkoeppe]

Changed reviewer from https://github.com/mkoeppe/sage/actions/runs/1056686451 to none

[jhpalmieri]

comment:10

Okay, I will leave the decision about whether to remove export CFLAGS="$CFLAGS_NON_NATIVE" to others. I don't know anything about NumPy or how this might affect its performance.