Skip to content
Snippets Groups Projects
Commit ec3f56ed authored by Sebastian Nickels's avatar Sebastian Nickels
Browse files

Fixed tests and reverted _label change since it is necessary for MXNet

parent 1812de35
Branches
No related tags found
1 merge request!17Shared code, updated for CNNArchLang, etc.
Pipeline #144203 failed
...@@ -7,7 +7,7 @@ from mxnet import nd ...@@ -7,7 +7,7 @@ from mxnet import nd
class ${tc.fileNameWithoutEnding}: class ${tc.fileNameWithoutEnding}:
_input_names_ = [${tc.join(tc.architectureInputs, ",", "'", "'")}] _input_names_ = [${tc.join(tc.architectureInputs, ",", "'", "'")}]
_output_names_ = [${tc.join(tc.architectureOutputs, ",", "'", "'")}] _output_names_ = [${tc.join(tc.architectureOutputs, ",", "'", "_label'")}]
def __init__(self): def __init__(self):
self._data_dir = "${tc.dataPath}/" self._data_dir = "${tc.dataPath}/"
......
...@@ -127,7 +127,7 @@ public class GenerationTest extends AbstractSymtabTest { ...@@ -127,7 +127,7 @@ public class GenerationTest extends AbstractSymtabTest {
Log.getFindings().clear(); Log.getFindings().clear();
String[] args = {"-m", "src/test/resources/invalid_tests", "-r", "MultipleOutputs"}; String[] args = {"-m", "src/test/resources/invalid_tests", "-r", "MultipleOutputs"};
CNNArch2GluonCli.main(args); CNNArch2GluonCli.main(args);
assertTrue(Log.getFindings().size() == 2); assertTrue(Log.getFindings().size() == 3);
} }
@Test @Test
...@@ -135,7 +135,7 @@ public class GenerationTest extends AbstractSymtabTest { ...@@ -135,7 +135,7 @@ public class GenerationTest extends AbstractSymtabTest {
Log.getFindings().clear(); Log.getFindings().clear();
String[] args = {"-m", "src/test/resources/invalid_tests", "-r", "MultipleStreams"}; String[] args = {"-m", "src/test/resources/invalid_tests", "-r", "MultipleStreams"};
CNNArch2GluonCli.main(args); CNNArch2GluonCli.main(args);
assertTrue(Log.getFindings().size() == 2); assertTrue(Log.getFindings().size() == 1);
} }
@Test @Test
......
...@@ -7,7 +7,7 @@ from mxnet import nd ...@@ -7,7 +7,7 @@ from mxnet import nd
class CNNDataLoader_Alexnet: class CNNDataLoader_Alexnet:
_input_names_ = ['data'] _input_names_ = ['data']
_output_names_ = ['predictions'] _output_names_ = ['predictions_label']
def __init__(self): def __init__(self):
self._data_dir = "data/Alexnet/" self._data_dir = "data/Alexnet/"
......
...@@ -7,7 +7,7 @@ from mxnet import nd ...@@ -7,7 +7,7 @@ from mxnet import nd
class CNNDataLoader_CifarClassifierNetwork: class CNNDataLoader_CifarClassifierNetwork:
_input_names_ = ['data'] _input_names_ = ['data']
_output_names_ = ['softmax'] _output_names_ = ['softmax_label']
def __init__(self): def __init__(self):
self._data_dir = "data/CifarClassifierNetwork/" self._data_dir = "data/CifarClassifierNetwork/"
......
...@@ -7,7 +7,7 @@ from mxnet import nd ...@@ -7,7 +7,7 @@ from mxnet import nd
class CNNDataLoader_VGG16: class CNNDataLoader_VGG16:
_input_names_ = ['data'] _input_names_ = ['data']
_output_names_ = ['predictions'] _output_names_ = ['predictions_label']
def __init__(self): def __init__(self):
self._data_dir = "data/VGG16/" self._data_dir = "data/VGG16/"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment