Fix compilation on Linux

metab0t · Mar 27, 2024 · 95de5e5 · 95de5e5
1 parent 17c2c56
commit 95de5e5
Show file tree

Hide file tree

Showing 9 changed files with 6,249 additions and 41 deletions.
diff --git a/include/pyoptinterface/dylib.hpp b/include/pyoptinterface/dylib.hpp
@@ -34,7 +34,7 @@ class DynamicLibrary
 		    library, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR));
 
 #else
-		handle = dlopen(library.c_str(), RTLD_NOW);
+		handle = dlopen(library, RTLD_NOW);
 #endif
 		return handle != nullptr;
 	}
@@ -49,10 +49,10 @@ class DynamicLibrary
 #if defined(_MSC_VER)
 		FARPROC function_address = GetProcAddress(static_cast<HINSTANCE>(handle), name);
 #else
-		const void *function_address = dlsym(handle, name);
+		void *function_address = dlsym(handle, name);
 #endif
 
-		return static_cast<void *>(function_address);
+		return reinterpret_cast<void *>(function_address);
 	}
 
   private:

diff --git a/include/pyoptinterface/mosek_model.hpp b/include/pyoptinterface/mosek_model.hpp
@@ -2,7 +2,11 @@
 
 #include <memory>
 
-#include "solvers/mosek/mosek.h"
+#ifdef _MSC_VER
+#include "solvers/mosek/mosek_win.h"
+#else
+#include "solvers/mosek/mosek_linux.h"
+#endif
 
 #include "pyoptinterface/core.hpp"
 #include "pyoptinterface/container.hpp"

diff --git a/lib/copt_model.cpp b/lib/copt_model.cpp
@@ -80,15 +80,15 @@ bool load_library(const std::string &path)
 		return false;
 	}
 
-#define B(f)                                                       \
-	{                                                              \
-		auto ptr = static_cast<decltype(f)>(lib.get_symbol(#f));   \
-		if (ptr == nullptr)                                        \
-		{                                                          \
-			fmt::print("function {} is not loaded correctly", #f); \
-			return false;                                          \
-		}                                                          \
-		f = ptr;                                                   \
+#define B(f)                                                          \
+	{                                                                 \
+		auto ptr = reinterpret_cast<decltype(f)>(lib.get_symbol(#f)); \
+		if (ptr == nullptr)                                           \
+		{                                                             \
+			fmt::print("function {} is not loaded correctly", #f);    \
+			return false;                                             \
+		}                                                             \
+		f = ptr;                                                      \
 	}
 	B(COPT_GetRetcodeMsg);
 	B(COPT_CreateProb);

diff --git a/lib/gurobi_model.cpp b/lib/gurobi_model.cpp
@@ -74,15 +74,15 @@ bool load_library(const std::string &path)
 		return false;
 	}
 
-#define B(f)                                                       \
-	{                                                              \
-		auto ptr = static_cast<decltype(f)>(lib.get_symbol(#f));   \
-		if (ptr == nullptr)                                        \
-		{                                                          \
-			fmt::print("function {} is not loaded correctly", #f); \
-			return false;                                          \
-		}                                                          \
-		f = ptr;                                                   \
+#define B(f)                                                          \
+	{                                                                 \
+		auto ptr = reinterpret_cast<decltype(f)>(lib.get_symbol(#f)); \
+		if (ptr == nullptr)                                           \
+		{                                                             \
+			fmt::print("function {} is not loaded correctly", #f);    \
+			return false;                                             \
+		}                                                             \
+		f = ptr;                                                      \
 	}
 	B(GRBnewmodel);
 	B(GRBfreemodel);

diff --git a/lib/highs_model.cpp b/lib/highs_model.cpp
@@ -78,15 +78,15 @@ bool load_library(const std::string &path)
 		return false;
 	}
 
-#define B(f)                                                       \
-	{                                                              \
-		auto ptr = static_cast<decltype(f)>(lib.get_symbol(#f));   \
-		if (ptr == nullptr)                                        \
-		{                                                          \
-			fmt::print("function {} is not loaded correctly", #f); \
-			return false;                                          \
-		}                                                          \
-		f = ptr;                                                   \
+#define B(f)                                                          \
+	{                                                                 \
+		auto ptr = reinterpret_cast<decltype(f)>(lib.get_symbol(#f)); \
+		if (ptr == nullptr)                                           \
+		{                                                             \
+			fmt::print("function {} is not loaded correctly", #f);    \
+			return false;                                             \
+		}                                                             \
+		f = ptr;                                                      \
 	}
 
 	B(Highs_create);

diff --git a/lib/mosek_model.cpp b/lib/mosek_model.cpp
@@ -91,15 +91,15 @@ bool load_library(const std::string &path)
 		return false;
 	}
 
-#define B(f)                                                       \
-	{                                                              \
-		auto ptr = static_cast<decltype(f)>(lib.get_symbol(#f));   \
-		if (ptr == nullptr)                                        \
-		{                                                          \
-			fmt::print("function {} is not loaded correctly", #f); \
-			return false;                                          \
-		}                                                          \
-		f = ptr;                                                   \
+#define B(f)                                                          \
+	{                                                                 \
+		auto ptr = reinterpret_cast<decltype(f)>(lib.get_symbol(#f)); \
+		if (ptr == nullptr)                                           \
+		{                                                             \
+			fmt::print("function {} is not loaded correctly", #f);    \
+			return false;                                             \
+		}                                                             \
+		f = ptr;                                                      \
 	}
 	B(MSK_getcodedesc);
 	B(MSK_makeemptytask);

diff --git a/lib/mosek_model_ext_constants.cpp b/lib/mosek_model_ext_constants.cpp
@@ -1,5 +1,9 @@
 #include <nanobind/nanobind.h>
-#include "solvers/mosek/mosek.h"
+#ifdef _MSC_VER
+#include "solvers/mosek/mosek_win.h"
+#else
+#include "solvers/mosek/mosek_linux.h"
+#endif
 
 namespace nb = nanobind;