Merge pull request ERGO-Code#2257 from ERGO-Code/intel-llvm-linux

Updates for intel llvm compiler on linux

Author: galabovaa

CMakeLists.txt

@@ -54,6 +54,19 @@ else()
   set(GITHASH "n/a")
 endif()
 
+# message("CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+  message(STATUS "Compiler is IntelLLVM")
+  if (CMAKE_HOST_WIN32 AND CMAKE_VERSION VERSION_LESS "3.23.0") 
+      message(FATAL_ERROR "Need at least CMake 3.23 for IntelLLVM support of IntelDPCPP package on Windows")
+  elseif(CMAKE_VERSION VERSION_LESS "3.23.0")
+      message(FATAL_ERROR "CMake 3.20.5 is the minimum recommended for IntelLLVM on Linux")
+  endif()
+
+  find_package(IntelSYCL REQUIRED)
+endif()
+
+
 message(STATUS "Git hash: " ${GITHASH})
 # By default only build the C++ library.
 option(BUILD_CXX "Build C++ library" ON)

check/CMakeLists.txt

@@ -261,7 +261,7 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
   #   "--parallel=on"
       )
 
-  if (UNIX AND NOT APPLE)
+  if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
     if (CUPDLP_CPU AND NOT CUPDLP_FORCE_NATIVE)
         set(pdlpInstances
             "25fv47\; 5.50184588\;"
@@ -316,7 +316,7 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
             endif()
         endif()
     endif()
-  elseif(WIN32)
+  elseif(WIN32 AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
     if (CUPDLP_CPU AND NOT CUPDLP_FORCE_NATIVE)
         # on windows e226 model status is unknown
         # on windows 25fv47 model status can be unknown, with objective 5.5018458957e+03
@@ -411,7 +411,7 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
                   "Model status        : ${solutionstatus}")
 
           if(${solutionstatus} STREQUAL "Optimal")
-              if(${setting} STREQUAL "--presolve=off")
+              if(${setting} STREQUAL "--presolve=off" AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM"))
                   set_tests_properties (${name}${setting} PROPERTIES
                           PASS_REGULAR_EXPRESSION
                           "Simplex   iterations: ${iter}\nObjective value     : ${optval}")

check/TestPresolve.cpp

@@ -202,7 +202,7 @@ void presolveSolvePostsolve(const std::string& model_file,
     REQUIRE(model_status == HighsModelStatus::kUnknown);
     const double dl_objective_value =
         std::fabs(highs0.getInfo().objective_function_value - objective_value);
-    REQUIRE(dl_objective_value < 1e-12);
+    REQUIRE(dl_objective_value < 1e-9);
     REQUIRE(highs0.getInfo().primal_solution_status == kSolutionStatusFeasible);
     double mip_feasibility_tolerance;
     highs0.getOptionValue("mip_feasibility_tolerance",

check/TestQpSolver.cpp

@@ -870,7 +870,7 @@ TEST_CASE("test-qp-delete-col", "[qpsolver]") {
   hessianProduct(incumbent_model.hessian_, arg1, result1);
 
   for (HighsInt iCol = 0; iCol < dim; iCol++) {
-    REQUIRE(result0[iCol] == result1[iCol]);
+    REQUIRE(fabs(result0[iCol] - result1[iCol]) < 1e-8);
   }
 }
 

src/CMakeLists.txt

@@ -296,6 +296,9 @@ else()
     target_compile_options(highs PRIVATE "-Wno-unused-variable")
     target_compile_options(highs PRIVATE "-Wno-unused-const-variable")
   endif()
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    target_compile_options(highs PUBLIC "-Wno-invalid-offsetof")
+  endif()
 
   # Configure the config file for the build tree:
   # Either list all the src/* directories here, or put explicit paths in all the