From ec3f56edcc0a85f9c533e735af12a708b4c6fb4f Mon Sep 17 00:00:00 2001
From: Sebastian Nickels <snickels@foxfire.consulting>
Date: Mon, 27 May 2019 04:37:32 +0200
Subject: [PATCH] Fixed tests and reverted _label change since it is necessary
for MXNet
---
src/main/resources/templates/gluon/CNNDataLoader.ftl | 2 +-
.../lang/monticar/cnnarch/gluongenerator/GenerationTest.java | 4 ++--
src/test/resources/target_code/CNNDataLoader_Alexnet.py | 2 +-
.../target_code/CNNDataLoader_CifarClassifierNetwork.py | 2 +-
src/test/resources/target_code/CNNDataLoader_VGG16.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/templates/gluon/CNNDataLoader.ftl b/src/main/resources/templates/gluon/CNNDataLoader.ftl
index 6b3f12f2..126068a6 100644
--- a/src/main/resources/templates/gluon/CNNDataLoader.ftl
+++ b/src/main/resources/templates/gluon/CNNDataLoader.ftl
@@ -7,7 +7,7 @@ from mxnet import nd
class ${tc.fileNameWithoutEnding}:
_input_names_ = [${tc.join(tc.architectureInputs, ",", "'", "'")}]
- _output_names_ = [${tc.join(tc.architectureOutputs, ",", "'", "'")}]
+ _output_names_ = [${tc.join(tc.architectureOutputs, ",", "'", "_label'")}]
def __init__(self):
self._data_dir = "${tc.dataPath}/"
diff --git a/src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GenerationTest.java b/src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GenerationTest.java
index f0d9fa56..805d9b1a 100644
--- a/src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GenerationTest.java
+++ b/src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GenerationTest.java
@@ -127,7 +127,7 @@ public class GenerationTest extends AbstractSymtabTest {
Log.getFindings().clear();
String[] args = {"-m", "src/test/resources/invalid_tests", "-r", "MultipleOutputs"};
CNNArch2GluonCli.main(args);
- assertTrue(Log.getFindings().size() == 2);
+ assertTrue(Log.getFindings().size() == 3);
}
@Test
@@ -135,7 +135,7 @@ public class GenerationTest extends AbstractSymtabTest {
Log.getFindings().clear();
String[] args = {"-m", "src/test/resources/invalid_tests", "-r", "MultipleStreams"};
CNNArch2GluonCli.main(args);
- assertTrue(Log.getFindings().size() == 2);
+ assertTrue(Log.getFindings().size() == 1);
}
@Test
diff --git a/src/test/resources/target_code/CNNDataLoader_Alexnet.py b/src/test/resources/target_code/CNNDataLoader_Alexnet.py
index 482028ea..b9da1340 100644
--- a/src/test/resources/target_code/CNNDataLoader_Alexnet.py
+++ b/src/test/resources/target_code/CNNDataLoader_Alexnet.py
@@ -7,7 +7,7 @@ from mxnet import nd
class CNNDataLoader_Alexnet:
_input_names_ = ['data']
- _output_names_ = ['predictions']
+ _output_names_ = ['predictions_label']
def __init__(self):
self._data_dir = "data/Alexnet/"
diff --git a/src/test/resources/target_code/CNNDataLoader_CifarClassifierNetwork.py b/src/test/resources/target_code/CNNDataLoader_CifarClassifierNetwork.py
index 7765ca1a..91929328 100644
--- a/src/test/resources/target_code/CNNDataLoader_CifarClassifierNetwork.py
+++ b/src/test/resources/target_code/CNNDataLoader_CifarClassifierNetwork.py
@@ -7,7 +7,7 @@ from mxnet import nd
class CNNDataLoader_CifarClassifierNetwork:
_input_names_ = ['data']
- _output_names_ = ['softmax']
+ _output_names_ = ['softmax_label']
def __init__(self):
self._data_dir = "data/CifarClassifierNetwork/"
diff --git a/src/test/resources/target_code/CNNDataLoader_VGG16.py b/src/test/resources/target_code/CNNDataLoader_VGG16.py
index 7ea673f8..f607e7a8 100644
--- a/src/test/resources/target_code/CNNDataLoader_VGG16.py
+++ b/src/test/resources/target_code/CNNDataLoader_VGG16.py
@@ -7,7 +7,7 @@ from mxnet import nd
class CNNDataLoader_VGG16:
_input_names_ = ['data']
- _output_names_ = ['predictions']
+ _output_names_ = ['predictions_label']
def __init__(self):
self._data_dir = "data/VGG16/"
--
GitLab