Skip to content

Commit 060da29

Browse files
committed
remove debug
1 parent 3e16738 commit 060da29

File tree

5 files changed

+104
-7
lines changed

5 files changed

+104
-7
lines changed

.github/workflows/build.yml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Windows build
4+
5+
defaults:
6+
run:
7+
shell: bash
8+
9+
on:
10+
push:
11+
branches: [ master ]
12+
pull_request:
13+
branches: [ master ]
14+
15+
env:
16+
OPENBLAS_COMMIT: "v0.3.13"
17+
OPENBLAS_ROOT: "c:\\opt"
18+
19+
jobs:
20+
build:
21+
strategy:
22+
matrix:
23+
BUILD_BITS: [64, 32]
24+
INTERFACE64: ['1', '']
25+
os: [windows-latest]
26+
exclude:
27+
- BUILD_BITS: 32
28+
INTERFACE64: 1
29+
fail-fast: false
30+
runs-on: ${{ matrix.os }}
31+
32+
steps:
33+
- uses: actions/checkout@v2
34+
- uses: ilammy/msvc-dev-cmd@v1
35+
36+
- name: Setup
37+
run: |
38+
BITS=${{ matrix.BUILD_BITS }}
39+
echo "BUILD_BITS=$BITS" >> $GITHUB_ENV;
40+
if [ "$BITS" == "32" ]; then
41+
echo "PLAT=i686" >> $GITHUB_ENV;
42+
else
43+
echo "PLAT=x86_64" >> $GITHUB_ENV;
44+
fi
45+
echo "START_DIR=$PWD" >> $GITHUB_ENV;
46+
choco install -y zip
47+
48+
- run: |
49+
choco install -y mingw --forcex86 --force --version=8.1.0
50+
choco install -y make
51+
name: Install 32-bit mingw
52+
shell: powershell
53+
if: ${{ matrix.BUILD_BITS == '32' }}
54+
55+
- run: |
56+
# see https://www.mail-archive.com/[email protected]/msg586184.html
57+
if [ "${{ matrix.BUILD_BITS }}" == "64" ]; then
58+
include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/avx512fintrin.h
59+
else
60+
include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw32/lib/gcc/i686-w64-mingw32/8.1.0/include/avx512fintrin.h
61+
fi
62+
sed -i -e"s/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/" $include
63+
name: Fix gcc bug
64+
65+
- name: Build
66+
run: |
67+
BITS=${{ matrix.BUILD_BITS }}
68+
if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then
69+
export INTERFACE64=1
70+
fi
71+
if [ "$BITS" == "32" ]; then
72+
export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH
73+
fi
74+
echo $PATH
75+
git submodule update --init --recursive
76+
tools/build_openblas.sh
77+
78+
- name: Test
79+
run: |
80+
BITS=${{ matrix.BUILD_BITS }}
81+
if [ "$BITS" == "32" ]; then
82+
export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH
83+
fi
84+
if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then
85+
export INTERFACE64=1
86+
fi
87+
tools/build_gfortran.sh
88+
cp test.exe builds
89+
cp test_dyn.exe builds
90+
./test.exe
91+
cp $(cygpath $OPENBLAS_ROOT)/$BITS/bin/*.dll .
92+
./test_dyn.exe
93+
94+
- name: Upload
95+
env:
96+
OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
97+
run: |
98+
pip install -q git+https://github.com/Anaconda-Platform/[email protected]
99+
tools/upload_to_anaconda_staging.sh

.github/workflows/multibuild.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
INTERFACE64: ''
2727
platform: [x64]
2828
exclude:
29-
- os: ubuntu-latest
3029
- os: macos-latest
3130
PLAT: i686
3231
- os: macos-latest
@@ -53,10 +52,10 @@ jobs:
5352
with:
5453
submodules: recursive
5554
fetch-depth: 0
56-
- name: Set up Python 3.9
55+
- name: Set up Python 3.8
5756
uses: actions/setup-python@v2
5857
with:
59-
python-version: 3.9
58+
python-version: 3.8
6059
- name: Set extra env
6160
run: |
6261
if [ "macos-latest" == "${{ matrix.os }}" ]; then echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV; else echo "TRAVIS_OS_NAME=${{ matrix.os }}" >> $GITHUB_ENV; fi

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
url = https://github.com/matthew-brett/multibuild.git
77
[submodule "gfortran-install"]
88
path = gfortran-install
9-
url = https://github.com/isuruf/gfortran-install.git
9+
url = https://github.com/MacPython/gfortran-install.git

gfortran-install

travis-ci/build_steps.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ function do_build_lib {
8181
#
8282
# Depends on globals
8383
# BUILD_PREFIX - install suffix e.g. "/usr/local"
84-
env
8584
local plat=$1
8685
local suffix=$2
8786
local interface64=$3
@@ -133,7 +132,7 @@ function do_build_lib {
133132
set -x
134133
(cd OpenBLAS \
135134
&& patch_source \
136-
&& make BUFFERSIZE=20 DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags \
135+
&& make BUFFERSIZE=20 DYNAMIC_ARCH=1 USE_OPENMP=0 NUM_THREADS=64 BINARY=$bitness $interface64_flags $target_flags > /dev/null \
137136
&& make PREFIX=$BUILD_PREFIX $interface64_flags install )
138137
stop_spinner
139138
local version=$(cd OpenBLAS && git describe --tags --abbrev=8)

0 commit comments

Comments
 (0)