Try ugly solution for missing blas_shutdown

Author: filikat

extern/HighsExtrasApi.cpp

@@ -76,7 +76,7 @@ HIGHS_EXTRAS_API bool HighsExtras_getApi(HighsExtrasApi* api) {
                &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, &highs_openblas_shutdown));
+               &highs_openblas_set_num_threads));
 
   bind_api<metis_methods>(api, std::make_tuple(&Highs_METIS_SetDefaultOptions,
                                                &Highs_METIS_NodeND));

extern/HighsExtrasExternalDeps.h

@@ -67,8 +67,7 @@ using blas_methods = std::tuple<
     decltype(&cblas_dswap), decltype(&cblas_dgemv), decltype(&cblas_dtpsv),
     decltype(&cblas_dtrsv), decltype(&cblas_dger), decltype(&cblas_dgemm),
     decltype(&cblas_dsyrk), decltype(&cblas_dtrsm),
-    decltype(&highs_openblas_set_num_threads),
-    decltype(&highs_openblas_shutdown)>;
+    decltype(&highs_openblas_set_num_threads)>;
 
 using metis_methods = std::tuple<decltype(&Highs_METIS_SetDefaultOptions),
                                  decltype(&Highs_METIS_NodeND)>;
@@ -188,8 +187,6 @@ struct blas : extras_feature<1> {
   static void openblas_set_num_threads(int num_threads) {
     impl::template fn<11>()(num_threads);
   }
-
-  static void openblas_shutdown(void) { impl::template fn<12>()(); }
 };
 
 struct metis : extras_feature<2> {

extern/blas/myblas.cpp

@@ -5,9 +5,3 @@ void highs_openblas_set_num_threads(int num_threads) {
   openblas_set_num_threads(num_threads);
 #endif
 }
-
-void highs_openblas_shutdown() {
-#if defined(HIPO_USES_OPENBLAS)
-  blas_shutdown();
-#endif
-}

extern/blas/mycblas.h

@@ -79,12 +79,9 @@ void cblas_dtrsm(const enum CBLAS_ORDER order, const enum CBLAS_SIDE side,
 
 #if defined(HIPO_USES_OPENBLAS)
 void openblas_set_num_threads(int num_threads);
-void blas_shutdown(void);
 #endif
 
 void highs_openblas_set_num_threads(int num_threads);
-void highs_openblas_shutdown(void);
-
 #ifdef __cplusplus
 }
 #endif

highs/HighsExternalApi.cpp

@@ -14,12 +14,7 @@
 #include <mutex>
 using namespace HighsExtras;
 
-HighsExternalApi::~HighsExternalApi() {
-#ifdef HIGHS_SHARED_EXTRAS_LIBRARY
-  if (isAvailable<HighsExtras::blas>()) HighsExtras::blas::openblas_shutdown();
-#endif
-  unload();
-}
+HighsExternalApi::~HighsExternalApi() { unload(); }
 
 HighsExternalApi& HighsExternalApi::instance() {
   static HighsExternalApi _instance;

highs/util/HighsDynamicLibrary.cpp

@@ -68,6 +68,19 @@ void HighsDynamicLibrary::unload() {
 #if defined(_WIN32) || defined(_WIN64)
   FreeLibrary(static_cast<HMODULE>(handle_));
 #else
+  // check if blas_shutdown exists and potentially use it before dlclose-ing
+
+  using shutdown_t = void (*)();
+
+  shutdown_t shutdown_fn = nullptr;
+
+  if (auto p = dlsym(handle_, "blas_shutdown"))
+    shutdown_fn = reinterpret_cast<shutdown_t>(p);
+  else if (auto p = dlsym(handle_, "openblas_shutdown"))
+    shutdown_fn = reinterpret_cast<shutdown_t>(p);
+
+  if (shutdown_fn) shutdown_fn();
+
   dlclose(handle_);
 #endif