Try blas_shutdown

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, &highs_openblas_shutdown));
 
   bind_api<metis_methods>(api, std::make_tuple(&Highs_METIS_SetDefaultOptions,
                                                &Highs_METIS_NodeND));

extern/HighsExtrasExternalDeps.h

@@ -67,7 +67,8 @@ 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_set_num_threads),
+    decltype(&highs_openblas_shutdown)>;
 
 using metis_methods = std::tuple<decltype(&Highs_METIS_SetDefaultOptions),
                                  decltype(&Highs_METIS_NodeND)>;
@@ -187,6 +188,8 @@ 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,3 +5,9 @@ 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,9 +79,11 @@ 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
 }

highs/HighsExternalApi.cpp

@@ -14,6 +14,13 @@
 #include <mutex>
 using namespace HighsExtras;
 
+HighsExternalApi::~HighsExternalApi() {
+#ifdef HIGHS_SHARED_EXTRAS_LIBRARY
+  HighsExtras::blas::openblas_shutdown();
+#endif
+  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() { unload(); }
+  ~HighsExternalApi();
 
   // Prevent copying
   HighsExternalApi(const HighsExternalApi&) = delete;