Commit 8d8f7ce8 authored by nilsfreyer's avatar nilsfreyer

Merge branch 'oneclick_nn_training' of...

Merge branch 'oneclick_nn_training' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/EMADL2CPP into oneclick_nn_training
parents 08c53f8a b333663a
Pipeline #109885 failed with stage
in 1 minute and 52 seconds
...@@ -43,7 +43,7 @@ integrationMXNetJobLinux: ...@@ -43,7 +43,7 @@ integrationMXNetJobLinux:
integrationCaffe2JobLinux: integrationCaffe2JobLinux:
stage: linux stage: linux
image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emadl2cpp/integrationtests/caffe2:v0.0.1 image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/generators/emadl2cpp/integrationtests/caffe2:v0.0.2
script: script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=IntegrationCaffe2Test - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=IntegrationCaffe2Test
only: only:
...@@ -52,7 +52,7 @@ integrationCaffe2JobLinux: ...@@ -52,7 +52,7 @@ integrationCaffe2JobLinux:
masterJobWindows: masterJobWindows:
stage: windows stage: windows
script: script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=!IntegrationMXNetTest - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=!Integration*
tags: tags:
- Windows10 - Windows10
except: except:
...@@ -62,7 +62,7 @@ BranchJobLinux: ...@@ -62,7 +62,7 @@ BranchJobLinux:
stage: linux stage: linux
image: maven:3-jdk-8 image: maven:3-jdk-8
script: script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=!IntegrationMXNetTest - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=!Integration*
- cat target/site/jacoco/index.html - cat target/site/jacoco/index.html
except: except:
- master - master
...@@ -74,7 +74,7 @@ public class IntegrationCaffe2Test extends AbstractSymtabTest { ...@@ -74,7 +74,7 @@ public class IntegrationCaffe2Test extends AbstractSymtabTest {
public void testDontRetrain1() { public void testDontRetrain1() {
// The training hash is stored during the first training, so the second one is skipped // The training hash is stored during the first training, so the second one is skipped
Log.getFindings().clear(); Log.getFindings().clear();
String[] args = {"-m", "src/test/resources/models/", "-r", "cNNCalculator.Network", "-b", "CAFFE2"}; String[] args = {"-m", "src/test/resources/models/", "-r", "cifar10.Cifar10Classifier", "-b", "CAFFE2"};
EMADLGeneratorCli.main(args); EMADLGeneratorCli.main(args);
assertTrue(Log.getFindings().isEmpty()); assertTrue(Log.getFindings().isEmpty());
...@@ -86,18 +86,18 @@ public class IntegrationCaffe2Test extends AbstractSymtabTest { ...@@ -86,18 +86,18 @@ public class IntegrationCaffe2Test extends AbstractSymtabTest {
deleteHashFile(); deleteHashFile();
} }
@Test // @Test
public void testForceRetrain() { // public void testForceRetrain() {
// The training hash is written manually, but training is forced // // The training hash is written manually, but training is forced
Log.getFindings().clear(); // Log.getFindings().clear();
createHashFile(); // createHashFile();
//
String[] args = {"-m", "src/test/resources/models/", "-r", "cNNCalculator.Network", "-b", "CAFFE2", "-f", "y"}; // String[] args = {"-m", "src/test/resources/models/", "-r", "cNNCalculator.Network", "-b", "CAFFE2", "-f", "y"};
EMADLGeneratorCli.main(args); // EMADLGeneratorCli.main(args);
assertTrue(Log.getFindings().isEmpty()); // assertTrue(Log.getFindings().isEmpty());
//
deleteHashFile(); // deleteHashFile();
} // }
......
...@@ -42,3 +42,11 @@ RUN cd pytorch && cd build && make install ...@@ -42,3 +42,11 @@ RUN cd pytorch && cd build && make install
RUN python -c 'from caffe2.python import core' 2>/dev/null && echo "Success" || echo "Failure" RUN python -c 'from caffe2.python import core' 2>/dev/null && echo "Success" || echo "Failure"
RUN pip install lmdb
RUN apt-get update && \
apt-get install -y --no-install-recommends \
liblapack-dev libblas-dev libboost-dev libarmadillo-dev && \
rm -rf /var/lib/apt/lists/*
RUN python -c 'import lmdb' && echo "LMDB success" || echo "LMDB failure"
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