Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMADL2CPP
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMADL2CPP
Commits
cc3d025b
Commit
cc3d025b
authored
Jul 03, 2019
by
cesomark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop Generation if DatapathCoco finids something
parent
9109db47
Pipeline
#156295
failed with stages
in 13 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
4 deletions
+24
-4
src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
...nticore/lang/monticar/emadl/generator/EMADLGenerator.java
+20
-2
src/test/java/de/monticore/lang/monticar/emadl/GenerationTest.java
...java/de/monticore/lang/monticar/emadl/GenerationTest.java
+4
-2
No files found.
src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
View file @
cc3d025b
...
...
@@ -35,6 +35,7 @@ import de.monticore.lang.monticar.cnntrain.CNNTrainGenerator;
import
de.monticore.lang.monticar.cnntrain._symboltable.ConfigurationSymbol
;
import
de.monticore.lang.monticar.emadl._cocos.EMADLCocos
;
import
de.monticore.lang.monticar.emadl._cocos.DataPathCocos
;
import
de.monticore.lang.monticar.emadl._cocos.CheckArchitecture
;
import
de.monticore.lang.monticar.emadl.tagging.dltag.DataPathSymbol
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cpp.ArmadilloHelper
;
...
...
@@ -48,6 +49,7 @@ import de.monticore.symboltable.Scope;
import
de.se_rwth.commons.Splitters
;
import
de.se_rwth.commons.logging.Log
;
import
freemarker.template.TemplateException
;
import
de.monticore.lang.monticar.emadl.tagging.dltag.DataPathSymbol
;
import
javax.xml.bind.DatatypeConverter
;
import
java.io.*
;
...
...
@@ -372,8 +374,13 @@ public class EMADLGenerator {
String
dataPath
;
if
(!
tags
.
isEmpty
())
{
DataPathCocos
.
check
(
component
,
taggingResolver
);
dataPath
=
(
String
)
tags
.
get
(
0
).
getValues
().
get
(
0
);
DataPathSymbol
dataPathSymbol
=
(
DataPathSymbol
)
tags
.
get
(
0
);
DataPathCocos
.
check
(
dataPathSymbol
);
dataPath
=
dataPathSymbol
.
getPath
();
// TODO: Replace warinings with errors, until then use this method
stopGeneratorIfWarning
();
Log
.
warn
(
"Tagfile was found, ignoring data_paths.txt: "
+
dataPath
);
}
else
{
DataPathConfigParser
newParserConfig
=
new
DataPathConfigParser
(
getModelsPath
()
+
"data_paths.txt"
);
...
...
@@ -555,4 +562,15 @@ public class EMADLGenerator {
return
null
;
}
}
private
void
stopGeneratorIfWarning
()
{
for
(
int
i
=
0
;
i
<
Log
.
getFindings
().
size
();
i
++)
{
if
(
Log
.
getFindings
().
get
(
i
).
toString
().
matches
(
"Filepath '(.)*/test/resources/models' does not exist!"
))
{
throw
new
RuntimeException
(
Log
.
getFindings
().
get
(
i
).
toString
());
}
else
if
(
Log
.
getFindings
().
get
(
i
).
toString
()
.
equals
(
"DatapathType is incorrect, must be of Type: HDF5 or LMDB"
))
{
throw
new
RuntimeException
(
Log
.
getFindings
().
get
(
i
).
toString
());
}
}
}
}
src/test/java/de/monticore/lang/monticar/emadl/GenerationTest.java
View file @
cc3d025b
...
...
@@ -39,6 +39,7 @@ import java.util.List;
import
static
junit
.
framework
.
TestCase
.
assertTrue
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
org.junit.rules.ExpectedException
;
public
class
GenerationTest
extends
AbstractSymtabTest
{
...
...
@@ -193,7 +194,7 @@ public class GenerationTest extends AbstractSymtabTest {
assertTrue
(
Log
.
getErrorCount
()
==
0
);
}
@Test
@Test
(
expected
=
RuntimeException
.
class
)
public
void
testInvalidPathCoCos
()
{
Log
.
getFindings
().
clear
();
String
[]
args
=
{
"-m"
,
"src/test/resources/models/"
,
"-r"
,
"tagging.AlexnetInvalid"
,
"-b"
,
"MXNET"
,
"-f"
,
"n"
,
...
...
@@ -209,8 +210,9 @@ public class GenerationTest extends AbstractSymtabTest {
assertTrue
(
Log
.
getErrorCount
()
==
0
);
}
@Test
@Test
(
expected
=
RuntimeException
.
class
)
public
void
testInvalidTypeCocos
()
{
Log
.
getFindings
().
clear
();
String
[]
args
=
{
"-m"
,
"src/test/resources/models/"
,
"-r"
,
"tagging.AlexnetInvalidType"
,
"-b"
,
"MXNET"
,
"-f"
,
"n"
,
"-c"
,
"n"
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment