Skip to content

Commit 19c9a73

Browse files
galabovaagalabovaa
committed
Merge branch 'latest' into extra-tests
2 parents 5ded22e + 02aeb70 commit 19c9a73

File tree

118 files changed

+7513
-2593
lines changed

Some content is hidden

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

118 files changed

+7513
-2593
lines changed

‎.github/workflows/build-nuget-package.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
# macos 12 is Intel
11-
build_macos_12:
12-
runs-on: macos-12
10+
# macos 13 is Intel
11+
build_macos_13:
12+
runs-on: macos-13
1313
# strategy:
1414
# matrix:
1515
# python: [3.11]
@@ -32,7 +32,7 @@ jobs:
3232
name: macos-x64
3333
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
3434

35-
# macos 14 is M1 (beta)
35+
# macos 14 is M1
3636
build_macos_14:
3737
runs-on: macos-14
3838
steps:
@@ -124,7 +124,7 @@ jobs:
124124

125125
build_windows:
126126
runs-on: windows-latest
127-
needs: [build_macos_12, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
127+
needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
128128
steps:
129129
- uses: actions/checkout@v4
130130
- name: Build HiGHS Windows native
@@ -185,7 +185,7 @@ jobs:
185185

186186
- name: Dotnet pack
187187
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
188-
run: dotnet pack -c Release /p:Version=1.7.2
188+
run: dotnet pack -c Release /p:Version=1.8.0
189189

190190
- uses: actions/upload-artifact@v4
191191
with:

‎.github/workflows/build-python-package.yml‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,12 @@ jobs:
105105
python3 -m pip install pytest
106106
python3 -m pytest $GITHUB_WORKSPACE
107107
108-
109-
# macos 12 is Intel
110-
build_wheel_macos_12:
111-
runs-on: macos-12
108+
# macos 13 is Intel
109+
build_wheel_macos_13:
110+
runs-on: macos-13
112111
strategy:
113112
matrix:
114-
python: [3.11]
113+
python: [3.11]
115114
steps:
116115
- uses: actions/checkout@v4
117116

@@ -134,12 +133,12 @@ jobs:
134133
135134
- name: Test highspy
136135
run: |
137-
python3 -m pip install pytest
136+
python3 -m pip install pytest
138137
python3 -m pytest $GITHUB_WORKSPACE
139138
140-
# macos 13 is Intel
141-
build_wheel_macos_13:
142-
runs-on: macos-13
139+
# macos 14 is M1
140+
build_wheel_macos_14:
141+
runs-on: macos-14
143142
strategy:
144143
matrix:
145144
python: [3.11]
@@ -154,7 +153,7 @@ jobs:
154153
- name: Build wheel
155154
run: |
156155
python3 -m pip install cibuildwheel
157-
python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
156+
python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
158157
159158
- name: Install wheel
160159
run: |
@@ -167,38 +166,34 @@ jobs:
167166
run: |
168167
python3 -m pip install pytest
169168
python3 -m pytest $GITHUB_WORKSPACE
170-
171-
# macos 14 is M1 (beta)
172-
build_wheel_macos_14:
173-
runs-on: macos-14
174-
strategy:
175-
matrix:
176-
python: [3.11]
169+
170+
build_wheel_windows:
171+
runs-on: windows-2019
177172
steps:
178173
- uses: actions/checkout@v4
179174

180175
- name: Install correct python version
181176
uses: actions/setup-python@v5
182177
with:
183-
python-version: ${{ matrix.python }}
178+
python-version: 3.9
184179

185180
- name: Build wheel
186181
run: |
187-
python3 -m pip install cibuildwheel
188-
python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
182+
python -m pip install cibuildwheel
183+
python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
189184
190185
- name: Install wheel
191186
run: |
192187
ls wheelhouse
193-
python3 --version
194-
python3 -m pip install wheelhouse/*.whl
195-
python3 -c "import highspy; print(dir(highspy))"
188+
$item = Get-ChildItem wheelhouse
189+
python -m pip install "$item"
190+
python -c "import highspy; print(dir(highspy))"
196191
197192
- name: Test highspy
198193
run: |
199-
python3 -m pip install pytest
200-
python3 -m pytest $GITHUB_WORKSPACE
201-
194+
python -m pip install pytest
195+
python -m pytest
196+
202197
build_wheel_windows:
203198
runs-on: windows-2019
204199
steps:
@@ -207,12 +202,12 @@ jobs:
207202
- name: Install correct python version
208203
uses: actions/setup-python@v5
209204
with:
210-
python-version: 3.9
205+
python-version: 3.13
211206

212207
- name: Build wheel
213208
run: |
214209
python -m pip install cibuildwheel
215-
python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
210+
python -m cibuildwheel --only cp313-win_amd64 $GITHUB_WORKSPACE
216211
217212
- name: Install wheel
218213
run: |

‎.github/workflows/build-wheels-push.yml‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,24 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15+
build_sdist:
16+
name: Build source distribution
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
21+
- name: Build sdist
22+
shell: bash
23+
run: pipx run build --sdist
24+
25+
# - name: check metadata
26+
# run: pipx run twine check python/dist/*
27+
28+
- uses: actions/upload-artifact@v4
29+
with:
30+
name: cibw-sdist
31+
path: python/dist/*.tar.gz
32+
1533
build_wheels:
1634
name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
1735
runs-on: ${{ matrix.buildplat[0] }}
@@ -30,47 +48,38 @@ jobs:
3048
- [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
3149
- [ubuntu-20.04, musllinux_i686]
3250
- [ubuntu-20.04, musllinux_aarch64]
33-
- [macos-12, macosx_x86_64]
51+
- [macos-13, macosx_x86_64]
3452
- [macos-14, macosx_arm64]
3553
- [windows-2019, win_amd64]
3654
- [windows-2019, win32]
37-
python: ["cp38", "cp39","cp310", "cp311","cp312"]
55+
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
3856

3957
steps:
4058
- uses: actions/checkout@v4
59+
4160
- name: Set up QEMU # Required for aarch64 builds
4261
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
4362
uses: docker/setup-qemu-action@v3
4463
with:
4564
platforms: all
65+
4666
- name: Build wheels (aarch64)
4767
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
48-
uses: pypa/cibuildwheel@v2.19
68+
uses: pypa/cibuildwheel@v2.21
4969
env:
5070
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
5171
CIBW_ARCHS_LINUX: aarch64
72+
5273
- name: Build wheels (not aarch64)
5374
if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
54-
uses: pypa/cibuildwheel@v2.19
75+
uses: pypa/cibuildwheel@v2.21
5576
env:
5677
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
57-
- uses: actions/upload-artifact@v3
58-
with:
59-
path: ./wheelhouse/*.whl
60-
61-
build_sdist:
62-
name: Build source distribution
63-
runs-on: ubuntu-latest
64-
steps:
65-
- uses: actions/checkout@v4
66-
67-
- name: Build sdist
68-
shell: bash -l {0}
69-
run: pipx run build --sdist
7078

71-
- uses: actions/upload-artifact@v3
79+
- uses: actions/upload-artifact@v4
7280
with:
73-
path: dist/*.tar.gz
81+
name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
82+
path: wheelhouse/*.whl
7483

7584
# upload_testpypi:
7685
# name: >-
@@ -88,12 +97,11 @@ jobs:
8897
# permissions:
8998
# id-token: write # IMPORTANT: mandatory for trusted publishing
9099
# steps:
91-
# - uses: actions/download-artifact@v3
100+
# - uses: actions/download-artifact@v4
92101
# with:
93-
# # unpacks default artifact into dist/
94-
# # if `name: artifact` is omitted, the action will create extra parent dir
95-
# name: artifact
102+
# pattern: cibw-*
96103
# path: dist
104+
# merge-multiple: true
97105

98106
# - name: Download all
99107
# uses: pypa/gh-action-pypi-publish@release/v1
@@ -107,7 +115,7 @@ jobs:
107115
needs: [build_wheels, build_sdist]
108116

109117
# upload to PyPI on every tag starting with 'v'
110-
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
118+
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
111119

112120
environment:
113121
name: pypi
@@ -117,12 +125,11 @@ jobs:
117125
id-token: write # IMPORTANT: mandatory for trusted publishing
118126

119127
steps:
120-
- uses: actions/download-artifact@v3
128+
- uses: actions/download-artifact@v4
121129
with:
122-
# unpacks default artifact into dist/
123-
# if `name: artifact` is omitted, the action will create extra parent dir
124-
name: artifact
130+
pattern: cibw-*
125131
path: dist
132+
merge-multiple: true
126133

127134
- name: Download all
128135
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/build-wheels.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ concurrency:
88
cancel-in-progress: true
99

1010
jobs:
11+
build_sdist:
12+
name: Build source distribution
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Build sdist
18+
shell: bash
19+
run: pipx run build --sdist
20+
1121
build_wheels:
1222
name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
1323
runs-on: ${{ matrix.buildplat[0] }}
@@ -25,11 +35,11 @@ jobs:
2535
- [ubuntu-20.04, musllinux_x86_64] # No OpenBlas, no test
2636
- [ubuntu-20.04, musllinux_i686]
2737
- [ubuntu-20.04, musllinux_aarch64]
28-
- [macos-12, macosx_x86_64]
38+
- [macos-13, macosx_x86_64]
2939
- [macos-14, macosx_arm64]
3040
- [windows-2019, win_amd64]
3141
- [windows-2019, win32]
32-
python: ["cp38", "cp39","cp310", "cp311","cp312"]
42+
python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
3343

3444
steps:
3545
- uses: actions/checkout@v4
@@ -38,24 +48,16 @@ jobs:
3848
uses: docker/setup-qemu-action@v3
3949
with:
4050
platforms: all
51+
4152
- name: Build wheels (aarch64)
4253
if: ${{ contains(matrix.buildplat[1], 'aarch64') }}
43-
uses: pypa/cibuildwheel@v2.19
54+
uses: pypa/cibuildwheel@v2.21
4455
env:
4556
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
4657
CIBW_ARCHS_LINUX: aarch64
58+
4759
- name: Build wheels (not aarch64)
4860
if: ${{ !contains(matrix.buildplat[1], 'aarch64') }}
49-
uses: pypa/cibuildwheel@v2.19
61+
uses: pypa/cibuildwheel@v2.21
5062
env:
5163
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
52-
53-
build_sdist:
54-
name: Build source distribution
55-
runs-on: ubuntu-latest
56-
steps:
57-
- uses: actions/checkout@v4
58-
59-
- name: Build sdist
60-
shell: bash -l {0}
61-
run: pipx run build --sdist

‎.github/workflows/build-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ jobs:
229229
# Note the current convention is to use the -S and -B options here to specify source
230230
# and build directories, but this is only available with CMake 3.13 and higher.
231231
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
232-
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=OFF -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
232+
run: cmake $GITHUB_WORKSPACE -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
233233

234234
- name: Build
235235
working-directory: ${{runner.workspace}}/build
@@ -263,7 +263,7 @@ jobs:
263263
# Note the current convention is to use the -S and -B options here to specify source
264264
# and build directories, but this is only available with CMake 3.13 and higher.
265265
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
266-
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=OFF -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
266+
run: cmake $GITHUB_WORKSPACE -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON -DALL_TESTS=ON
267267

268268
- name: Build
269269
working-directory: ${{runner.workspace}}/build

‎.github/workflows/clang-format.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: DoozyX/[email protected]
1212
with:
13-
source: 'app/ src/Highs.h ./src/lp_data ./src/mip ./src/model ./src/simplex ./src/presolve ./src/simplex ./src/util ./src/test'
14-
#./src/test ./interfaces'
13+
source:
14+
'app/ src/Highs.h ./src/lp_data ./src/mip ./src/model ./src/simplex ./src/presolve ./src/simplex ./src/util ./src/test ./src/qpsolver'
15+
# ./src/test ./interfaces'
1516
extensions: 'h,cpp,c'
1617
clangFormatVersion: 18

‎.github/workflows/test-fortran-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
fast_build_release:
7-
runs-on: macos-12
7+
runs-on: [macos-13]
88

99

1010
steps:

0 commit comments

Comments
 (0)