Skip to content
Snippets Groups Projects
Commit a0fc79fc authored by Sebastian Nickels's avatar Sebastian Nickels
Browse files

Changed OneHot layer, added support for constants and implemented invariants

parent 5573c542
No related branches found
No related tags found
1 merge request!17Shared code, updated for CNNArchLang, etc.
Pipeline #155897 failed
Stage: windows
Stage: linux
Hide whitespace changes
Inline Side-by-side
Showing
with 115 additions and 39 deletions
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonArchitectureSupportChecker.java
+ 8
− 0
View file @ a0fc79fc
......@@ -7,16 +7,24 @@ public class CNNArch2GluonArchitectureSupportChecker extends ArchitectureSupport
public CNNArch2GluonArchitectureSupportChecker() {}
@Override
protected boolean checkMultipleStreams(ArchitectureSymbol architecture) {
return true;
}
@Override
protected boolean checkMultipleInputs(ArchitectureSymbol architecture) {
return true;
}
@Override
protected boolean checkMultipleOutputs(ArchitectureSymbol architecture) {
return true;
}
@Override
protected boolean checkConstants(ArchitectureSymbol architecture) {
return true;
}
}
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonTemplateController.java
+ 22
− 1
View file @ a0fc79fc
......@@ -65,13 +65,27 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
setCurrentElement(previousElement);
}
public void include(ConstantSymbol constant, Writer writer, NetDefinitionMode netDefinitionMode) {
ArchitectureElementData previousElement = getCurrentElement();
setCurrentElement(constant);
if (constant.isAtomic()) {
include(TEMPLATE_ELEMENTS_DIR_PATH, "Const", writer, netDefinitionMode);
}
else {
include(constant.getResolvedThis().get(), writer, netDefinitionMode);
}
setCurrentElement(previousElement);
}
public void include(LayerSymbol layer, Writer writer, NetDefinitionMode netDefinitionMode){
ArchitectureElementData previousElement = getCurrentElement();
setCurrentElement(layer);
if (layer.isAtomic()){
ArchitectureElementSymbol nextElement = layer.getOutputElement().get();
if (!isSoftmaxOutput(nextElement) && !isLogisticRegressionOutput(nextElement) && !isOneHotOutput(nextElement)){
if (!isSoftmaxOutput(nextElement) && !isLogisticRegressionOutput(nextElement)){
String templateName = layer.getDeclaration().getName();
include(TEMPLATE_ELEMENTS_DIR_PATH, templateName, writer, netDefinitionMode);
}
......@@ -101,6 +115,9 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
else if (architectureElement instanceof LayerSymbol){
include((LayerSymbol) architectureElement, writer, netDefinitionMode);
}
else if (architectureElement instanceof ConstantSymbol) {
include((ConstantSymbol) architectureElement, writer, netDefinitionMode);
}
else {
include((IOSymbol) architectureElement, writer, netDefinitionMode);
}
......@@ -117,6 +134,10 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
include(architectureElement, getWriter(), netDefinitionMode);
}
public String ioNameToCpp(String ioName) {
return ioName.replaceAll("_([0-9]+)_", "[$1]");
}
public List<String> getStreamInputNames(SerialCompositeElementSymbol stream) {
List<String> names = new ArrayList<>();
......
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/NetDefinitionMode.java
+ 7
− 1
View file @ a0fc79fc
......@@ -5,7 +5,9 @@ package de.monticore.lang.monticar.cnnarch.gluongenerator;
*/
public enum NetDefinitionMode {
ARCHITECTURE_DEFINITION,
FORWARD_FUNCTION;
FORWARD_FUNCTION,
PYTHON_INLINE,
CPP_INLINE;
public static NetDefinitionMode fromString(final String netDefinitionMode) {
switch(netDefinitionMode) {
......@@ -13,6 +15,10 @@ public enum NetDefinitionMode {
return ARCHITECTURE_DEFINITION;
case "FORWARD_FUNCTION":
return FORWARD_FUNCTION;
case "PYTHON_INLINE":
return PYTHON_INLINE;
case "CPP_INLINE":
return CPP_INLINE;
default:
throw new IllegalArgumentException("Unknown Net Definition Mode");
}
......
src/main/resources/templates/gluon/CNNSupervisedTrainer.ftl
+ 33
− 10
View file @ a0fc79fc
......@@ -100,11 +100,19 @@ class ${tc.fileNameWithoutEnding}:
<#if stream.isNetwork()>
${tc.join(tc.getStreamOutputNames(stream), ", ", "", "_output")} = self._networks[${stream?index}](${tc.join(tc.getStreamInputNames(stream), ", ", "", "_data")})
<#else>
# TODO: Implement non network streams
${tc.include(stream, "PYTHON_INLINE")}
</#if>
</#list>
loss = \
<#list tc.architecture.streams as stream>
<#if stream.isNetwork()>
<#list tc.getStreamOutputNames(stream) as output_name>
loss_functions['${output_name}'](${output_name}_output, ${output_name}_label)<#sep> + \
</#list><#sep> + \
</#if>
</#list>
loss = <#list tc.architectureOutputs as output_name>loss_functions['${output_name}'](${output_name}_output, ${output_name}_label)<#sep> + </#list>
loss.backward()
......@@ -134,19 +142,26 @@ class ${tc.fileNameWithoutEnding}:
</#list>
labels = [
<#list tc.architectureOutputs as output_name>batch.label[${output_name?index}].as_in_context(mx_context)<#sep>, </#list>
<#list tc.architectureOutputs as output_name>
batch.label[${output_name?index}].as_in_context(mx_context)<#sep>,
</#list>
]
if True: # Fix indentation
<#list tc.architecture.streams as stream>
<#if stream.isNetwork()>
${tc.join(tc.getStreamOutputNames(stream), ", ", "", "_output")} = self._networks[${stream?index}](${tc.join(tc.getStreamInputNames(stream), ", ", "", "_data")})
${tc.join(tc.getStreamOutputNames(stream), ", ", "", "_output")} = self._networks[${stream?index}](${tc.join(tc.getStreamInputNames(stream), ", ", "", "_data")})
<#else>
# TODO: Implement non network streams
${tc.include(stream, "PYTHON_INLINE")}
</#if>
</#list>
predictions = [
<#list tc.architectureOutputs as output_name>mx.nd.argmax(${output_name}_output, axis=1)<#sep>, </#list>
<#list tc.architectureOutputs as output_name>
mx.nd.argmax(${output_name}_output, axis=1)<#sep>,
</#list>
]
metric.update(preds=predictions, labels=labels)
......@@ -160,18 +175,26 @@ class ${tc.fileNameWithoutEnding}:
</#list>
labels = [
<#list tc.architectureOutputs as output_name>batch.label[${output_name?index}].as_in_context(mx_context)<#sep>, </#list>
<#list tc.architectureOutputs as output_name>
batch.label[${output_name?index}].as_in_context(mx_context)<#sep>,
</#list>
]
if True: # Fix indentation
<#list tc.architecture.streams as stream>
<#if stream.isNetwork()>
${tc.join(tc.getStreamOutputNames(stream), ", ", "", "_output")} = self._networks[${stream?index}](${tc.join(tc.getStreamInputNames(stream), ", ", "", "_data")})
${tc.join(tc.getStreamOutputNames(stream), ", ", "", "_output")} = self._networks[${stream?index}](${tc.join(tc.getStreamInputNames(stream), ", ", "", "_data")})
<#else>
# TODO: Implement non network streams
${tc.include(stream, "PYTHON_INLINE")}
</#if>
</#list>
predictions = [
<#list tc.architectureOutputs as output_name>mx.nd.argmax(${output_name}_output, axis=1)<#sep>, </#list>
<#list tc.architectureOutputs as output_name>
mx.nd.argmax(${output_name}_output, axis=1)<#sep>,
</#list>
]
metric.update(preds=predictions, labels=labels)
......
src/main/resources/templates/gluon/elements/Add.ftl
+ 7
− 0
View file @ a0fc79fc
<#if mode == "FORWARD_FUNCTION">
${element.name} = ${tc.join(element.inputs, " + ")}
<#elseif mode == "PYTHON_INLINE">
${element.name} = ${tc.join(element.inputs, " + ")}
<#elseif mode == "CPP_INLINE">
vector<float> ${element.name}(${element.inputs[0]}.size());
for (size_t i = 0; i != ${element.name}.size(); ++i) {
${element.name}[i] = ${tc.join(element.inputs, " + ", "", "[i]")};
}
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/BatchNorm.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -3,7 +3,6 @@
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = gluon.nn.BatchNorm()
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Concatenate.ftl
+ 1
− 2
View file @ a0fc79fc
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = Concatenate(dim=1)
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${tc.join(element.inputs, ", ")})
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Const.ftl 0 → 100644
+ 7
− 0
View file @ a0fc79fc
<#if mode == "FORWARD_FUNCTION">
${element.name} = gluon.Const('${element.name}', ${element.constValue})
<#elseif mode == "PYTHON_INLINE">
${element.name} = nd.array(${element.constValue})
<#elseif mode == "CPP_INLINE">
vector<float> ${element.name}{${element.constValue}};
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Convolution.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -8,8 +8,7 @@
strides=(${tc.join(element.stride, ",")}),
use_bias=${element.noBias?string("False", "True")})
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
<#if element.padding??>
${element.name}padding = self.${element.name}padding(${input})
<#assign input = element.name + "padding">
......
src/main/resources/templates/gluon/elements/Dropout.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -2,7 +2,6 @@
<#assign input = element.inputs[0]>
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = gluon.nn.Dropout(rate=${rate})
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Flatten.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -2,7 +2,6 @@
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = gluon.nn.Flatten()
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/FullyConnected.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -8,8 +8,7 @@
</#if>
self.${element.name} = gluon.nn.Dense(units=${units}, use_bias=${use_bias})
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
<#if flatten>
${element.name}flatten_ = self.${element.name}flatten(${input})
<#assign input = element.name + "flatten_">
......
src/main/resources/templates/gluon/elements/Get.ftl
+ 4
− 0
View file @ a0fc79fc
<#if mode == "FORWARD_FUNCTION">
${element.name} = ${element.inputs[element.index]}
<#elseif mode == "PYTHON_INLINE">
${element.name} = ${element.inputs[element.index]}
<#elseif mode == "CPP_INLINE">
vector<float> ${element.name} = ${element.inputs[element.index]};
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/GlobalPooling.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -8,7 +8,6 @@
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = gluon.nn.Global${poolFunctionType}Pool2D()
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Input.ftl
+ 5
− 2
View file @ a0fc79fc
......@@ -6,7 +6,10 @@
else:
self.input_normalization_${element.name} = NoNormalization()
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.input_normalization_${element.name}(${element.name})
<#elseif mode == "PYTHON_INLINE">
${element.name} = ${element.name}_data
<#elseif mode == "CPP_INLINE">
vector<float> ${element.name} = CNNTranslator::translate(${tc.ioNameToCpp(element.name)});
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/OneHot.ftl
+ 7
− 3
View file @ a0fc79fc
......@@ -3,7 +3,11 @@
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = OneHot(size=${size})
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
<#elseif mode == "PYTHON_INLINE">
${element.name} = nd.one_hot(indices=${input}, depth=${size})
<#elseif mode == "CPP_INLINE">
vector<float> ${element.name}(${size}, 0);
${element.name}[${input}[0]] = 1;
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Output.ftl
+ 5
− 2
View file @ a0fc79fc
......@@ -9,7 +9,10 @@
<#elseif element.oneHotOutput>
self.last_layers['${element.name}'] = 'softmax'
</#if>
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
outputs.append(${input})
<#elseif mode == "PYTHON_INLINE">
${element.name}_output = ${input}
<#elseif mode == "CPP_INLINE">
CNN_${element.name} = ${input};
</#if>
src/main/resources/templates/gluon/elements/Pooling.ftl
+ 1
− 2
View file @ a0fc79fc
......@@ -15,8 +15,7 @@
pool_size=${poolSize},
strides=${strides})
<#include "OutputShape.ftl">
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
<#if element.padding??>
${element.name}padding = self.${element.name}padding(${input})
<#assign input = element.name + "padding">
......
src/main/resources/templates/gluon/elements/Relu.ftl
+ 1
− 2
View file @ a0fc79fc
<#assign input = element.inputs[0]>
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = gluon.nn.Activation(activation='relu')
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
\ No newline at end of file
src/main/resources/templates/gluon/elements/Sigmoid.ftl
+ 1
− 2
View file @ a0fc79fc
<#assign input = element.inputs[0]>
<#if mode == "ARCHITECTURE_DEFINITION">
self.${element.name} = gluon.nn.Activation(activation='sigmoid')
</#if>
<#if mode == "FORWARD_FUNCTION">
<#elseif mode == "FORWARD_FUNCTION">
${element.name} = self.${element.name}(${input})
</#if>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment