windows

Author: galabovaa

.github/workflows/hipo-win.yml

@@ -34,9 +34,7 @@ jobs:
         run: |
           cmake $GITHUB_WORKSPACE \
           -DHIPO=ON \
-          -Dmetis_DIR=C:/vcpkg/packages/metis_x64-windows/share/metis \
-          -DGKlib_DIR=C:/vcpkg/packages/gklib_x64-windows/share/gklib \
-          -DOpenBLAS_DIR=C:/vcpkg/packages/openblas_x64-windows/share/openblas
+          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
 
       - name: Build 
         working-directory: ${{runner.workspace}}/build

cmake/FindHipoDeps.cmake

@@ -2,7 +2,13 @@
 option(BLAS_ROOT "Root directory of BLAS or OpenBLAS" "")
 message(STATUS "BLAS_ROOT is " ${BLAS_ROOT})
 
-if(NOT APPLE)
+if (WIN32)
+
+    find_package(OpenBLAS CONFIG REQUIRED)
+    find_package(metis CONFIG REQUIRED)
+
+elseif(NOT APPLE)
+    # LINUX
     find_library(OPENBLAS_LIB 
         NAMES openblas 
         HINTS "${BLAS_ROOT}/lib")
@@ -21,38 +27,42 @@ if(NOT APPLE)
         message("Found BLAS library at ${BLAS_LIB}")
     endif(OPENBLAS_LIB)
 
-endif(NOT APPLE)
+endif()
+
+if (NOT WIN32)
+    # Find_package works if deps are installed with vcpkg.
 
-# METIS
-option(METIS_ROOT "Root directory of METIS" "")
-message(STATUS "METIS_ROOT is " ${METIS_ROOT})
+    # METIS
+    option(METIS_ROOT "Root directory of METIS" "")
+    message(STATUS "METIS_ROOT is " ${METIS_ROOT})
 
-find_path(METIS_PATH 
-    NAMES "metis.h" 
-    REQUIRED
-    HINTS "${METIS_ROOT}/include")
+    find_path(METIS_PATH 
+        NAMES "metis.h" 
+        REQUIRED
+        HINTS "${METIS_ROOT}/include")
 
-message("Found Metis header at ${METIS_PATH}")
+    message("Found Metis header at ${METIS_PATH}")
 
-find_library(METIS_LIB 
-    NAMES metis 
-    REQUIRED
-    HINTS "${METIS_ROOT}/lib")
-message("Found Metis library at ${METIS_LIB}")
+    find_library(METIS_LIB 
+        NAMES metis 
+        REQUIRED
+        HINTS "${METIS_ROOT}/lib")
+    message("Found Metis library at ${METIS_LIB}")
 
-# GKlib
-option(GKLIB_ROOT "Root directory of GKlib" "")
-message(STATUS "GKLIB_ROOT is " ${GKLIB_ROOT})
+    # GKlib
+    option(GKLIB_ROOT "Root directory of GKlib" "")
+    message(STATUS "GKLIB_ROOT is " ${GKLIB_ROOT})
 
-find_path(GKLIB_PATH 
-    NAMES "GKlib.h" REQUIRED
-    HINTS "${GKLIB_ROOT}/include")
+    find_path(GKLIB_PATH 
+        NAMES "GKlib.h" REQUIRED
+        HINTS "${GKLIB_ROOT}/include")
 
-message("Found GKlib header at ${GKLIB_PATH}")
+    message("Found GKlib header at ${GKLIB_PATH}")
 
-find_library(GKLIB_LIB 
-    NAMES GKlib
-    REQUIRED
-    HINTS "${GKLIB_ROOT}/lib")
+    find_library(GKLIB_LIB 
+        NAMES GKlib
+        REQUIRED
+        HINTS "${GKLIB_ROOT}/lib")
 
-message("Found GKlib library at ${GKLIB_LIB}")
+    message("Found GKlib library at ${GKLIB_LIB}")
+endif()

highs/CMakeLists.txt

@@ -189,7 +189,11 @@ else()
     if(APPLE)
         target_link_libraries(highs "-framework Accelerate")
         target_compile_definitions(highs PRIVATE HIPO_USES_APPLE_BLAS)
-    else(APPLE)
+    elseif(WIN32)
+        target_link_libraries(highs OpenBLAS::OpenBLAS)
+        target_link_libraries(highs metis)
+    else() 
+        # LINUX
         if(BLAS_LIB)
             target_link_libraries(highs "${BLAS_LIB}")
         elseif(OPENBLAS_LIB)
@@ -200,13 +204,17 @@ else()
         endif(BLAS_LIB)
     endif(APPLE)
 
-    # Metis
-    target_include_directories(highs PRIVATE "${METIS_PATH}")
-    target_link_libraries(highs "${METIS_LIB}")
+    if (NOT WIN32)
+      # Find_package works if deps are installed with vcpkg.
 
-    # GKlib
-    target_include_directories(highs PRIVATE "${GKLIB_PATH}")
-    target_link_libraries(highs "${GKLIB_LIB}")
+      # Metis
+      target_include_directories(highs PRIVATE "${METIS_PATH}")
+      target_link_libraries(highs "${METIS_LIB}")
+
+      # GKlib
+      target_include_directories(highs PRIVATE "${GKLIB_PATH}")
+      target_link_libraries(highs "${GKLIB_LIB}")
+    endif()
 
   endif()
 

highs/ipm/hipo/factorhighs/Analyse.cpp

@@ -8,7 +8,7 @@
 
 #include "DataCollector.h"
 #include "FactorHiGHSSettings.h"
-#include "GKlib.h"
+// #include "GKlib.h"
 #include "ReturnValues.h"
 #include "ipm/hipo/auxiliary/Auxiliary.h"
 #include "ipm/hipo/auxiliary/Log.h"