Port cpp fixes to1.18 #7654
Merged
Port cpp fixes to1.18 #7654
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- installs liblpsolve55 in lib64, fix the copy - add the path to ffi include when building the Compile runtime to fix: ./../../3rdParty/libffi/install/include/ffi.h:58:10: error: 'ffitarget.h' file not found with <angled> include; use "quotes" instead
- Flatten types in statements. - Flatten expressions after evaluating bindings in EvaluateConstants, since they come from the instance tree and not the flat model. - Create typed bindings instead of flat bindings in some places where the generated binding might not actually be flat. - Lift the result in evalComponentBinding if necessary to ensure it has the same dimensions as the cref being evaluated. - Apply the array hack for dimensions in Dimension.fromExp instead of during typing to simplify problematic dimensions in more cases. - Don't double delete components.
* Fix loading of subpackages in case of encryption * Return the class parts
- Expand reductions/array constructors with multiple iterators into nested calls when generating the DAE structure, since the code generation can't handle multiple iterators.
- Evaluate min/max reductions if possible. - Fix Expression.typeOf for relations, to avoid using the wrong default value when evaluating reductions.
- Don't expand product of an expression with unknown dimensions.
…odelica#7641) * Implement product operator in Cpp runtime * Update OMCompiler/SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp Co-authored-by: phannebohm <phannebohm@fh-bielefeld.de> * Update test * Implement DIV_SCALAR_ARRAY in Cpp runtime See e.g. PowerSystems.Examples.AC3ph.Precalculation.EqCircFromTransDat Co-authored-by: phannebohm <phannebohm@fh-bielefeld.de>
See e.g. PowerSystems.Examples.AC3ph.Precalculation.EqCircFromTransDat
…7648) * Fix Cpp writeLhsCref to not use ArraySliceConst on lhs Call 'daeExpCref(isLhs=true, ...)' instead of 'daeExpCrefRhs(...)' in scalarLhsCref. See e.g. PowerSystems.Examples.AC3ph.Precalculation.TransDatFromEqCirc raising: ERROR : init : SimManager: Can't assign array to ArraySliceConst * Whitespaces
* Fix initialization of reductions in Cpp and C runtime `foldExpPre` had been declared but not used. This resulted in Cpp errors. See e.g. ModelicaTest.Fluid.TestComponents.Machines.TestWaterPumpCharacteristics or PowerSystems.Examples.AC3ph.Precalculation.Z_matrixTrDat3 ERROR : init : SimManager: Right and left array must have the same size for element wise addition * Revert fix of initialization of reductions for C runtime
* Fix empty array slices in Cpp runtime `stop=0` in `start:step:stop` was used to mark `end` so far. It is needed for empty slices though. See e.g. ModelicaTest.Math.TestMatrices2b (MSL 4.0.0) raising ERROR : init : SimManager: Wrong slice exceeding array size * Add missing access operators for 3-5 dims to ArraySliceConst * Prevent reduction of ArraySlice for index set of size 1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Copy fixes from master to 1.18