Changeset 7834184d in OpenModelica


Ignore:
Timestamp:
2020-06-18T16:59:39+02:00 (4 years ago)
Author:
AnHeuermann <andreas.heuermann@…>
Parents:
e374ec0f
Message:

[FMI] Remove Lapack from sour-code FMU linker flag

  • Not all FMUs need openblas or lapack installed any more.
  • Models with lapack functions will still need lapack installed on the target system that is simulating the FMU.
Location:
OMCompiler
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • OMCompiler/Compiler/SimCode/SimCodeFunctionUtil.mo

    r7dc71fa r7834184d  
    22232223      list<String> strs1, strs2, strs3, names1, names2, names3;
    22242224
    2225     // Lapack is always included
    2226     case Absyn.STRING("lapack") then ({},{});
    2227     case Absyn.STRING("Lapack") then ({},{});
     2225    case Absyn.STRING("lapack") then ({"-llapack -lblas"},{});
     2226    case Absyn.STRING("Lapack") then ({"-llapack -lblas"},{});
     2227    case Absyn.STRING("openblas") then ({"-lopenblass"},{});
    22282228
    22292229    //pthreads is already linked under windows
  • OMCompiler/configure.ac

    r419f112 r7834184d  
    741741  RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm"
    742742  RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC $LD_LAPACK -lm -lomcgc"
    743   RT_LDFLAGS_GENERATED_CODE_SOURCE_FMU="$LDFLAGS $LD_LAPACK -lm$LD_NOUNDEFINED"
     743  RT_LDFLAGS_GENERATED_CODE_SOURCE_FMU="$LDFLAGS -lm$LD_NOUNDEFINED"
    744744  RT_LDFLAGS_SHARED=
    745745  OMCRUNTIME_SHARED_LDFLAGS="$RT_LDFLAGS -Wl,-undefined -Wl,dynamic_lookup $LIBLPSOLVE55 -lzmq $LIBUUID $RT_LDFLAGS_OPTIONAL"
     
    775775  RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
    776776  RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC -lcdaskr $RT_LDFLAGS_SIM"
    777   RT_LDFLAGS_GENERATED_CODE_SOURCE_FMU="$LDFLAGS $LD_LAPACK -lm$LD_NOUNDEFINED"
     777  RT_LDFLAGS_GENERATED_CODE_SOURCE_FMU="$LDFLAGS -lm$LD_NOUNDEFINED"
    778778  LINK="cp -frl"
    779779  # No RPATH in Windows :(
     
    812812  RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm -lomcgc -lpthread -rdynamic" # Some of our tests refer to the testsuite itself
    813813  RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC $LD_LAPACK -lm -lomcgc -lpthread -rdynamic$LD_NOUNDEFINED"
    814   RT_LDFLAGS_GENERATED_CODE_SOURCE_FMU="$LDFLAGS $LD_LAPACK -lm -lpthread -rdynamic$LD_NOUNDEFINED"
     814  RT_LDFLAGS_GENERATED_CODE_SOURCE_FMU="$LDFLAGS -lm -lpthread -rdynamic$LD_NOUNDEFINED"
    815815  LINK="cp -frl"
    816816  LDFLAGS="$LDFLAGS -Wl,-rpath-link,$OMBUILDDIR/lib/$host_short/omc"
Note: See TracChangeset for help on using the changeset viewer.