Commit ba1ac4bf authored by Christian Fuß's avatar Christian Fuß

resolved merge conflict

parent c9f47ac6
Pipeline #150749 canceled with stages
......@@ -62,7 +62,8 @@ public class AllPredefinedLayers {
public static final String BETA_NAME = "beta";
public static final String PADDING_NAME = "padding";
public static final String POOL_TYPE_NAME = "pool_type";
public static final String SIZE_NAME = "size";
public static final String ONE_HOT_SIZE_NAME = "size";
//possible String values
public static final String PADDING_VALID = "valid";
......@@ -90,7 +91,8 @@ public class AllPredefinedLayers {
Split.create(),
Get.create(),
Add.create(),
Concatenate.create());
Concatenate.create(),
OneHot.create());
}
}
......@@ -38,7 +38,7 @@ public class OneHot extends PredefinedLayerDeclaration {
public List<ArchTypeSymbol> computeOutputTypes(List<ArchTypeSymbol> inputTypes, LayerSymbol layer) {
return Collections.singletonList(new ArchTypeSymbol.Builder()
.channels(layer.getIntValue(AllPredefinedLayers.SIZE_NAME).get())
.channels(layer.getIntValue(AllPredefinedLayers.ONE_HOT_SIZE_NAME).get())
.height(1)
.width(1)
.elementType("0", "1")
......@@ -54,7 +54,7 @@ public class OneHot extends PredefinedLayerDeclaration {
OneHot declaration = new OneHot();
List<VariableSymbol> parameters = new ArrayList<>(Arrays.asList(
new VariableSymbol.Builder()
.name(AllPredefinedLayers.SIZE_NAME)
.name(AllPredefinedLayers.ONE_HOT_SIZE_NAME)
.constraints(Constraints.POSITIVE, Constraints.INTEGER)
.build()));
declaration.setParameters(parameters);
......
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