Skip to content

Commit 35bca7b

Browse files
committed
Trying to set ifort
1 parent ad7e694 commit 35bca7b

File tree

91 files changed

+31557
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+31557
-20
lines changed

.github/workflows/build-wheels.yaml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
include:
35-
- os: ubuntu-latest
36-
cibw_archs: "x86_64"
37-
- os: ubuntu-24.04-arm
38-
cibw_archs: "aarch64"
39-
- os: windows-2025
40-
cibw_archs: "AMD64"
35+
# - os: ubuntu-latest
36+
# cibw_archs: "x86_64"
37+
#- os: ubuntu-24.04-arm
38+
# cibw_archs: "aarch64"
39+
#- os: windows-2025
40+
# cibw_archs: "AMD64"
4141
# # Not happy at the moment hence turned off
4242
# # It doesn't seem too far away, but something isn't quite right.
4343
# # Latest run by Zeb: https://github.com/openscm/example-fgen-basic/actions/runs/17173313157/job/48725872212
@@ -51,12 +51,12 @@ jobs:
5151
# # potentially relevant scipy issues:
5252
# # - https://github.com/scipy/scipy/issues/21716
5353
# # - https://github.com/scipy/scipy/issues/14812
54-
# - os: windows-11-arm
55-
# cibw_archs: "ARM64"
56-
- os: macos-13
57-
cibw_archs: "x86_64"
58-
- os: macos-14
59-
cibw_archs: "arm64"
54+
- os: windows-11-arm
55+
cibw_archs: "ARM64"
56+
#- os: macos-13
57+
# cibw_archs: "x86_64"
58+
#- os: macos-14
59+
# cibw_archs: "arm64"
6060

6161
steps:
6262
- uses: actions/checkout@v5
@@ -82,19 +82,20 @@ jobs:
8282
# setup-args="-Db_vscrt=mt"
8383
# setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
8484
run: |
85-
echo 'CIBW_CONFIG_SETTINGS_WINDOWS=setup-args="--vsenv" setup-args="-Db_vscrt=mt"' >> $GITHUB_ENV
85+
choco install intel-oneapi-compiler-fortran --version=2025.0.0 --yes
86+
# echo 'CIBW_CONFIG_SETTINGS_WINDOWS=setup-args="--vsenv" setup-args="-Db_vscrt=mt"' >> $GITHUB_ENV
8687
# TODO: figure out escaping and add back in (?)
8788
# setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
88-
- name: Install Fortran compiler - windows-arm
89+
# - name: Install Fortran compiler - windows-arm
8990
# When building on windows ARM, we need to use the MSVC toolchain
90-
if: ${{ matrix.os == 'windows-11-arm' }}
91-
uses: fortran-lang/setup-fortran@v1
92-
id: setup-fortran-windows-arm
93-
with:
91+
#if: ${{ matrix.os == 'windows-11-arm' }}
92+
#uses: fortran-lang/setup-fortran@v1
93+
#id: setup-fortran-windows-arm
94+
#with:
9495
# Only intel-classic supported by f2py
9596
# (https://numpy.org/devdocs/f2py/windows/intel.html#f2py-and-windows-intel-fortran)
96-
compiler: "intel-classic"
97-
version: "2021.10"
97+
#compiler: "intel-classic"
98+
#version: "2021.10"
9899
- name: Build wheels
99100
uses: pypa/[email protected] # matplotlib had v3.1.3
100101
with:

0 commit comments

Comments
 (0)