merge origin

Author: galabovaa

.github/workflows/hipo-fetch.yml

@@ -4,10 +4,10 @@ on: [push, pull_request]
 
 jobs:
   ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest, ubuntu-24.04-arm]
+
     strategy:
       matrix:
-        # config: [Release, Debug]
         config: [Release]
         all_tests: [ON]
 
@@ -41,7 +41,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # config: [Release, Debug]
         config: [Release]
         all_tests: [ON]
 
@@ -54,7 +53,8 @@ jobs:
       - name: Install 32-bit deps
         run: |
           sudo apt-get update
-          sudo apt-get install -y gcc-multilib g++-multilib libc6-dev-i386
+          sudo apt-get install -y gcc-multilib g++-multilib
+          sudo apt-get install -y libc6-dev-i386 libstdc++-devel.i686
 
       - name: Configure CMake
         working-directory: ${{runner.workspace}}/build
@@ -83,7 +83,6 @@ jobs:
     runs-on: ubuntu-24.04-arm
     strategy:
       matrix:
-        # config: [Release, Debug]
         config: [Release]
         all_tests: [ON]
 
@@ -121,7 +120,8 @@ jobs:
           ctest --parallel --timeout 300 --output-on-failure
 
   windows:
-    runs-on: [windows-latest, windows-11-arm]
+    runs-on: [windows-latest]
+    fail-fast: false
     strategy:
       matrix:
         config: [Release]
@@ -137,7 +137,50 @@ jobs:
           cmake `
           -S "$env:GITHUB_WORKSPACE" `
           -B "${{ runner.workspace }}/build" `
-          -A ${{ matrix.arch }}
+          -A ${{ matrix.arch }} `
+          -DHIPO=ON `
+          -DALL_TESTS=${{ matrix.all_tests }} `
+          -DBUILD_OPENBLAS=ON
+
+      - name: Build
+        shell: pwsh
+        working-directory: ${{runner.workspace}}/build
+        run: |
+          cmake --build . --parallel --config ${{ matrix.config }}
+
+      - name: Test executable
+        shell: pwsh
+        working-directory: ${{runner.workspace}}/build
+        run: |
+          & ".\${{ matrix.config }}\bin\highs.exe" --solver=hipo `
+          "$env:GITHUB_WORKSPACE/check/instances/afiro.mps"
+
+      - name: Ctest
+        shell: pwsh
+        working-directory: ${{runner.workspace}}/build
+        run: |
+          ctest --parallel --timeout 300 --output-on-failure -C ${{ matrix.config }}
+
+  windows_arm_64:
+    runs-on: [windows-11-arm]
+    strategy:
+      matrix:
+        config: [Release]
+        all_tests: [ON]
+        # ARM32 Windows development is basically deprecated:
+        # https://learn.microsoft.com/en-us/windows/arm/arm32-to-arm64
+        arch: ["x64"]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Configure CMake
+        shell: pwsh
+        run: |
+          cmake `
+          -S "$env:GITHUB_WORKSPACE" `
+          -B "${{ runner.workspace }}/build" `
+          -A ${{ matrix.arch }} `
           -DHIPO=ON `
           -DALL_TESTS=${{ matrix.all_tests }} `
           -DBUILD_OPENBLAS=ON

.github/workflows/release-cpack.yml

@@ -62,9 +62,6 @@ jobs:
           cd build
           cpack -C Release
 
-        # -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL
-        # Win32
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

check/CMakeLists.txt

@@ -48,7 +48,6 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
       TestHighsRbTree.cpp
       TestHighsSparseMatrix.cpp
       TestHighsVersion.cpp
-      TestHipo.cpp
       TestHSet.cpp
       TestICrash.cpp
       TestIis.cpp
@@ -82,6 +81,11 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
       TestUserScale.cpp
       Avgas.cpp)
 
+
+  if (HIPO)
+      list(APPEND TEST_SOURCES TestHipo.cpp)
+  endif()
+
   set(OPT_LEVEL_CHANGED OFF)
 
   if(CMAKE_CXX_FLAGS_RELEASE MATCHES "-O[0-9s]" AND NOT CMAKE_CXX_FLAGS_RELEASE MATCHES "-O3")

cmake/FindHipoDeps.cmake

@@ -19,8 +19,13 @@ if (BUILD_OPENBLAS)
     )
 
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|armv8|arm")
-        message(STATUS "ARM architecture detected. Applying -DTARGET=ARMV8.")
-        list(APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV8)
+        if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+            message(STATUS "ARM architecture detected. Applying -DTARGET=ARMV7.")
+            list(APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV7)
+        else()
+            message(STATUS "ARM architecture detected. Applying -DTARGET=ARMV8.")
+            list(APPEND OPENBLAS_MINIMAL_FLAGS -DTARGET=ARMV8)
+        endif()
     endif()
 
     # CMAKE_SIZEOF_VOID_P is 4 for 32-bit builds, 8 for 64-bit builds.
@@ -36,7 +41,10 @@ if (BUILD_OPENBLAS)
             set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
         endif()
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> hipo-cpack
         # list(APPEND OPENBLAS_MINIMAL_FLAGS -DUSE_THREAD=OFF)
         list(APPEND OPENBLAS_MINIMAL_FLAGS -DINTERFACE64=0)
 

highs/lp_data/HighsSolve.cpp

@@ -718,11 +718,18 @@ bool useHipo(const HighsOptions& options,
     use_hipo = false;
   } else if (specific_solver_option_value == kIpmString ||
              specific_solver_option_value == kHipoString || force_ipm) {
+
 #ifdef HIPO
     use_hipo = true;
 #else
+    if (specific_solver_option_value == kHipoString) {
+    highsLogUser(options.log_options, HighsLogType::kError,
+                  "HiPO is not available in this build.\n");
+    return HighsStatus::kError;
+
     use_hipo = false;
 #endif
+
   }
   if (options.run_centring) use_hipo = false;
   // Later decide between HiPO and IPX based on LP properties