Changeset 225b1548 in OpenModelica

Timestamp:

2015-02-21T11:16:36+01:00 (9 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

b366981

Parents:

c843f04

Message:

• MSL 3.2.1 (​m:r8095) changes the interface of Modelica.Math.Matrices.LAPACK.dgelsx
• adapt our interactive evaluation of Lapack to match the changes

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@24676 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Location:

Compiler

Files:

• FrontEnd/CevalFunction.mo (modified) (2 diffs)
• Util/Lapack.mo (modified) (2 diffs)
• runtime/lapackimpl.c (modified) (2 diffs)

Compiler/FrontEnd/CevalFunction.mo

@@ -701 +701 @@
 
     case("dgelsx", {arg_M, arg_N, arg_NRHS, arg_A, arg_LDA, arg_B, arg_LDB,
-                    arg_JPVT, arg_RCOND, arg_RANK, arg_WORK, arg_LWORK, arg_INFO},
+                    arg_JPVT, arg_RCOND, arg_RANK, arg_WORK, arg_INFO},
         cache, env, st)
       equation
@@ -714 +714 @@
         (RCOND, cache, st) = evaluateExtRealArg(arg_RCOND, cache, env, st);
         (WORK, cache, st) = evaluateExtRealArrayArg(arg_WORK, cache, env, st);
-        (LWORK, cache, st) = evaluateExtIntArg(arg_LWORK, cache, env, st);
         (A, B, JPVT, RANK, INFO) =
-          Lapack.dgelsx(M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, WORK, LWORK);
+          Lapack.dgelsx(M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND, WORK);
         val_A = ValuesUtil.makeRealMatrix(A);
         val_B = ValuesUtil.makeRealMatrix(B);

Compiler/Util/Lapack.mo

@@ -120 +120 @@
   input Real inRCOND;
   input list<Real> inWORK;
-  input Integer inLWORK;
   output list<list<Real>> outA;
   output list<list<Real>> outB;
@@ -127 +126 @@
   output Integer outINFO;
   external "C" LapackImpl__dgelsx(inM, inN, inNRHS, inA, inLDA, inB, inLDB,
-      inJPVT, inRCOND, inWORK, inLWORK, outA, outB, outJPVT, outRANK, outINFO)
+      inJPVT, inRCOND, inWORK, outA, outB, outJPVT, outRANK, outINFO)
     annotation(Library = {"omcruntime", "Lapack"});
 end dgelsx;

Compiler/runtime/lapackimpl.c

@@ -415 +415 @@
 
 void LapackImpl__dgelsx(int M, int N, int NRHS, void *inA, int LDA,
-    void *inB, int LDB, void *inJPVT, double rcond, void *WORK, int LWORK,
+    void *inB, int LDB, void *inJPVT, double rcond, void *WORK,
     void **outA, void **outB, void **outJPVT, int *RANK, int *INFO)
 {
@@ -427 +427 @@
   lda = LDA;
   ldb = LDB;
-  lwork = LWORK;
+  lwork = max(min(M, N) + 3*N, 2*min(M, N) + nrhs);
 
   a = alloc_real_matrix(lda, n, inA);