Commit 663f0619 authored by Abdallah Atouani's avatar Abdallah Atouani

Merge branch 'feature/path_tagging' of...

Merge branch 'feature/path_tagging' of /home/abdallah/Documents/SLE_Poject/EMADL2CPP with conflicts.
parent 9109db47
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<properties> <properties>
<!-- .. SE-Libraries .................................................. --> <!-- .. SE-Libraries .................................................. -->
<emadl.version>0.2.6</emadl.version> <emadl.version>0.2.7-SNAPSHOT</emadl.version>
<CNNTrain.version>0.2.6</CNNTrain.version> <CNNTrain.version>0.2.6</CNNTrain.version>
<cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version> <cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version>
<cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version> <cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version>
...@@ -62,6 +62,12 @@ ...@@ -62,6 +62,12 @@
<!-- MontiCore Dependencies --> <!-- MontiCore Dependencies -->
<dependency>
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>common-monticar</artifactId>
<version>0.0.17-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-opt-generator</artifactId> <artifactId>embedded-montiarc-math-opt-generator</artifactId>
......
package tagging; package tagging;
conforms to dltag.DataPathTagSchema; conforms to dltag.DataPathTagSchema;
tags Alexnet { tags AlexNet {
tag Alexnet with DataPath = {path = src/test/resources/models, type = LMDB}; tag Alexnet with DataPath = {path = dataAlexnetComponent, type = random};
tag AlexnetInvalid with DataPath = {path = test/resources/models, type = random}; tag Parent.a1 with DataPath = {path = dataParent, type = random};
tag AlexnetInvalidType with DataPath = {path = src/test/resources/models, type = LMBD};
tag Parent.a1 with DataPath = {path = instanceA1, type = random};
} }
\ No newline at end of file
package tagging; package tagging;
component Parent{ component Parent {
instance Alexnet a1; instance tagging.Alexnet a1;
instance Alexnet a2;
} }
\ No newline at end of file
Markdown is supported
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