Skip to content

Commit 937cbdb

Browse files
committed
try 32 again
1 parent 8fad943 commit 937cbdb

File tree

2 files changed

+48
-3
lines changed

2 files changed

+48
-3
lines changed

.github/workflows/hipo-fetch.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,47 @@ jobs:
201201
run: |
202202
ctest --parallel --timeout 300 --output-on-failure -C ${{ matrix.config }}
203203
204+
windows_arm_32:
205+
runs-on: [windows-11-arm]
206+
strategy:
207+
matrix:
208+
config: [Release]
209+
all_tests: [ON]
210+
arch: ["arm"]
211+
212+
steps:
213+
- uses: actions/checkout@v4
214+
215+
- name: Configure CMake
216+
shell: pwsh
217+
run: |
218+
cmake `
219+
-S "$env:GITHUB_WORKSPACE" `
220+
-B "${{ runner.workspace }}/build" `
221+
-A ${{ matrix.arch }}
222+
-DHIPO=ON `
223+
-DALL_TESTS=${{ matrix.all_tests }} `
224+
-DBUILD_OPENBLAS=ON
225+
226+
- name: Build
227+
shell: pwsh
228+
working-directory: ${{runner.workspace}}/build
229+
run: |
230+
cmake --build . --parallel --config ${{ matrix.config }}
231+
232+
- name: Test executable
233+
shell: pwsh
234+
working-directory: ${{runner.workspace}}/build
235+
run: |
236+
& ".\${{ matrix.config }}\bin\highs.exe" --solver=hipo `
237+
"$env:GITHUB_WORKSPACE/check/instances/afiro.mps"
238+
239+
- name: Ctest
240+
shell: pwsh
241+
working-directory: ${{runner.workspace}}/build
242+
run: |
243+
ctest --parallel --timeout 300 --output-on-failure -C ${{ matrix.config }}
244+
204245
# linux shared is default, static build tested in the release artifacts
205246
# windows static is default so test shared
206247
windows_shared:

cmake/FindHipoDeps.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ if (BUILD_OPENBLAS)
1919
)
2020

2121
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|armv8|arm")
22-
message(STATUS "ARM architecture detected. Applying -DTARGET=ARMV8.")
23-
list(APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV8)
22+
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
23+
message(STATUS "ARM architecture detected. Applying -DTARGET=ARMV7.")
24+
list(APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV7)
25+
else()
26+
message(STATUS "ARM architecture detected. Applying -DTARGET=ARMV8.")
27+
list(APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV8)
28+
endif()
2429
endif()
2530

2631
# CMAKE_SIZEOF_VOID_P is 4 for 32-bit builds, 8 for 64-bit builds.
@@ -36,7 +41,6 @@ if (BUILD_OPENBLAS)
3641
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
3742
endif()
3843

39-
4044
# list(APPEND OPENBLAS_MINIMAL_FLAGS -DUSE_THREAD=OFF)
4145
list(APPEND OPENBLAS_MINIMAL_FLAGS -DINTERFACE64=0)
4246

0 commit comments

Comments
 (0)