diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad55b7124fb0dd555fa9aee856eaba48ce4d6732..e10bbb10e8b6cb342bcfd099ce7f67a93de99539 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,5 +58,5 @@ TestEMADLMavenPlugin: script: - mv /mxnet/build/libmxnet.so /mxnet/build/libmxnet.a /usr/lib/ - cd emadl-maven-plugin - - mvn emadl:train -s settings.xml + - mvn dependency:resolve emadl:train -s settings.xml diff --git a/emadl-maven-plugin/pom.xml b/emadl-maven-plugin/pom.xml index 34ab4e46733827c85b2d85c84c54e47c49dbf916..2b109ececc424d2c746a0193369bf9dc899a52ae 100644 --- a/emadl-maven-plugin/pom.xml +++ b/emadl-maven-plugin/pom.xml @@ -14,6 +14,15 @@ UTF-8 + + + de.monticore.lang.monticar.datasets + mnist + 1 + dataset + + + diff --git a/emadl-maven-plugin/settings.xml b/emadl-maven-plugin/settings.xml index 23835257ee69c98b90d7956e84382ddc2e46226d..d6fc5c33750f69c595e9d691c5874ddcecb4f72c 100644 --- a/emadl-maven-plugin/settings.xml +++ b/emadl-maven-plugin/settings.xml @@ -14,6 +14,18 @@ + + gitlab-maven + + + + Deploy-Token + KJkmCZosey-A8XBES2Fy + + + + + se-nexus cibuild @@ -62,6 +74,12 @@ + + gitlab-maven + https://git.rwth-aachen.de/api/v4/projects/57999/packages/maven + + + @@ -76,13 +94,13 @@ true true - - icm - http://maven.icm.edu.pl/artifactory/repo/ - - - - + + icm + http://maven.icm.edu.pl/artifactory/repo/ + + + + diff --git a/emadl-maven-plugin/src/main/emadl/calculator/Network.tag b/emadl-maven-plugin/src/main/emadl/calculator/Network.tag index 01bbd0e1573c7693aeb38303c7df62bd1d9e6183..7618a535eb290401cf041254b84147289aef83a8 100644 --- a/emadl-maven-plugin/src/main/emadl/calculator/Network.tag +++ b/emadl-maven-plugin/src/main/emadl/calculator/Network.tag @@ -1,8 +1,8 @@ /* (c) https://github.com/MontiCore/monticore */ package calculator; -conforms to dltag.DataPathTagSchema; +conforms to artifacttag.DatasetArtifactTagSchema; tags NeuronalNetwork { - tag Network with DataPath = {path = src/main/resources/training_data, type = HDF5}; + tag Network with DatasetArtifact = {artifact = de.monticore.lang.monticar.datasets:mnist:1, type = HDF5}; } diff --git a/emadl-maven-plugin/src/main/resources/training_data/test.h5 b/emadl-maven-plugin/src/main/resources/training_data/test.h5 deleted file mode 100644 index 2441fa8a99e54e8d3a7ba06ecde5521997399c0b..0000000000000000000000000000000000000000 Binary files a/emadl-maven-plugin/src/main/resources/training_data/test.h5 and /dev/null differ diff --git a/emadl-maven-plugin/src/main/resources/training_data/train.h5 b/emadl-maven-plugin/src/main/resources/training_data/train.h5 deleted file mode 100644 index d525ad53f03d0cd84a14ad177215fc64b8c3b667..0000000000000000000000000000000000000000 Binary files a/emadl-maven-plugin/src/main/resources/training_data/train.h5 and /dev/null differ