Updates for osx and windows actions

.github/workflows/build_macos.yml

@@ -22,9 +22,15 @@ jobs:
  uses: actions/checkout@v3
  with: 
  submodules: true
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
  - name: Install Clang with OpenMP support
  run: |
- brew install libomp llvm
+ brew install --force libomp llvm
+ - name: Update environment flags for Clang 
+ run: |
  export PATH="/usr/local/opt/llvm/bin:$PATH"
  export LDFLAGS="-L/usr/local/opt/llvm/lib"
  export CPPFLAGS="-I/usr/local/opt/llvm/include"
@@ -43,10 +49,6 @@ jobs:
  export LDFLAGS="-L/usr/local/opt/openblas/lib"
  export CPPFLAGS="-I/usr/local/opt/openblas/include"
  brew info openblas
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python-version }}
  - name: Install dependencies
  run: |
  python -m pip install --upgrade pip

.github/workflows/build_windows.yml

@@ -11,10 +11,10 @@ jobs:
  name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
  runs-on: ${{ matrix.os }}
  env:
- CC: clang-cl
- CXX: clang-cl
- LDFLAGS: "-Wl,-S"
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ # CC: clang-cl
+ # CXX: clang-cl
+ # LDFLAGS: "-Wl,-S"
  strategy:
  fail-fast: false
  matrix:
@@ -32,6 +32,10 @@ jobs:
  # platform: x64
  - name: Setup MSVC 
  uses: ilammy/[email protected]
+ - name: Prepare MSVC
+ uses: bus1/cabuild/action/msdevshell@v1
+ with:
+ architecture: x64
  # - name: Install Clang with OpenMP support using Chocolatey
  # run: |
  # choco install -y llvm --params "clang;compiler=clang" --version 13.0.0
@@ -53,9 +57,6 @@ jobs:
  - name: Install package
  run: |
  pip install --verbose .
- env: 
- CC: msvc
- CXX: msvc
  - name: Test with pytest
  run: |
  python -m pytest tests/ --cov=primate --benchmark-skip