Refactor build to use Powershell

Refactor build_gfortran to run builds in own directory.

Author: matthew-brett

.github/workflows/build.yml

@@ -1,11 +1,5 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Windows build
 
-defaults:
-  run:
-    shell: bash
-
 on:
   push:
     branches: [ master ]
@@ -15,13 +9,16 @@ on:
 env:
   OPENBLAS_COMMIT: "bfd9c1b58cd3"
   OPENBLAS_ROOT: "c:\\opt"
+  # Preserve working directory for calls into bash
+  CHERE_INVOKING: "yes"
+  BASH_PATH: "c:\\rtools40\\usr\\bin\\bash"
 
 jobs:
   build:
     strategy:
       matrix:
         BUILD_BITS: [64, 32]
-        INTERFACE64: ['1', '']
+        INTERFACE64: ['1', '0']
         os: [windows-latest]
         exclude:
           - BUILD_BITS: 32
@@ -31,65 +28,46 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Setup
+      - name: install-rtools
         run: |
-          BITS=${{ matrix.BUILD_BITS }}
-          echo "BUILD_BITS=$BITS" >> $GITHUB_ENV;
-          if [ "$BITS" == "32" ]; then
-            echo "PLAT=i686" >> $GITHUB_ENV;
-          else
-            echo "PLAT=x86_64" >> $GITHUB_ENV;
-          fi
-          echo "START_DIR=$PWD" >> $GITHUB_ENV;
-          choco install -y zip
-
-      - run: |
-          choco install -y mingw --forcex86 --force --version=8.1.0
-          choco install -y make
-        name: Install 32-bit mingw
-        shell: powershell
-        if: ${{ matrix.BUILD_BITS == '32' }}
+          choco install rtools --no-progress
 
-      - run: |
-          # see https://www.mail-archive.com/[email protected]/msg586184.html
-          if [ "${{ matrix.BUILD_BITS }}" == "64" ]; then
-            include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/avx512fintrin.h
-          else
-            include=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw32/lib/gcc/i686-w64-mingw32/8.1.0/include/avx512fintrin.h
-          fi
-          sed -i -e"s/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/" $include
-        name: Fix gcc bug
+      - name: Set env variables
+        run: |
+          echo "START_DIR=$PWD" >> $env:GITHUB_ENV
+          $BITS = ${{ matrix.BUILD_BITS }}
+          echo "BUILD_BITS=$BITS" >> $env:GITHUB_ENV
+          # For interpretation of MSYSTEM, see:
+          # https://sourceforge.net/p/msys2/discussion/general/thread/b7dfdac8/#3939
+          if ($BITS -eq 32) {
+            echo "PLAT=i686" >> $env:GITHUB_ENV
+            echo "MSYSTEM=MINGW32" >> $env:GITHUB_ENV
+            echo "LDFLAGS=-static -static-libgcc" >> $env:GITHUB_ENV
+          } else {
+            echo "PLAT=x86_64" >> $env:GITHUB_ENV
+            echo "MSYSTEM=UCRT64" >> $env:GITHUB_ENV
+            echo "LDFLAGS=-lucrt -static -static-libgcc" >> $env:GITHUB_ENV
+          }
+          if ( ${{ matrix.INTERFACE64 }} -eq 1 ) {
+            echo "INTERFACE64=1" >> $env:GITHUB_ENV
+          }
 
       - name: Build
         run: |
-          BITS=${{ matrix.BUILD_BITS }}
-          if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then
-            export INTERFACE64=1
-          fi
-          if [ "$BITS" == "32" ]; then
-            export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH
-          fi
-          echo $PATH
           git submodule update --init --recursive
-          tools/build_openblas.sh
+          & $env:BASH_PATH -lc tools/build_openblas.sh
 
       - name: Test
         run: |
-          BITS=${{ matrix.BUILD_BITS }}
-          if [ "$BITS" == "32" ]; then
-            export PATH=/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw32/bin:$PATH
-          fi
-          if [ "${{ matrix.INTERFACE64 }}" == "1" ]; then
-            export INTERFACE64=1
-          fi
-          tools/build_gfortran.sh
-          cp test.exe builds
-          cp test_dyn.exe builds
-          ./test.exe
-          cp $(cygpath $OPENBLAS_ROOT)/$BITS/bin/*.dll .
-          ./test_dyn.exe
+          & $env:BASH_PATH -lc tools/build_gfortran.sh
+          echo "Static test"
+          .\for_test\test.exe
+          echo "Dynamic test"
+          .\for_test\test_dyn.exe
+
+      - name: Copy
+        run: |
+          cp for_test\test*.exe builds
 
       - uses: actions/upload-artifact@v3
         with:
@@ -100,4 +78,4 @@ jobs:
          OPENBLAS_LIBS_STAGING_UPLOAD_TOKEN: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
         run: |
           pip install -q git+https://github.com/Anaconda-Platform/[email protected]
-          tools/upload_to_anaconda_staging.sh
+          & $env:BASH_PATH -lc tools/upload_to_anaconda_staging.sh

.gitignore

@@ -3,4 +3,4 @@ builds/
 *~
 *.pyc
 *.swp
-test.exe
+for_test/

OpenBLAS

@@ -2,16 +2,23 @@
 
 set -e
 
-cd $(cygpath "$START_DIR")
+rm -rf for_test
+mkdir for_test
+cd for_test
+
+repo_path=$(cygpath "$START_DIR")
 OBP=$(cygpath $OPENBLAS_ROOT\\$BUILD_BITS)
 
 static_libname=$(find $OBP/lib -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a' | tail -1)
 dynamic_libname=$(find $OBP/lib -maxdepth 1 -type f -name '*.dll.a' | tail -1)
+dll_name=$(echo $dynamic_libname | sed 's#/lib/#/bin/#' | sed 's/.a$//')
+
+cp $dll_name .
 
 if [ "$INTERFACE64" == "1" ]; then
-  gfortran -I $OBP/include -fdefault-integer-8 -o test.exe test64_.f90 $static_libname
-  gfortran -I $OBP/include -fdefault-integer-8 -o test_dyn.exe test64_.f90 $dynamic_libname
+  gfortran -I $OBP/include -fdefault-integer-8 -o test.exe ${repo_path}/test64_.f90 $static_libname
+  gfortran -I $OBP/include -fdefault-integer-8 -o test_dyn.exe ${repo_path}/test64_.f90 $dynamic_libname
 else
-  gfortran -I $OBP/include -o test.exe test.f90 $static_libname
-  gfortran -I $OBP/include -o test_dyn.exe test.f90 $dynamic_libname
+  gfortran -I $OBP/include -o test.exe ${repo_path}/test.f90 $static_libname
+  gfortran -I $OBP/include -o test_dyn.exe ${repo_path}/test.f90 $dynamic_libname
 fi