fix: adding option to use mkl

Loop3D · Feb 8, 2022 · 22883ba · 22883ba
1 parent d780300
commit 22883ba
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/LoopStructural/interpolators/discrete_interpolator.py b/LoopStructural/interpolators/discrete_interpolator.py
@@ -493,7 +493,7 @@ def build_matrix(self, square=True, damp=0.0, ie=False):
             return ATA, ATB, Aie.T.dot(Aie), Aie.T.dot(uie), Aie.T.dot(lie)
         return ATA, ATB
 
-    def _solve_osqp(self, P, A, q, l, u):
+    def _solve_osqp(self, P, A, q, l, u,mkl=False):
 
         try:
             import osqp
@@ -527,7 +527,16 @@ def _solve_osqp(self, P, A, q, l, u):
 
         # Setup workspace
         # osqp likes csc matrices
-        prob.setup(P.tocsc(), np.array(q), A.tocsc(), np.array(u), np.array(l))
+        linsys_solver='qdldl'
+        if mkl:
+            linsys_solver='mkl pardiso'
+
+        try:
+            prob.setup(P.tocsc(), np.array(q), A.tocsc(), np.array(u), np.array(l),linsys_solver=linsys_solver)
+        except ValueError:
+            if mkl:
+                logger.error('MKL solver library path not correct. Please add to LD_LIBRARY_PATH') 
+                raise LoopImportError("Cannot import MKL pardiso")
         res = prob.solve()
         return res.x