Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

WIP: remove -msse2 from linux32 builds, use explicit build tag #80

Merged
merged 2 commits into from
Apr 24, 2020
Merged

WIP: remove -msse2 from linux32 builds, use explicit build tag #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbf4af4
remove -msse2 from linux32 builds, use explicit build tag
mattip Apr 24, 2020
f96684b
work around azure missing variable quirk
mattip Apr 24, 2020
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
5 changes: 3 additions & 2 deletions azure/posix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
vmImage: ${{ parameters.vmImage }}
variables:
REPO_DIR: "numpy"
BUILD_COMMIT: 'f1be9e50ff' # needed for 32 bit builds, should become 1.18.4
BUILD_COMMIT: 'maintenance/1.18.x'
PLAT: "x86_64"
CYTHON_BUILD_DEP: "cython==0.29.16"
NIGHTLY_BUILD_COMMIT: "master"
Expand Down Expand Up @@ -97,8 +97,9 @@ jobs:
ANACONDA_ORG="multibuild-wheels-staging"
TOKEN="$MAPPED_NUMPY_STAGING_UPLOAD_TOKEN"
fi
if [ "$TOKEN" == "" ]; then
if [ "$TOKEN" == "" -o "${TOKEN:0:7}" == "\$(NUMPY" ]; then
echo "##[warning] Could not find anaconda.org upload token in secret variables"
TOKEN=""
fi
echo "##vso[task.setvariable variable=TOKEN]$TOKEN"
echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG"
Expand Down
5 changes: 3 additions & 2 deletions azure/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
pool:
vmImage: ${{ parameters.vmImage }}
variables:
BUILD_COMMIT: "v1.18.3"
BUILD_COMMIT: 'maintenance/1.18.x'
NIGHTLY_BUILD_COMMIT: "master"
JUNITXML: "test-data.xml"
TEST_DIR: '$(Agent.WorkFolder)/tmp_for_test'
Expand Down Expand Up @@ -125,8 +125,9 @@ jobs:
ANACONDA_ORG="multibuild-wheels-staging"
TOKEN="$MAPPED_NUMPY_STAGING_UPLOAD_TOKEN"
fi
if [ "$TOKEN" == "" ]; then
if [ "$TOKEN" == "" -o "${TOKEN:0:7}" == "\$(NUMPY" ]; then
echo "##[warning] Could not find anaconda.org upload token in secret variables"
TOKEN=""
fi
echo "##vso[task.setvariable variable=TOKEN]$TOKEN"
echo "##vso[task.setvariable variable=ANACONDA_ORG]$ANACONDA_ORG"
Expand Down
4 changes: 3 additions & 1 deletion env_vars_32.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
set -x
OPENBLAS_VERSION="v0.3.7"
MACOSX_DEPLOYMENT_TARGET=10.9
CFLAGS="-msse2 -std=c99 -fno-strict-aliasing"
# Causes failure for pre-1.19 in np.reciprocal
# CFLAGS="-msse2 -std=c99 -fno-strict-aliasing"
CFLAGS="-std=c99 -fno-strict-aliasing"
Copy link
Contributor

Choose a reason for hiding this comment

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

I hope to get 1.18.4 out using the travis/appveyor system, so this is really an azure testing option. Any idea why the test failures don't show up with travis/appveyor? Once we have things working we can start pointing to numpy master branch for numpy-wheels master, sometimes we want to trigger a nightly build unrelated to cron.