Merge branch 'se-nexus' into 'master'

Removed github deploy plugin, changed repository to se nexus

See merge request !4

.gitlab-ci.yml

-image: maven:3-jdk-8
+#
+#
+#  ******************************************************************************
+#  MontiCAR Modeling Family, www.se-rwth.de
+#  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+#  All rights reserved.
+#
+#  This project is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+# *******************************************************************************
+#
 
-build:
-  script: "mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml"
+stages:
+- windows
+- linux
+
+masterJobLinux:
+  stage: linux
+  image: maven:3-jdk-8
+  script: 
+  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings settings.xml
+  only:
+  - master
+  
+masterJobWindows:
+  stage: windows
+  script: 
+  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
+  tags:
+  - Windows10
+
+BranchJobLinux:
+  stage: linux
+  image: maven:3-jdk-8
+  script: 
+  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
+  except:
+  - master

README.md

+# EMADL2CPP
+Generates CPP/Python code for EmbeddedMontiArcDL.
+See example project [EMADL-Demo](https://git.rwth-aachen.de/thomas.timmermanns/EMADL-Demo) for more information on how the generated code can be used.
\ No newline at end of file

pom.xml

@@ -18,7 +18,7 @@
     <emadl.version>0.2.1-SNAPSHOT</emadl.version>
     <CNNTrain.version>0.2.1-SNAPSHOT</CNNTrain.version>
     <cnnarch-generator.version>0.2.1-SNAPSHOT</cnnarch-generator.version>
-    <embedded-montiarc-math-generator>0.0.9-SNAPSHOT</embedded-montiarc-math-generator>
+    <embedded-montiarc-math-generator>0.0.10</embedded-montiarc-math-generator>
     
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
@@ -27,7 +27,6 @@
         <jscience.version>4.3.1</jscience.version>
 
         <!-- .. Plugins ....................................................... -->
-        <monticore.plugin>4.5.3-SNAPSHOT</monticore.plugin>
         <assembly.plugin>2.5.4</assembly.plugin>
         <compiler.plugin>3.3</compiler.plugin>
         <source.plugin>2.4</source.plugin>
@@ -42,7 +41,6 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <github.global.server>github</github.global.server>
   </properties>
 
     <dependencies>
@@ -132,47 +130,6 @@
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
         <version>2.8.1</version>
-        <configuration>
-          <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/external-dependencies</altDeploymentRepository>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>com.github.github</groupId>
-        <artifactId>site-maven-plugin</artifactId>
-        <version>0.12</version>
-        <configuration>
-          <server>github</server>
-          <message>Maven artifacts for ${project.version} ${project.artifactId}</message>  <!-- git commit message -->
-          <noJekyll>true</noJekyll>                                  <!-- disable webpage processing -->
-          <outputDirectory>${project.build.directory}/external-dependencies</outputDirectory> <!-- matches distribution management repository url above -->
-          <branch>refs/heads/master</branch>                       <!-- remote branch name -->
-          <includes><include>**/*</include></includes>
-          <repositoryName>external-dependencies</repositoryName>      <!-- github repo name -->
-          <repositoryOwner>EmbeddedMontiArc</repositoryOwner>    <!-- github username  -->
-          <merge>true</merge>
-        </configuration>
-        <executions>
-          <!-- run site-maven-plugin's 'site' target as part of the build's normal 'deploy' phase -->
-          <execution>
-            <goals>
-              <goal>site</goal>
-            </goals>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- MontiCore Generation -->
-      <plugin>
-        <groupId>de.monticore.mojo</groupId>
-        <artifactId>monticore-maven-plugin</artifactId>
-        <version>${monticore.plugin}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
 
       <!-- Other Configuration -->
@@ -261,16 +218,15 @@
   </build>
 
 
-  <distributionManagement>
-    <repository>
-      <id>internal.repo</id>
-      <name>Temporary Staging Repository</name>
-      <url>file://${project.build.directory}/external-dependencies</url>
-    </repository>
-    <snapshotRepository>
-      <id>internal.repo</id>
-      <url>file://${project.build.directory}/external-dependencies</url>
-    </snapshotRepository>
-  </distributionManagement>
+    <distributionManagement>
+        <repository>
+            <id>se-nexus</id>
+            <url>https://nexus.se.rwth-aachen.de/content/repositories/embeddedmontiarc-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>se-nexus</id>
+            <url>https://nexus.se.rwth-aachen.de/content/repositories/embeddedmontiarc-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>
 

settings.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+     ******************************************************************************
+     MontiCAR Modeling Family, www.se-rwth.de
+     Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+     All rights reserved.
+
+     This project is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 3.0 of the License, or (at your option) any later version.
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this project. If not, see <http://www.gnu.org/licenses/>.
+    *******************************************************************************
+
+-->
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+  <pluginGroups>
+	<pluginGroup>org.mortbay.jetty</pluginGroup>
+	<pluginGroup>de.topobyte</pluginGroup>
+  </pluginGroups>
+
+  <proxies>
+  </proxies>
+
+  <servers>
+    <server>
+      <id>se-nexus</id>
+      <username>cibuild</username>
+      <password>${env.cibuild}</password>
+    </server> 
+
+     <server>
+      <id>github</id>
+      <username>travisbuilduser</username>
+      <password>${env.travisbuilduserpassword}</password>
+    </server>
+  </servers>
+
+  <mirrors>
+    <mirror>
+      <id>se-nexus</id>
+      <mirrorOf>external:*</mirrorOf>
+      <url>https://nexus.se.rwth-aachen.de/content/groups/public</url>
+    </mirror>	 
+  </mirrors>
+
+  <profiles>
+
+    <profile>
+      <id>se-nexus</id>
+      <repositories>
+        <repository>
+          <id>central</id>
+          <url>http://central</url>
+          <releases><enabled /></releases>
+          <snapshots><enabled /></snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>central</id>
+          <url>http://central</url>
+          <releases><enabled /></releases>
+          <snapshots><enabled /></snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>se-nexus</activeProfile>
+  </activeProfiles>  
+</settings>
\ No newline at end of file

src/test/resources/models/cifar10/ArgMax.emadl

@@ -6,11 +6,11 @@ component ArgMax<Z(1:oo) n = 2>{
 
     implementation Math{
          maxIndex = 0;
-         Q maxValue = inputVector(0);
+         Q maxValue = inputVector(0); //should be inputVector(1) but bug in EMAM2CPP
 
-         for i = 1:(n - 1)
+         for i = 2:n //should be 2:n but bug in EMAM2CPP
             if inputVector(i) > maxValue
-                maxIndex = i;
+                maxIndex = i - 1;
                 maxValue = inputVector(i);
             end
          end

src/test/resources/target_code/CNNPredictor_cifar10_cifar10Classifier_net.h

@@ -13,8 +13,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::vector<std::string> input_keys = {"data"};
     //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}};
     const bool use_gpu = false;
 
@@ -28,8 +28,8 @@ public:
         if(handle) MXPredFree(handle);
     }
 
-    void predict(const vector<float> &data,
-                 vector<float> &softmax){
+    void predict(const std::vector<float> &data,
+                 std::vector<float> &softmax){
         MXPredSetInput(handle, "data", data.data(), data.size());
         //MXPredSetInput(handle, "data", data.data(), data.size());
 

src/test/resources/target_code/cifar10_cifar10Classifier_calculateClass.h

@@ -18,10 +18,10 @@ void execute()
 {
 maxIndex = 0;
 double maxValue = inputVector(0);
-for( auto i=1;i<=(n-1);++i){
+for( auto i=2;i<=n;++i){
 if((inputVector(i) > maxValue)){
-maxIndex = i;
-maxValue = inputVector(i);
+maxIndex = i-1;
+maxValue = inputVector(i-1) ;
 }
 }
 }