Skip to content

Commit 755a8e0

Browse files
authored
Merge pull request #2605 from ERGO-Code/latest
Release 1.12.0
2 parents 2584a4d + 9fa8db6 commit 755a8e0

File tree

324 files changed

+34359
-4701
lines changed

Some content is hidden

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

324 files changed

+34359
-4701
lines changed

.bazelrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
build --enable_platform_specific_config
2+
3+
build:windows --enable_runfiles
4+
15
build:asan --strip=never
26
build:asan --copt -fsanitize=address
37
build:asan --copt -O1

.github/julia/build_tarballs.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
3333
-DCMAKE_BUILD_TYPE=Release \
3434
-DBUILD_SHARED_LIBS=${BUILD_SHARED} \
3535
-DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
36-
-DFAST_BUILD=ON ..
36+
-DHIPO=ON \
37+
-DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
38+
-DMETIS_ROOT=${prefix} \
39+
..
3740
3841
if [[ "${target}" == *-linux-* ]]; then
3942
make -j ${nproc}
@@ -60,6 +63,8 @@ platforms = expand_cxxstring_abis(platforms)
6063
dependencies = [
6164
Dependency("CompilerSupportLibraries_jll"),
6265
Dependency("Zlib_jll"),
66+
Dependency("METIS_jll"),
67+
Dependency("OpenBLAS32_jll"),
6368
HostBuildDependency(PackageSpec(; name="CMake_jll")),
6469
]
6570

.github/workflows/build-fast.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Configure CMake
1919
shell: bash
2020
working-directory: ${{runner.workspace}}/build
21-
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
21+
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
2222

2323
- name: Build
2424
working-directory: ${{runner.workspace}}/build
@@ -45,7 +45,7 @@ jobs:
4545
- name: Configure CMake
4646
shell: bash
4747
working-directory: ${{runner.workspace}}/build
48-
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG
48+
run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON
4949

5050
- name: Build
5151
working-directory: ${{runner.workspace}}/build

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

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

99
jobs:
10-
# macos 13 is Intel
11-
build_macos_13:
12-
runs-on: macos-13
13-
# strategy:
14-
# matrix:
15-
# python: [3.11]
10+
# Build macos intel
11+
build_macos_intel:
12+
runs-on: macos-15-intel
1613
steps:
1714
- uses: actions/checkout@v4
1815
- name: Build HiGHS
@@ -31,10 +28,10 @@ jobs:
3128
with:
3229
name: macos-x64
3330
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
34-
35-
# macos 14 is M1
36-
build_macos_14:
37-
runs-on: macos-14
31+
32+
# Build macos arm64
33+
build_macos_arm:
34+
runs-on: macos-14 # macos-14 is arm64
3835
steps:
3936
- uses: actions/checkout@v4
4037
- name: Build HiGHS
@@ -54,14 +51,14 @@ jobs:
5451
name: macos-arm64
5552
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
5653

57-
# Build windows 32 and linux
54+
# Build windows 32 and linux
5855
build_windows_32:
5956
runs-on: windows-latest
6057
steps:
6158
- uses: actions/checkout@v4
6259
- name: Build HiGHS
6360
run: |
64-
cmake -E make_directory ${{runner.workspace}}/build32
61+
cmake -E make_directory ${{runner.workspace}}/build32
6562
6663
- name: Configure CMake win32
6764
shell: bash
@@ -126,7 +123,7 @@ jobs:
126123

127124
build_windows:
128125
runs-on: windows-latest
129-
needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
126+
needs: [build_macos_intel, build_macos_arm, build_windows_32, build_linux, build_linux_arm64]
130127
steps:
131128
- uses: actions/checkout@v4
132129
- name: Build HiGHS Windows native
@@ -142,10 +139,10 @@ jobs:
142139
working-directory: ${{runner.workspace}}/build
143140
shell: bash
144141
run: cmake --build . --config Release --parallel
145-
142+
146143
- name: Display structure of downloaded files
147144
run: |
148-
pwd
145+
pwd
149146
ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
150147
151148
- name: Download runtimes macos-x64
@@ -187,7 +184,7 @@ jobs:
187184

188185
- name: Dotnet pack
189186
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
190-
run: dotnet pack -c Release /p:Version=1.11.0
187+
run: dotnet pack -c Release /p:Version=1.12.0
191188

192189
- uses: actions/upload-artifact@v4
193190
with:
@@ -201,7 +198,7 @@ jobs:
201198
name: nuget
202199

203200
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
204-
steps:
201+
steps:
205202
- uses: actions/checkout@v4
206203
- uses: actions/setup-dotnet@v4
207204

@@ -211,6 +208,6 @@ jobs:
211208
name: nuget
212209

213210
- name: Dotnet push
214-
run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
211+
run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
215212
# env:
216213
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ jobs:
132132
python3 -m pip install pytest
133133
python3 -m pytest $GITHUB_WORKSPACE
134134
135-
# macos 13 is Intel
136-
build_wheel_macos_13:
137-
runs-on: macos-13
135+
build_wheel_macos_intel:
136+
runs-on: macos-15-intel
138137
strategy:
139138
matrix:
140139
python: [3.11]
@@ -163,9 +162,8 @@ jobs:
163162
python3 -m pip install pytest
164163
python3 -m pytest $GITHUB_WORKSPACE
165164
166-
# macos 14 is M1
167-
build_wheel_macos_14:
168-
runs-on: macos-14
165+
build_wheel_macos_arm:
166+
runs-on: macos-14 # macos-14 is arm64
169167
strategy:
170168
matrix:
171169
python: [3.11]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
5050
- [ubuntu-24.04, musllinux_i686]
5151
- [ubuntu-24.04-arm, musllinux_aarch64]
52-
- [macos-13, macosx_x86_64]
52+
- [macos-15-intel, macosx_x86_64]
5353
- [macos-14, macosx_arm64]
5454
- [windows-2022, win_amd64]
5555
- [windows-2022, win32]

.github/workflows/build-wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: build-wheels
22

3-
on: [push]
4-
# on: [pull_request]
3+
# on: [push]
4+
on: [pull_request]
55

66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
@@ -38,7 +38,7 @@ jobs:
3838
- [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
3939
- [ubuntu-24.04, musllinux_i686]
4040
- [ubuntu-24.04-arm, musllinux_aarch64]
41-
- [macos-13, macosx_x86_64]
41+
- [macos-15-intel, macosx_x86_64]
4242
- [macos-14, macosx_arm64]
4343
- [windows-2022, win_amd64]
4444
- [windows-2022, win32]

0 commit comments

Comments
 (0)