Go back to dlclose

Author: filikat

extern/HighsExtrasApi.cpp

@@ -72,11 +72,11 @@ HIGHS_EXTRAS_API bool HighsExtras_getApi(HighsExtrasApi* api) {
                         std::make_tuple(&Highs_amd_defaults, &Highs_amd_order));
 
   bind_api<blas_methods>(
-      api, std::make_tuple(
-               &cblas_daxpy, &cblas_dcopy, &cblas_dscal, &cblas_dswap,
-               &cblas_dgemv, &cblas_dtpsv, &cblas_dtrsv, &cblas_dger,
-               &cblas_dgemm, &cblas_dsyrk, &cblas_dtrsm,
-               &highs_openblas_set_num_threads));
+      api,
+      std::make_tuple(&cblas_daxpy, &cblas_dcopy, &cblas_dscal, &cblas_dswap,
+                      &cblas_dgemv, &cblas_dtpsv, &cblas_dtrsv, &cblas_dger,
+                      &cblas_dgemm, &cblas_dsyrk, &cblas_dtrsm,
+                      &highs_openblas_set_num_threads));
 
   bind_api<metis_methods>(api, std::make_tuple(&Highs_METIS_SetDefaultOptions,
                                                &Highs_METIS_NodeND));

highs/HighsExternalApi.cpp

@@ -14,8 +14,6 @@
 #include <mutex>
 using namespace HighsExtras;
 
-HighsExternalApi::~HighsExternalApi() { unload(); }
-
 HighsExternalApi& HighsExternalApi::instance() {
   static HighsExternalApi _instance;
   return _instance;

highs/HighsExternalApi.h

@@ -119,7 +119,7 @@ struct trait_pack_ops<Trait, Rest...> {
 struct HighsExternalApi {
  public:
   HighsExternalApi() = default;
-  ~HighsExternalApi();
+  ~HighsExternalApi() { unload(); }
 
   // Prevent copying
   HighsExternalApi(const HighsExternalApi&) = delete;

highs/util/HighsDynamicLibrary.cpp

@@ -11,8 +11,6 @@
 
 #include "util/HighsDynamicLibrary.h"
 
-#include "HConfig.h"
-
 #if defined(_WIN32) || defined(_WIN64)
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -68,9 +66,9 @@ void HighsDynamicLibrary::unload() {
   if (!handle_) return;
 
 #if defined(_WIN32) || defined(_WIN64)
-    // FreeLibrary(static_cast<HMODULE>(handle_));
+  FreeLibrary(static_cast<HMODULE>(handle_));
 #else
-    // dlclose(handle_);
+  dlclose(handle_);
 #endif
 
   handle_ = nullptr;