macos and stray m on win GPU

Author: galabovaa

CMakeLists.txt

@@ -127,20 +127,25 @@ message(STATUS "Build pdlp with GPU: ${CUPDLP_GPU}")
 # endif()
 
 if (CUPDLP_GPU)
+  if (WIN32)
+    set(BUILD_SHARED_LIBS ON)
+  endif()
+
   set (CUPDLP_CPU OFF)
-    # With FindCUDAConf.cmake
-    # default cuda_home on linux
-    # set(CUDA_HOME "/usr/local/cuda" CACHE STRING "Cuda path to install")
-    # message(NOTICE "Set build cuPDLP with CUDA")
-    # list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-    # include(FindCUDAConf.cmake)
-
-    # With deleted FindCUDAConf.cmake
-    find_package(CUDAToolkit REQUIRED)
-    set(CUDA_LIBRARY-NOTFOUND, OFF)
-    set(CUDA_LIBRARY CUDA::cudart CUDA::cublas CUDA::cusparse)
-
-    message(NOTICE "Set build cuPDLP with CUDA")
+
+  # With FindCUDAConf.cmake
+  # default cuda_home on linux
+  # set(CUDA_HOME "/usr/local/cuda" CACHE STRING "Cuda path to install")
+  # message(NOTICE "Set build cuPDLP with CUDA")
+  # list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+  # include(FindCUDAConf.cmake)
+
+  # With deleted FindCUDAConf.cmake
+  find_package(CUDAToolkit REQUIRED)
+  set(CUDA_LIBRARY-NOTFOUND, OFF)
+  set(CUDA_LIBRARY CUDA::cudart CUDA::cublas CUDA::cusparse)
+
+  message(NOTICE "Set build cuPDLP with CUDA")
 else()
   set (CUPDLP_CPU ON)
     set(CUDA_LIBRARY-NOTFOUND true)
@@ -229,8 +234,9 @@ if (BUILD_CXX)
     CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR  
     CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11") 
+  # elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") 
+  # not recognised by cl
+  #   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11") 
   endif()  
 
   # Basic type

check/CMakeLists.txt

@@ -113,7 +113,11 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
     target_link_libraries(unit_tests highs Catch)
 
     if (CUPDLP_GPU)
-        target_link_libraries(unit_tests cudalin ${CUDA_LIBRARY} m)
+        if (WIN32)
+            target_link_libraries(unit_tests cudalin ${CUDA_LIBRARY})
+        else()
+            target_link_libraries(unit_tests cudalin ${CUDA_LIBRARY} m)
+        endif()
         target_include_directories(unit_tests PRIVATE ${HIGHS_SOURCE_DIR}/src/pdlp/cupdlp/cuda)
         set_target_properties(unit_tests PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
     endif()
@@ -291,24 +295,25 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
                 "standata\; 1.25769951\;"
                 "standgub\; 1.2576993\;"
                 )
-        endif()
+        else()
         # CUPDLP_GPU or CPU with native termination.
-        if (CUPDLP_FORCE_NATIVE)
-            set(pdlpInstances
-                "25fv47\; 5.5018360\;"
-                "adlittle\; 2.254953\;"
-                "afiro\;-4.64753126\;"
-                "avgas\;-7.75000038\;"
-                "blending\;-3.19999999\;"
-                "chip\;-9.000000020\;"
-                "e226\;-1.163892070\;"
-                "scrs8\; 9.042970154\;"
-                "sctest\; 5.750000001\;"
-                "shell\; 1.2088253471\;"
-                "stair\;-2.512669020\;"
-                "standata\; 1.257699155\;"
-                "standgub\; 1.257700132\;"
-                )
+            if (CUPDLP_FORCE_NATIVE)
+                set(pdlpInstances
+                    "25fv47\; 5.5018360\;"
+                    "adlittle\; 2.254953\;"
+                    "afiro\;-4.64753126\;"
+                    "avgas\;-7.75000038\;"
+                    "blending\;-3.19999999\;"
+                    "chip\;-9.000000020\;"
+                    "e226\;-1.163892070\;"
+                    "scrs8\; 9.042970154\;"
+                    "sctest\; 5.750000001\;"
+                    "shell\; 1.2088253471\;"
+                    "stair\;-2.512669020\;"
+                    "standata\; 1.257699155\;"
+                    "standgub\; 1.257700132\;"
+                    )
+            endif()
         endif()
     endif()
   elseif(WIN32)
@@ -335,9 +340,9 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
         "afiro\;-4.64753142\;"
         "avgas\;-7.749999999\;"
         "blending\;-3.19999999\;"
-        "chip\;-8.9999988715\;"
+        "chip\;-8.99999999\;"
         "e226\;-1.163892\;"
-        "scrs8\; 9.04296953\;"
+        "scrs8\; 9.04296954\;"
         "sctest\; 5.749999936\;"
         "shell\; 1.2088253460\;"
         "stair\;-2.5126695\;"