Skip to content

Commit 3cd0b60

Browse files
committed
change tests to use patched up version
1 parent ca70a5a commit 3cd0b60

3 files changed

Lines changed: 57 additions & 79 deletions

File tree

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

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,27 @@ jobs:
2121
ref: ${{matrix.branch}}
2222
path: HiGHS
2323

24-
- name: Checkout GKlib
25-
uses: actions/checkout@v4
26-
with:
27-
repository: KarypisLab/GKlib
28-
ref: master
29-
path: GKlib
30-
3124
- name: Checkout METIS
32-
uses: actions/checkout@v4
25+
uses: actions/checkout@v3
3326
with:
34-
repository: KarypisLab/METIS
35-
ref: master
27+
repository: galabovaa/METIS
28+
ref: 509-w
3629
path: METIS
37-
30+
3831
- name: Create installs dir
3932
working-directory: ${{runner.workspace}}
4033
run: |
4134
mkdir installs
42-
ls
43-
44-
- name: Install GKLIB
45-
run: |
46-
cd GKlib
47-
make config prefix=${{runner.workspace}}/installs
48-
make
49-
make install
5035
5136
- name: Install METIS
5237
run: |
5338
cd METIS
54-
make config prefix=${{runner.workspace}}/installs
55-
make
56-
make install
57-
58-
- name: Check METIS and GKlib
59-
working-directory: ${{runner.workspace}}
60-
run: |
61-
cd installs
62-
ls
63-
ls lib
39+
pwd
40+
cmake -S. -B build \
41+
-DGKLIB_PATH=${{ github.workspace }}/METIS/GKlib \
42+
-DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/installs
43+
cmake --build build --parallel --config Release
44+
cmake --install build
6445
6546
- name: Create Build Environment
6647
run: cmake -E make_directory ${{runner.workspace}}/build

.github/workflows/hipo-ubuntu-gh.yml

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,27 @@ jobs:
2222
ref: ${{matrix.branch}}
2323
path: HiGHS
2424

25-
- name: Checkout GKlib
26-
uses: actions/checkout@v4
27-
with:
28-
repository: KarypisLab/GKlib
29-
ref: master
30-
path: GKlib
31-
3225
- name: Checkout METIS
33-
uses: actions/checkout@v4
26+
uses: actions/checkout@v3
3427
with:
35-
repository: KarypisLab/METIS
36-
ref: master
28+
repository: galabovaa/METIS
29+
ref: 509-w
3730
path: METIS
3831

3932
- name: Create installs dir
4033
working-directory: ${{runner.workspace}}
4134
run: |
4235
mkdir installs
43-
ls
44-
45-
- name: Install GKLIB
46-
run: |
47-
cd GKlib
48-
make config shared=1 prefix=${{runner.workspace}}/installs
49-
make
50-
make install
51-
52-
# - name: Check installs
53-
# working-directory: ${{runner.workspace}}
54-
# run: |
55-
# cd installs
56-
# ls
57-
# ls lib
58-
59-
- name: Copy GKlib shared (bug)
60-
working-directory: ${{runner.workspace}}
61-
run: |
62-
cd installs
63-
cd lib
64-
ln libGKlib.so.0 libGKlib.so
65-
ls
6636
6737
- name: Install METIS
6838
run: |
6939
cd METIS
70-
make config shared=1 prefix=${{runner.workspace}}/installs
71-
make
72-
make install
40+
pwd
41+
cmake -S. -B build \
42+
-DGKLIB_PATH=${{ github.workspace }}/METIS/GKlib \
43+
-DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/installs
44+
cmake --build build --parallel --config Release
45+
cmake --install build
7346
7447
# no default blas available on runner
7548

@@ -97,7 +70,7 @@ jobs:
9770
-B ${{runner.workspace}}/build \
9871
-DHIPO=ON \
9972
-DMETIS_ROOT=${{runner.workspace}}/installs \
100-
-DGKLIB_ROOT=${{runner.workspace}}/installs
73+
-DGKLIB_ROOT=${{runner.workspace}}/installs
10174
10275
- name: Build
10376
working-directory: ${{runner.workspace}}/build

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

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os: [windows-latest]
13-
branch: [hipo-dev-tt-gk]
13+
branch: [hipo-tt-dev-gk]
1414

1515
steps:
1616
- uses: actions/checkout@v4
@@ -22,25 +22,33 @@ jobs:
2222
ref: ${{matrix.branch}}
2323
path: HiGHS
2424

25-
# todo: add overlay
25+
- name: Checkout METIS
26+
uses: actions/checkout@v4
27+
with:
28+
repository: galabovaa/METIS
29+
ref: 510-w
30+
path: METIS
31+
2632
- name: Install METIS
27-
shell: pwsh
33+
shell: bash
2834
run: |
29-
vcpkg install metis gklib `
30-
--overlay-ports="$env:GITHUB_WORKSPACE/ports/metis" `
31-
--overlay-ports="$env:GITHUB_WORKSPACE/ports/gklib"
32-
33-
# run: ls C:/vcpkg/packages/metis_x64-windows/
34-
# run: ls C:/vcpkg/packages/metis_x64-windows/lib
35-
# run: ls C:/vcpkg/packages/metis_x64-windows/share
36-
# run: ls C:/vcpkg/packages/gklib_x64-windows/share/gklib
35+
INSTALLS_PREFIX=$(cygpath "${{ runner.workspace }}")/installs
36+
cd METIS
37+
pwd
38+
cmake -S. -B build -DGKLIB_PATH=$GITHUB_WORKSPACE/METIS/GKlib -DCMAKE_INSTALL_PREFIX=$INSTALLS_PREFIX
39+
cmake --build build --parallel --config Release
40+
cmake --install build --config Release
3741
3842
- name: Install OpenBLAS
3943
shell: pwsh
4044
run: vcpkg install openblas[threads]
4145

42-
- name: Create build dir
43-
run: cmake -E make_directory ${{runner.workspace}}/build
46+
- name: Create build and install dir
47+
working-directory: ${{runner.workspace}}
48+
shell: pwsh
49+
run: |
50+
mkdir build
51+
mkdir installs
4452
4553
- name: Configure cmake
4654
shell: pwsh
@@ -51,6 +59,22 @@ jobs:
5159
-DHIPO=ON `
5260
-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
5361
62+
- name: Create installs dir
63+
run: |
64+
ls
65+
mkdir installs
66+
ls
67+
68+
- name: Configure cmake
69+
shell: bash
70+
working-directory: ${{runner.workspace}}/build
71+
run: |
72+
METIS_ROOT=$(cygpath "${{ runner.workspace }}")/installs
73+
cmake $GITHUB_WORKSPACE \
74+
-DHIPO=ON \
75+
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \
76+
-DMETIS_ROOT=$METIS_ROOT
77+
5478
# -DCMAKE_CXX_FLAGS="-I C:/vcpkg/packages/gklib_x64-windows/include/GKlib"
5579
5680
- name: Build

0 commit comments

Comments
 (0)