Commit 8b12e410 authored by Christian Fuß's avatar Christian Fuß
Browse files

removed some debug code

parent d4b75de5
Pipeline #174524 passed with stages
in 19 minutes and 41 seconds
......@@ -30,9 +30,7 @@ public class CheckArchitectureFinished extends CNNArchSymbolCoCo {
@Override
public void check(ArchitectureSymbol architecture) {
System.err.println("Architecture in checkArchFinished: " + architecture.toString());
for (CompositeElementSymbol stream : architecture.getStreams()) {
System.err.println("Stream in checkArchFinished");
if (!stream.getOutputTypes().isEmpty()){
Log.error("0" + ErrorCodes.UNFINISHED_ARCHITECTURE + " The architecture is not finished. " +
"There are still open streams at the end of the architecture. "
......@@ -40,7 +38,6 @@ public class CheckArchitectureFinished extends CNNArchSymbolCoCo {
}
}
for (UnrollSymbol unroll : architecture.getUnrolls()) {
System.err.println("UnrollSymbol in checkArchFinished");
if (!unroll.getBody().getOutputTypes().isEmpty()){
Log.error("0" + ErrorCodes.UNFINISHED_ARCHITECTURE + " The architecture is not finished. " +
"There are still open streams at the end of the architecture. "
......
......@@ -33,9 +33,7 @@ public class CheckElementInputs extends CNNArchSymbolCoCo {
}
for (UnrollSymbol unroll : architecture.getUnrolls()) {
System.err.println("BEFORE check");
unroll.getBody().checkInput();
System.err.println("AFTER check");
}
}
}
......@@ -117,7 +117,6 @@ public class ArchTypeSymbol extends CommonSymbol {
public void setDimensionSymbols(List<ArchSimpleExpressionSymbol> dimensions) {
this.dimensions = dimensions;
System.err.println("Setting dimensions: " + dimensions.toString());
}
public List<ArchSimpleExpressionSymbol> getDimensionSymbols() {
......
......@@ -105,16 +105,7 @@ public abstract class ArchitectureElementSymbol extends CommonScopeSpanningSymbo
}
else if (sym instanceof UnrollSymbol) {
sym = sym.getEnclosingScope().getSpanningSymbol().get();
if(sym instanceof UnrollSymbol) {
System.err.println("Scope1");
return ((ArchitectureElementSymbol)sym.getEnclosingScope().getSpanningSymbol().get()).getArchitecture();
}else if(sym instanceof ArchitectureSymbol) {
System.err.println("Scope2");
return (ArchitectureSymbol)sym;
}else{
System.err.println("Scope3");
return ((ArchitectureElementSymbol)sym).getArchitecture();
}
return (ArchitectureSymbol)sym;
}else {
return ((ArchitectureElementSymbol) sym).getArchitecture();
}
......
......@@ -91,7 +91,6 @@ public class ArchitectureSymbol extends CommonScopeSpanningSymbol {
public List<VariableSymbol> getInputs() {
System.err.println("THE inputs: " + inputs);
return inputs;
}
......@@ -124,13 +123,14 @@ public class ArchitectureSymbol extends CommonScopeSpanningSymbol {
}
for (UnrollSymbol unroll : unrolls) {
//unroll.checkIfResolvable();
try {
unroll.resolve();
}
catch (ArchResolveException e) {
// Do nothing; error is already logged
if(unroll.isResolvable());
{
try {
unroll.resolve();
}
catch (ArchResolveException e) {
// Do nothing; error is already logged
}
}
}
}
......
......@@ -114,8 +114,6 @@ public class UnrollDeclarationSymbol extends CommonScopeSpanningSymbol {
public UnrollSymbol call(UnrollSymbol layer) throws ArchResolveException{
checkForSequence(layer.getArguments());
return layer;
}
......
......@@ -112,9 +112,7 @@ public class UnrollSymbol extends CommonScopeSpanningSymbol {
protected void setResolvedThis(UnrollSymbol resolvedThis) {
if (resolvedThis != null){
//resolvedThis.putInScope(getSpannedScope());
}
System.err.println("setResolvedThis() called");
this.resolvedThis = resolvedThis;
}
......@@ -126,13 +124,10 @@ public class UnrollSymbol extends CommonScopeSpanningSymbol {
getDeclaration();
resolveExpressions();
System.err.println("UnrollSymbol resolveSequences called!2");
//resolve the unroll call
getBody().resolveOrError();
System.err.println("BODY1: " +getBody().getElements().toString());
UnrollSymbol resolvedUnroll = getDeclaration().call(this);
setResolvedThis(resolvedUnroll);
System.err.println("HERE1");
}
}
......
......@@ -103,7 +103,6 @@ public class BeamSearchStart extends PredefinedUnrollDeclaration {
new ParameterSymbol.Builder()
.name(AllPredefinedLayers.BEAMSEARCH_MAX_LENGTH)
.constraints(Constraints.INTEGER, Constraints.POSITIVE)
.defaultValue(99)
.build(),
new ParameterSymbol.Builder()
.name(AllPredefinedLayers.BEAMSEARCH_WIDTH_NAME)
......
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