Commit 2747a48a authored by lr119628's avatar lr119628
Browse files

[update] coco update to emadl fix and path changes

parent 34680b19
Pipeline #532268 passed with stage
in 8 minutes and 41 seconds
......@@ -73,8 +73,8 @@ public class CNNArchCocos {
.addCoCo(new CheckVariableName())
.addCoCo(new CheckArgmaxLayer())
.addCoCo(new CheckExpressions())
.addCoCo(new CheckAdaNetTooManyLayers())
.addCoCo(new CheckAdaNetPathToFilesExists());
.addCoCo(new CheckAdaNetTooManyLayers());
//.addCoCo(new CheckAdaNetPathToFilesExists())
}
//checks all normal cocos
......
/**
*
* (c) https://github.com/MontiCore/monticore
*
* The license generally applicable for this project
* can be found under https://github.com/MontiCore/monticore.
*/
/**
* (c) https://github.com/MontiCore/monticore
*
......@@ -13,11 +20,11 @@ import de.se_rwth.commons.logging.Log;
public class CheckAdaNetPathToFilesExists extends CNNArchSymbolCoCo {
@Override
public void check(ArchitectureSymbol architecture) {
if (architecture.containsAdaNet() && (architecture.getAdaNetUtils().equals("./src/main/resources/AdaNet/") || architecture.getAdaNetUtils().equals("./target/generated-sources-emadl/" + "/AdaNet/"))) {
// this check is only added for future use it now checks if the path is changed from the default
String msg = "0" + ErrorCodes.ADANET_NO_PYTHON_FILES_PATH + " the path to the AdaNet python has been changed! if the changed is intended, change this check CheckAdaNetPathToFilesExists" +
" expected path: \"./src/main/resources/AdaNet/\" got:" + architecture.getAdaNetUtils();
if(architecture.containsAdaNet() && architecture.getAdaNetUtils()== null){
String msg = "0" + ErrorCodes.ADANET_NO_PYTHON_FILES_PATH +"AdaNet resource path not set!";
Log.error(msg);
}
}
}
......@@ -40,7 +40,7 @@ public class ArchitectureSymbol extends CommonScopeSpanningSymbol {
//attribute for the path for custom python files
private String customPyFilesPath;
// path to the AdaNet python files, can be changed EMADL2CPP by changing the value in the EMADL2CPP generator
private String adaNetUtils = "/AdaNet/";
private String adaNetUtils = "./src/main/resources/AdaNet/";
public ArchitectureSymbol() {
super("", KIND);
}
......
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