Skip to content

Commit bdfe69d

Browse files
Opt-MuccaOpt-Mucca
committed
Merge branch 'latest' into strongcg
2 parents b89e5ce + c4012f5 commit bdfe69d

File tree

216 files changed

+20117
-2822
lines changed

Some content is hidden

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

216 files changed

+20117
-2822
lines changed

‎.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-nuget-package.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
name: macos-x64
3030
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
31-
31+
3232
# Build macos arm64
3333
build_macos_arm:
3434
runs-on: macos-14 # macos-14 is arm64
@@ -51,14 +51,14 @@ jobs:
5151
name: macos-arm64
5252
path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
5353

54-
# Build windows 32 and linux
54+
# Build windows 32 and linux
5555
build_windows_32:
5656
runs-on: windows-latest
5757
steps:
5858
- uses: actions/checkout@v4
5959
- name: Build HiGHS
6060
run: |
61-
cmake -E make_directory ${{runner.workspace}}/build32
61+
cmake -E make_directory ${{runner.workspace}}/build32
6262
6363
- name: Configure CMake win32
6464
shell: bash
@@ -139,10 +139,10 @@ jobs:
139139
working-directory: ${{runner.workspace}}/build
140140
shell: bash
141141
run: cmake --build . --config Release --parallel
142-
142+
143143
- name: Display structure of downloaded files
144144
run: |
145-
pwd
145+
pwd
146146
ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
147147
148148
- name: Download runtimes macos-x64
@@ -184,7 +184,7 @@ jobs:
184184

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

189189
- uses: actions/upload-artifact@v4
190190
with:
@@ -198,7 +198,7 @@ jobs:
198198
name: nuget
199199

200200
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
201-
steps:
201+
steps:
202202
- uses: actions/checkout@v4
203203
- uses: actions/setup-dotnet@v4
204204

@@ -208,6 +208,6 @@ jobs:
208208
name: nuget
209209

