Updated README, updated folder structure

.gitlab-ci.yml

@@ -26,7 +26,7 @@ TestMXNET:
   stage: linux
   image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/applications/mnistcalculator/mxnet:v0.0.3
   script: 
-  - cd example
+  - cd mxnet
   - ./prepare.sh
   - ./build.sh
   - RES=$(./build/src/cpp/DigitCalculator resources/images/1.png resources/images/2.png resources/images/3.png resources/images/4.png resources/images/5.png resources/images/6.png)
@@ -37,7 +37,7 @@ TestCAFFE2:
   stage: linux
   image: registry.git.rwth-aachen.de/monticore/embeddedmontiarc/applications/mnistcalculator/caffe2:v0.0.2
   script: 
-  - cd example_caffe2
+  - cd caffe2
   - ./build.sh
-  - RES=$(./build/src/cpp/DigitCalculator test_img/2.jpg test_img/3.jpg test_img/4.png test_img/6.png test_img/2.jpg test_img/3.jpg)
+  - RES=$(./build/src/cpp/DigitCalculator resources/images/2.jpg resources/images/3.jpg resources/images/4.png resources/images/6.png resources/images/2.jpg resources/images/3.jpg)
   - "if [[ $RES != *\"SUM: 857\"* ]]; then echo \"Wrong result:\" $RES; exit 1; fi;"

README.md

@@ -7,3 +7,6 @@
 3. Deep Learning Framework **MXNet**.
 4. Armadillo (at least armadillo version 6.600 must be used) [Official instructions at Armadillo Website](http://arma.sourceforge.net/download.html).
 4. OpenCV
+
+## MXNet and Caffe2
+For detailed instructions on how to run the MXNet and Caffe2 example, see the README in the corresponding folder.
\ No newline at end of file

example_caffe2/README.md → caffe2/README.md

@@ -17,7 +17,7 @@ bash build.sh
 
 Finally, run the calculator as follows:
 ```
-./build/src/cpp/DigitCalculator ./test_img/3.jpg
+./build/src/cpp/DigitCalculator test_img/2.jpg test_img/3.jpg test_img/4.png test_img/6.png test_img/2.jpg test_img/3.jpg
 ```
 
 You can try different images from the provided `/test_img` directory or even create your own images for testing. Note that the application program DigitCalculator will automatically rescale the given input image to the size 28x28.

example/README.md → mxnet/README.md

@@ -24,10 +24,12 @@ bash build.sh
 
 Finally, run the calculator as follows:
 ```
-./build/src/cpp/DigitCalculator ./test_img/3.jpg
+./build/src/cpp/DigitCalculator resources/images/1.png resources/images/2.png resources/images/3.png resources/images/4.png resources/images/5.png resources/images/6.png
 ```
 
-You can try different images from the provided `/test_img` directory or even create your own images for testing. Note that the application program DigitCalculator will automatically rescale the given input image to the size 32x32.
+You can try different images from the provided `/resources/images` directory or even create your own images for testing. Note that the application program DigitCalculator will automatically rescale the given input image to the size 32x32.
+
+Note: Currently, the mxnet example uses CIFAR-10 data, not MNIST!
 
 
 ## Troubleshooting Help