Skip to content

Commit 4a7f24a

Browse files
galabovaagalabovaa
authored
Merge pull request ERGO-Code#2038 from ERGO-Code/latest
HiGHS Release 1.8.1
2 parents fcfb534 + 7779c46 commit 4a7f24a

File tree

116 files changed

+7503
-2631
lines changed

Some content is hidden

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

116 files changed

+7503
-2631
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.8.0
188+
run: dotnet pack -c Release /p:Version=1.8.1
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-unit-tests-external.yml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
name: build-unit-tests-external
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
release_extra_only:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
os: [ubuntu-latest]
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Clone extra unit tests repo
16+
shell: bash
17+
working-directory: ${{runner.workspace}}
18+
run: |
19+
git clone https://github.com/galabovaa/highs-unit-tests.git
20+
21+
- name: Create symlink
22+
shell: bash
23+
working-directory: ${{runner.workspace}}
24+
run: ln -s ${{runner.workspace}}/highs-unit-tests $GITHUB_WORKSPACE/check
25+
26+
- name: Create Build Environment
27+
run: cmake -E make_directory ${{runner.workspace}}/build
28+
29+
- name: Configure CMake All
30+
shell: bash
31+
working-directory: ${{runner.workspace}}/build
32+
run: cmake $GITHUB_WORKSPACE -DBUILD_EXTRA_UNIT_TESTS=ON -DBUILD_EXTRA_UNIT_ONLY=ON -DBUILD_CXX=OFF
33+
34+
- name: Build All
35+
working-directory: ${{runner.workspace}}/build
36+
shell: bash
37+
run: |
38+
cmake --build . --parallel
39+
40+
- name: Test Extra Only
41+
working-directory: ${{runner.workspace}}/build
42+
shell: bash
43+
run: ctest --parallel --timeout 300 --output-on-failure
44+
45+
release_all_tests:
46+
runs-on: ${{ matrix.os }}
47+
strategy:
48+
matrix:
49+
os: [ubuntu-latest]
50+
51+
steps:
52+
- uses: actions/checkout@v4
53+
54+
- name: Clone extra unit tests repo
55+
shell: bash
56+
working-directory: ${{runner.workspace}}
57+
run: |
58+
git clone https://github.com/galabovaa/highs-unit-tests.git
59+
60+
- name: Create symlink
61+
shell: bash
62+
working-directory: ${{runner.workspace}}
63+
run: ln -s ${{runner.workspace}}/highs-unit-tests $GITHUB_WORKSPACE/check
64+
65+
- name: Create Build Environment
66+
run: cmake -E make_directory ${{runner.workspace}}/build
67+
68+
- name: Configure CMake All
69+
shell: bash
70+
working-directory: ${{runner.workspace}}/build
71+
run: cmake $GITHUB_WORKSPACE -DALL_TESTS=ON -DBUILD_EXTRA_UNIT_TESTS=ON
72+
73+
- name: Build All
74+
working-directory: ${{runner.workspace}}/build
75+
shell: bash
76+
run: |
77+
cmake --build . --parallel
78+
79+
- name: Test All
80+
working-directory: ${{runner.workspace}}/build
81+
shell: bash
82+
run: ctest --parallel --timeout 300 --output-on-failure
83+
84+
# release__windows_extra_unit_tests:
85+
# runs-on: windows-2019
86+
87+
# steps:
88+
# - uses: actions/checkout@v4
89+
90+
# - name: Create Build Environment
91+
# run: cmake -E make_directory ${{runner.workspace}}/build
92+
93+
# - name: Clone extra unit tests repo
94+
# working-directory: ${{runner.workspace}}/build
95+
# run: git clone https://github.com/galabovaa/highs-unit-tests.git
96+
97+
# - name: Create symlink
98+
# shell: bash
99+
# working-directory: $GITHUB_WORKSPACE/check
100+
# run: mklink /d highs-unit-tests ${{runner.workspace}}/highs-unit-tests
101+
102+
# - name: Configure CMake
103+
# # Use a bash shell so we can use the same syntax for environment variable
104+
# # access regardless of the host operating system
105+
# shell: bash
106+
# working-directory: ${{runner.workspace}}/build
107+
# # Note the current convention is to use the -S and -B options here to specify source
108+
# # and build directories, but this is only available with CMake 3.13 and higher.
109+
# # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
110+
# run: cmake $GITHUB_WORKSPACE -DALL_TESTS=ON -DBUILD_EXTRA_UNIT_TESTS=ON
111+
112+
# - name: Build
113+
# working-directory: ${{runner.workspace}}/build
114+
# shell: bash
115+
# # Execute the build. You can specify a specific target with "--target <NAME>"
116+
# run: cmake --build . --config Release --parallel
117+
118+
# - name: Unit Test Extra
119+
# working-directory: ${{runner.workspace}}/build
120+
# shell: bash
121+
# run: ./bin/Release/unit_tests.exe highs-names-extra
122+
123+
# - name: Test
124+
# working-directory: ${{runner.workspace}}/build
125+
# shell: bash
126+
# # Execute tests defined by the CMake configuration.
127+
# # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
128+
# run: ctest --timeout 300 --output-on-failure -C Release

0 commit comments

Comments
 (0)