210210
- name: Dotnet push
211-
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
212212
# env:
213213
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/hipo-macos.yml‎

Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
name: hipo-macos
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
macos_gh:
7+
runs-on: macos-latest
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
config: [Release, Debug]
12+
all_tests: [OFF]
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Checkout GKlib
18+
uses: actions/checkout@v4
19+
with:
20+
repository: KarypisLab/GKlib
21+
ref: master
22+
path: GKlib
23+
24+
- name: Checkout METIS
25+
uses: actions/checkout@v4
26+
with:
27+
repository: KarypisLab/METIS
28+
ref: master
29+
path: METIS
30+
31+
- name: Create installs dir
32+
working-directory: ${{runner.workspace}}
33+
run: |
34+
mkdir installs
35+
ls
36+
37+
- name: Install GKlib
38+
run: |
39+
cd GKlib
40+
make config prefix=${{runner.workspace}}/installs
41+
make
42+
make install
43+
44+
- name: Install METIS
45+
run: |
46+
cd METIS
47+
make config prefix=${{runner.workspace}}/installs
48+
make
49+
make install
50+
51+
- name: Check METIS and GKlib
52+
working-directory: ${{runner.workspace}}
53+
run: |
54+
cd installs
55+
ls
56+
ls lib
57+
58+
- name: Create Build Environment
59+
run: cmake -E make_directory ${{runner.workspace}}/build
60+
61+
- name: Configure CMake
62+
working-directory: ${{runner.workspace}}/build
63+
run: |
64+
cmake $GITHUB_WORKSPACE -DHIPO=ON \
65+
-DCMAKE_BUILD_TYPE=${{ matrix.config }} \
66+
-DALL_TESTS=${{ matrix.all_tests }} \
67+
-DMETIS_ROOT=${{runner.workspace}}/installs \
68+
-DGKLIB_ROOT=${{runner.workspace}}/installs
69+
70+
- name: Build
71+
working-directory: ${{runner.workspace}}/build
72+
run: |
73+
cmake --build . --parallel
74+
75+
- name: Test executable
76+
working-directory: ${{runner.workspace}}/build
77+
run: ./bin/highs --solver=hipo $GITHUB_WORKSPACE/check/instances/afiro.mps
78+
79+
- name: Ctest
80+
working-directory: ${{runner.workspace}}/build
81+
run: |
82+
ctest --parallel --timeout 300 --output-on-failure
83+
84+
macos_510-ts:
85+
runs-on: macos-latest
86+
strategy:
87+
fail-fast: false
88+
matrix:
89+
config: [Release, Debug]
90+
all_tests: [ON, OFF]
91+
92+
steps:
93+
- uses: actions/checkout@v4
94+
95+
- name: Checkout METIS
96+
uses: actions/checkout@v4
97+
with:
98+
repository: galabovaa/METIS
99+
ref: 510-ts
100+
path: METIS
101+
102+
- name: Create installs dir
103+
working-directory: ${{runner.workspace}}
104+
run: |
105+
mkdir installs
106+
ls
107+
108+
- name: Install METIS
109+
run: |
110+
cmake \
111+
-S $GITHUB_WORKSPACE/METIS \
112+
-B build \
113+
-DGKLIB_PATH=${{ github.workspace }}/METIS/GKlib \
114+
-DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/installs \
115+
-DCMAKE_BUILD_TYPE=${{ matrix.config }}
116+
cmake --build build --parallel
117+
cmake --install build
118+
119+
- name: Check METIS and GKlib
120+
working-directory: ${{runner.workspace}}
121+
run: |
122+
cd installs
123+
ls
124+
ls lib
125+
126+
- name: Create Build Environment
127+
run: cmake -E make_directory ${{runner.workspace}}/build
128+
129+
- name: Configure CMake
130+
working-directory: ${{runner.workspace}}/build
131+
run: |
132+
cmake $GITHUB_WORKSPACE -DHIPO=ON \
133+
-DCMAKE_BUILD_TYPE=${{ matrix.config }} \
134+
-DALL_TESTS=${{ matrix.all_tests }} \
135+
-DMETIS_ROOT=${{runner.workspace}}/installs \
136+
137+
# -DGKLIB_ROOT=${{runner.workspace}}/installs
138+
139+
- name: Build
140+
working-directory: ${{runner.workspace}}/build
141+
run: |
142+
cmake --build . --parallel
143+
144+
- name: Test executable
145+
working-directory: ${{runner.workspace}}/build
146+
run: ./bin/highs --solver=hipo $GITHUB_WORKSPACE/check/instances/afiro.mps
147+
148+
- name: Ctest
149+
working-directory: ${{runner.workspace}}/build
150+
run: |
151+
ctest --parallel --timeout 300 --output-on-failure
152+
153+
macos_521-ts:
154+
runs-on: macos-latest
155+
strategy:
156+
fail-fast: false
157+
matrix:
158+
config: [Release, Debug]
159+
all_tests: [ON, OFF]
160+
161+
steps:
162+
- uses: actions/checkout@v4
163+
164+
- name: Checkout METIS
165+
uses: actions/checkout@v4
166+
with:
167+
repository: galabovaa/METIS
168+
ref: 521-ts
169+
path: METIS
170+
171+
- name: Create installs dir
172+
working-directory: ${{runner.workspace}}
173+
run: |
174+
mkdir installs
175+
ls
176+
177+
- name: Install METIS
178+
run: |
179+
cmake \
180+
-S $GITHUB_WORKSPACE/METIS \
181+
-B build \
182+
-DGKLIB_PATH=${{ github.workspace }}/METIS/GKlib \
183+
-DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/installs \
184+
-DCMAKE_BUILD_TYPE=${{ matrix.config }}
185+
cmake --build build --parallel
186+
cmake --install build
187+
188+
- name: Check METIS and GKlib
189+
working-directory: ${{runner.workspace}}
190+
run: |
191+
cd installs
192+
ls
193+
ls lib
194+
195+
- name: Create Build Environment
196+
run: cmake -E make_directory ${{runner.workspace}}/build
197+
198+
- name: Configure CMake
199+
working-directory: ${{runner.workspace}}/build
200+
run: |
201+
cmake $GITHUB_WORKSPACE -DHIPO=ON \
202+
-DCMAKE_BUILD_TYPE=${{ matrix.config }} \
203+
-DALL_TESTS=${{ matrix.all_tests }} \
204+
-DMETIS_ROOT=${{runner.workspace}}/installs \
205+
206+
# -DGKLIB_ROOT=${{runner.workspace}}/installs
207+
208+
- name: Build
209+
working-directory: ${{runner.workspace}}/build
210+
run: |
211+
cmake --build . --parallel
212+
213+
- name: Test executable
214+
working-directory: ${{runner.workspace}}/build
215+
run: ./bin/highs --solver=hipo $GITHUB_WORKSPACE/check/instances/afiro.mps
216+
217+
- name: Ctest
218+
working-directory: ${{runner.workspace}}/build
219+
run: |
220+
ctest --parallel --timeout 300 --output-on-failure

0 commit comments

Comments
 (0)