Commit 74bd0027 authored by nilsfreyer's avatar nilsfreyer

Added setComponentName for architecture, adapted tests

parent 2afd09b0
......@@ -354,6 +354,7 @@ public class EMADLGenerator {
if (architecture.isPresent()){
String dPath = DataPathConfigParser.getDataPath(getModelsPath() + "data_paths.txt", componentSymbol.getFullName());
architecture.get().setDataPath(dPath);
architecture.get().setComponentName(componentSymbol.getFullName());
generateCNN(fileContents, taggingResolver, componentInstanceSymbol, architecture.get());
}
else if (mathStatements.isPresent()){
......
......@@ -19,8 +19,8 @@ class CNNCreator_cifar10_cifar10Classifier_net:
module = None
_data_dir_ = "data/cifar10_cifar10Classifier_net/"
_model_dir_ = "model/cifar10_cifar10Classifier_net/"
_model_prefix_ = "net"
_model_dir_ = "model/cifar10.CifarNetwork/"
_model_prefix_ = "model"
_input_names_ = ['data']
_input_shapes_ = [(3,32,32)]
_output_names_ = ['softmax_label']
......
......@@ -11,8 +11,8 @@
class CNNPredictor_cifar10_cifar10Classifier_net{
public:
const std::string json_file = "model/cifar10_cifar10Classifier_net/net_newest-symbol.json";
const std::string param_file = "model/cifar10_cifar10Classifier_net/net_newest-0000.params";
const std::string json_file = "model/cifar10.CifarNetwork/model_newest-symbol.json";
const std::string param_file = "model/cifar10.CifarNetwork/model_newest-0000.params";
//const std::vector<std::string> input_keys = {"data"};
const std::vector<std::string> input_keys = {"data"};
const std::vector<std::vector<mx_uint>> input_shapes = {{1,3,32,32}};
......
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