Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
monticore
EmbeddedMontiArc
generators
CNNArch2MXNet
Commits
5b8f3a4c
Commit
5b8f3a4c
authored
Jun 18, 2018
by
Thomas Michael Timmermanns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed package
parent
4a48f148
Pipeline
#56345
failed with stages
in 14 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
15 additions
and
17 deletions
+15
-17
pom.xml
pom.xml
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/ArchitectureElementData.java
...ticar/cnnarch/mxnetgenerator/ArchitectureElementData.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNet.java
...e/lang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNet.java
+4
-4
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNetCli.java
...ang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNetCli.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArchTemplateController.java
...car/cnnarch/mxnetgenerator/CNNArchTemplateController.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/ConfigurationData.java
...ng/monticar/cnnarch/mxnetgenerator/ConfigurationData.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/LayerNameCreator.java
...ang/monticar/cnnarch/mxnetgenerator/LayerNameCreator.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/Target.java
...onticore/lang/monticar/cnnarch/mxnetgenerator/Target.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/TemplateConfiguration.java
...onticar/cnnarch/mxnetgenerator/TemplateConfiguration.java
+1
-1
src/test/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/AbstractSymtabTest.java
...g/monticar/cnnarch/mxnetgenerator/AbstractSymtabTest.java
+1
-1
src/test/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/GenerationTest.java
.../lang/monticar/cnnarch/mxnetgenerator/GenerationTest.java
+1
-3
src/test/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/SymtabTest.java
...core/lang/monticar/cnnarch/mxnetgenerator/SymtabTest.java
+1
-1
No files found.
pom.xml
View file @
5b8f3a4c
...
...
@@ -127,7 +127,7 @@
<configuration>
<archive>
<manifest>
<mainClass>
de.monticore.lang.monticar.cnnarch.generator.CNNArch2MxNetCli
</mainClass>
<mainClass>
de.monticore.lang.monticar.cnnarch.
mxnet
generator.CNNArch2MxNetCli
</mainClass>
</manifest>
</archive>
<descriptorRefs>
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/ArchitectureElementData.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/ArchitectureElementData.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
de.monticore.lang.monticar.cnnarch._symboltable.ArchTypeSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureElementSymbol
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2MxNet.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/CNNArch2MxNet.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
de.monticore.io.paths.ModelPath
;
import
de.monticore.lang.monticar.cnnarch.CNNArchGenerator
;
...
...
@@ -123,18 +123,18 @@ public class CNNArch2MxNet implements CNNArchGenerator {
private
void
checkValidGeneration
(
ArchitectureSymbol
architecture
){
if
(
architecture
.
getInputs
().
size
()
>
1
){
Log
.
error
(
"This cnn architecture has multiple inputs, "
+
"which is currently not supported by the generator. "
"which is currently not supported by the
mxnet
generator. "
,
architecture
.
getSourcePosition
());
}
if
(
architecture
.
getOutputs
().
size
()
>
1
){
Log
.
error
(
"This cnn architecture has multiple outputs, "
+
"which is currently not supported by the generator. "
"which is currently not supported by the
mxnet
generator. "
,
architecture
.
getSourcePosition
());
}
if
(
architecture
.
getOutputs
().
get
(
0
).
getDefinition
().
getType
().
getWidth
()
!=
1
||
architecture
.
getOutputs
().
get
(
0
).
getDefinition
().
getType
().
getHeight
()
!=
1
){
Log
.
error
(
"This cnn architecture has a multi-dimensional output, "
+
"which is currently not supported by the generator."
"which is currently not supported by the
mxnet
generator."
,
architecture
.
getSourcePosition
());
}
}
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArch2MxNetCli.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/CNNArch2MxNetCli.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
org.apache.commons.cli.*
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchTemplateController.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/CNNArchTemplateController.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
de.monticore.lang.monticar.cnnarch._symboltable.*
;
import
de.monticore.lang.monticar.cnnarch.predefined.Sigmoid
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/ConfigurationData.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/ConfigurationData.java
View file @
5b8f3a4c
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
de.monticore.lang.monticar.cnntrain._symboltable.*
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/LayerNameCreator.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/LayerNameCreator.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
de.monticore.lang.monticar.cnnarch._symboltable.*
;
import
de.monticore.lang.monticar.cnnarch.predefined.Convolution
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/Target.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/Target.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
//can be removed
public
enum
Target
{
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/TemplateConfiguration.java
→
src/main/java/de/monticore/lang/monticar/cnnarch/
mxnet
generator/TemplateConfiguration.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch.generator
;
package
de.monticore.lang.monticar.cnnarch.
mxnet
generator
;
import
de.se_rwth.commons.logging.Log
;
import
freemarker.template.Configuration
;
...
...
src/test/java/de/monticore/lang/monticar/cnnarch/AbstractSymtabTest.java
→
src/test/java/de/monticore/lang/monticar/cnnarch/
mxnetgenerator/
AbstractSymtabTest.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch
;
package
de.monticore.lang.monticar.cnnarch
.mxnetgenerator
;
import
de.monticore.ModelingLanguageFamily
;
import
de.monticore.io.paths.ModelPath
;
...
...
src/test/java/de/monticore/lang/monticar/cnnarch/GenerationTest.java
→
src/test/java/de/monticore/lang/monticar/cnnarch/
mxnetgenerator/
GenerationTest.java
View file @
5b8f3a4c
...
...
@@ -18,11 +18,9 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch
;
package
de.monticore.lang.monticar.cnnarch
.mxnetgenerator
;
import
de.monticore.io.paths.ModelPath
;
import
de.monticore.lang.monticar.cnnarch.generator.CNNArch2MxNet
;
import
de.monticore.lang.monticar.cnnarch.generator.CNNArch2MxNetCli
;
import
de.monticore.lang.monticar.cnntrain._cocos.CNNTrainCocos
;
import
de.monticore.lang.monticar.cnntrain._symboltable.CNNTrainCompilationUnitSymbol
;
import
de.monticore.lang.monticar.cnntrain._symboltable.CNNTrainLanguage
;
...
...
src/test/java/de/monticore/lang/monticar/cnnarch/SymtabTest.java
→
src/test/java/de/monticore/lang/monticar/cnnarch/
mxnetgenerator/
SymtabTest.java
View file @
5b8f3a4c
...
...
@@ -18,7 +18,7 @@
* License along with this project. If not, see <http://www.gnu.org/licenses/>.
* *******************************************************************************
*/
package
de.monticore.lang.monticar.cnnarch
;
package
de.monticore.lang.monticar.cnnarch
.mxnetgenerator
;
import
de.monticore.lang.monticar.cnnarch._parser.CNNArchParser
;
import
de.monticore.lang.monticar.cnnarch._symboltable.CNNArchCompilationUnitSymbol
;
...
...
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