Commit 0163b2c1 authored by Malte Heithoff's avatar Malte Heithoff
Browse files

OpenCV Dependencies

parent 507737af
Pipeline #354652 passed with stage
in 14 minutes and 11 seconds
...@@ -5,6 +5,7 @@ import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; ...@@ -5,6 +5,7 @@ import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.EMAMBluePrint; import de.monticore.lang.monticar.generator.EMAMBluePrint;
import de.monticore.lang.monticar.generator.MathCommand; import de.monticore.lang.monticar.generator.MathCommand;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
import de.monticore.lang.monticar.generator.cpp.converter.ComponentConverter; import de.monticore.lang.monticar.generator.cpp.converter.ComponentConverter;
...@@ -65,5 +66,12 @@ public class BoundingRectCommand extends MathCommand{ ...@@ -65,5 +66,12 @@ public class BoundingRectCommand extends MathCommand{
mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols); mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc"); bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
} }
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
...@@ -67,6 +68,13 @@ public class CvtColorCommand extends ArgumentNoReturnMathCommand{ ...@@ -67,6 +68,13 @@ public class CvtColorCommand extends ArgumentNoReturnMathCommand{
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getCvtColorHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getCvtColorHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
...@@ -67,6 +68,12 @@ public class DilateCommand extends ArgumentNoReturnMathCommand{ ...@@ -67,6 +68,12 @@ public class DilateCommand extends ArgumentNoReturnMathCommand{
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getDilateHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getDilateHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.converter.ComponentConverter; import de.monticore.lang.monticar.generator.cpp.converter.ComponentConverter;
...@@ -69,6 +70,13 @@ public class ErodeCommand extends ArgumentNoReturnMathCommand{ ...@@ -69,6 +70,13 @@ public class ErodeCommand extends ArgumentNoReturnMathCommand{
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getErodeHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getErodeHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
...@@ -68,6 +69,13 @@ public class FindContoursCommand extends ArgumentNoReturnMathCommand{ ...@@ -68,6 +69,13 @@ public class FindContoursCommand extends ArgumentNoReturnMathCommand{
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getFindContoursHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getFindContoursHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
...@@ -66,6 +67,13 @@ public class GaussianBlurCommand extends ArgumentNoReturnMathCommand{ ...@@ -66,6 +67,13 @@ public class GaussianBlurCommand extends ArgumentNoReturnMathCommand{
bluePrint.addMethod(gaussianBlurHelperMethod); bluePrint.addMethod(gaussianBlurHelperMethod);
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getGaussianBlurHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getGaussianBlurHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
...@@ -67,6 +68,13 @@ public class InRangeCommand extends ArgumentNoReturnMathCommand{ ...@@ -67,6 +68,13 @@ public class InRangeCommand extends ArgumentNoReturnMathCommand{
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getInRangeHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getInRangeHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
import de.monticore.lang.monticar.generator.cpp.converter.ExecuteMethodGenerator; import de.monticore.lang.monticar.generator.cpp.converter.ExecuteMethodGenerator;
...@@ -66,6 +67,13 @@ public class LargestContourCommand extends MathCommand { ...@@ -66,6 +67,13 @@ public class LargestContourCommand extends MathCommand {
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getLargestContourMethod(){ private Method getLargestContourMethod(){
......
...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol; ...@@ -4,6 +4,7 @@ import de.monticore.lang.math._symboltable.expression.MathExpressionSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol; import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
import de.monticore.lang.monticar.generator.*; import de.monticore.lang.monticar.generator.*;
import de.monticore.lang.monticar.generator.cmake.CMakeFindModule;
import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP; import de.monticore.lang.monticar.generator.cpp.EMAMBluePrintCPP;
import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties; import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer; import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
...@@ -71,6 +72,13 @@ public class RectangleCommand extends MathCommand{ ...@@ -71,6 +72,13 @@ public class RectangleCommand extends MathCommand{
redefineArmaMat(bluePrintCPP); redefineArmaMat(bluePrintCPP);
redefineInit(bluePrintCPP); redefineInit(bluePrintCPP);
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("OpenCV", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("blas", true));
bluePrintCPP.getGenerator().getCmakeConfig()
.addModuleDependency(new CMakeFindModule("openblas", true));
} }
private Method getRectangleHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){ private Method getRectangleHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, EMAMBluePrintCPP bluePrintCPP, MathExpressionProperties properties){
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment