Skip to content

Commit c032f3c

Browse files
jajhalljajhall
committed
Merge branch 'hpm-mip-ok-l' of https://github.com/ERGO-Code/HiGHS into hpm-mip-ok-l
2 parents 35de7a5 + 3cb385d commit c032f3c

File tree

5 files changed

+60
-55
lines changed

5 files changed

+60
-55
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: build-intel
22

33
on: [push, pull_request]
4-
on: []
4+
# on: []
55

66
jobs:
77
build:

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

Lines changed: 55 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ jobs:
2525
vcpkg-${{ runner.os }}-
2626
2727
- name: Install GKlib
28-
run: vcpkg install metis
28+
run: vcpkg install gklib
29+
30+
- name: ls
31+
run: ls C:/vcpkg/packages/gklib_x64-windows/share/gklib
2932

3033
- name: Install METIS
3134
run: vcpkg install metis
@@ -44,7 +47,6 @@ jobs:
4447
- name: Configure cmake
4548
shell: bash
4649
working-directory: ${{runner.workspace}}/build
47-
# Here is _DIR because with vcpkg CMake find_package works.
4850
run: |
4951
cmake $GITHUB_WORKSPACE \
5052
-DHIPO=ON \
@@ -67,54 +69,54 @@ jobs:
6769
run: |
6870
ctest --parallel --timeout 300 --output-on-failure -C Release
6971
70-
debug:
71-
runs-on: ${{ matrix.os }}
72-
strategy:
73-
fail-fast: false
74-
matrix:
75-
os: [windows-latest]
76-
77-
steps:
78-
- uses: actions/checkout@v4
79-
80-
- name: Install METIS
81-
run: vcpkg install metis
82-
83-
# run: ls C:/vcpkg/packages/metis_x64-windows/
84-
# run: ls C:/vcpkg/packages/metis_x64-windows/lib
85-
# run: ls C:/vcpkg/packages/metis_x64-windows/share
86-
# run: ls C:/vcpkg/packages/gklib_x64-windows/share/gklib
87-
88-
- name: Install OpenBLAS
89-
run: vcpkg install openblas
90-
91-
- name: Create build dir
92-
run: cmake -E make_directory ${{runner.workspace}}/build
93-
94-
- name: Configure cmake
95-
shell: bash
96-
working-directory: ${{runner.workspace}}/build
97-
# Here is _DIR because with vcpkg CMake find_package works.
98-
run: |
99-
cmake $GITHUB_WORKSPACE \
100-
-DHIPO=ON \
101-
-Dmetis_DIR=C:/vcpkg/packages/metis_x64-windows/share/metis \
102-
-DGKlib_DIR=C:/vcpkg/packages/gklib_x64-windows/share/gklib \
103-
-DOpenBLAS_DIR=C:/vcpkg/packages/openblas_x64-windows/share/openblas
104-
105-
- name: Build
106-
shell: bash
107-
working-directory: ${{runner.workspace}}/build
108-
run: |
109-
cmake --build . --parallel --config Debug
110-
111-
- name: Test executable
112-
shell: bash
113-
working-directory: ${{runner.workspace}}/build
114-
run: ./Debug/bin/highs --solver=hipo $GITHUB_WORKSPACE/check/instances/afiro.mps
115-
116-
- name: Ctest
117-
shell: bash
118-
working-directory: ${{runner.workspace}}/build
119-
run: |
120-
ctest --parallel --timeout 300 --output-on-failure -C Debug
72+
# debug:
73+
# runs-on: ${{ matrix.os }}
74+
# strategy:
75+
# fail-fast: false
76+
# matrix:
77+
# os: [windows-latest]
78+
79+
# steps:
80+
# - uses: actions/checkout@v4
81+
82+
# - name: Install METIS
83+
# run: vcpkg install metis
84+
85+
# # run: ls C:/vcpkg/packages/metis_x64-windows/
86+
# # run: ls C:/vcpkg/packages/metis_x64-windows/lib
87+
# # run: ls C:/vcpkg/packages/metis_x64-windows/share
88+
# # run: ls C:/vcpkg/packages/gklib_x64-windows/share/gklib
89+
90+
# - name: Install OpenBLAS
91+
# run: vcpkg install openblas
92+
93+
# - name: Create build dir
94+
# run: cmake -E make_directory ${{runner.workspace}}/build
95+
96+
# - name: Configure cmake
97+
# shell: bash
98+
# working-directory: ${{runner.workspace}}/build
99+
# # Here is _DIR because with vcpkg CMake find_package works.
100+
# run: |
101+
# cmake $GITHUB_WORKSPACE \
102+
# -DHIPO=ON \
103+
# -Dmetis_DIR=C:/vcpkg/packages/metis_x64-windows/share/metis \
104+
# -DGKlib_DIR=C:/vcpkg/packages/gklib_x64-windows/share/gklib \
105+
# -DOpenBLAS_DIR=C:/vcpkg/packages/openblas_x64-windows/share/openblas
106+
107+
# - name: Build
108+
# shell: bash
109+
# working-directory: ${{runner.workspace}}/build
110+
# run: |
111+
# cmake --build . --parallel --config Debug
112+
113+
# - name: Test executable
114+
# shell: bash
115+
# working-directory: ${{runner.workspace}}/build
116+
# run: ./Debug/bin/highs --solver=hipo $GITHUB_WORKSPACE/check/instances/afiro.mps
117+
118+
# - name: Ctest
119+
# shell: bash
120+
# working-directory: ${{runner.workspace}}/build
121+
# run: |
122+
# ctest --parallel --timeout 300 --output-on-failure -C Debug

‎check/TestSpecialLps.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void issue425(Highs& highs) {
215215
false;
216216
#endif
217217
if (use_hipo) {
218-
solve(highs, "off", "ipm", require_model_status, 0, 15);
218+
solve(highs, "off", "ipm", require_model_status, 0, -15);
219219
} else {
220220
solve(highs, "off", "ipx", require_model_status, 0, 4);
221221
}

‎cmake/FindHipoDeps.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ if (WIN32)
1010
find_package(metis CONFIG REQUIRED)
1111
message(STATUS "metis CMake config path: ${metis_DIR}")
1212

13+
find_package(gklib CONFIG REQUIRED)
14+
message(STATUS "gklib CMake config path: ${gklib_DIR}")
1315
elseif(NOT APPLE)
1416
# LINUX
1517
find_library(OPENBLAS_LIB

‎highs/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ else()
192192
elseif(WIN32)
193193
target_link_libraries(highs OpenBLAS::OpenBLAS)
194194
target_link_libraries(highs metis)
195+
target_link_libraries(highs gklib)
195196
else()
196197
# LINUX
197198
if(BLAS_LIB)

0 commit comments

Comments
 (0)