Commit e00a3860 authored by Sebastian Nickels's avatar Sebastian Nickels

Replaced dependency to CNNArch2MXNet with dependency to CNNArch2X

parent 52770ada
Pipeline #157646 failed with stages
in 14 seconds
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. --> <!-- .. SE-Libraries .................................................. -->
<CNNArch.version>0.3.1-SNAPSHOT</CNNArch.version> <CNNArch.version>0.3.1-SNAPSHOT</CNNArch.version>
<CNNTrain.version>0.3.0-SNAPSHOT</CNNTrain.version> <CNNTrain.version>0.3.0-SNAPSHOT</CNNTrain.version>
<CNNArch2MXNet.version>0.2.16-SNAPSHOT</CNNArch2MXNet.version> <CNNArch2X.version>0.0.1-SNAPSHOT</CNNArch2X.version>
<embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator> <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
<dependency> <dependency>
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnnarch-mxnet-generator</artifactId> <artifactId>cnnarch-generator</artifactId>
<version>${CNNArch2MXNet.version}</version> <version>${CNNArch2X.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
*/ */
package de.monticore.lang.monticar.cnnarch.caffe2generator; package de.monticore.lang.monticar.cnnarch.caffe2generator;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNArch2MxNet; import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.Target; import de.monticore.lang.monticar.cnnarch.generator.DataPathConfigParser;
import de.monticore.lang.monticar.cnnarch.generator.Target;
import de.monticore.lang.monticar.cnnarch.DataPathConfigParser;
import de.monticore.lang.monticar.cnnarch._cocos.CNNArchCocos; import de.monticore.lang.monticar.cnnarch._cocos.CNNArchCocos;
import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol; import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureElementSymbol; import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureElementSymbol;
...@@ -38,7 +38,7 @@ import java.io.IOException; ...@@ -38,7 +38,7 @@ import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class CNNArch2Caffe2 extends CNNArch2MxNet { public class CNNArch2Caffe2 extends CNNArchGenerator {
public CNNArch2Caffe2() { public CNNArch2Caffe2() {
architectureSupportChecker = new CNNArch2Caffe2ArchitectureSupportChecker(); architectureSupportChecker = new CNNArch2Caffe2ArchitectureSupportChecker();
......
package de.monticore.lang.monticar.cnnarch.caffe2generator; package de.monticore.lang.monticar.cnnarch.caffe2generator;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.ArchitectureSupportChecker; import de.monticore.lang.monticar.cnnarch.generator.ArchitectureSupportChecker;
public class CNNArch2Caffe2ArchitectureSupportChecker extends ArchitectureSupportChecker { public class CNNArch2Caffe2ArchitectureSupportChecker extends ArchitectureSupportChecker {
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
*/ */
package de.monticore.lang.monticar.cnnarch.caffe2generator; package de.monticore.lang.monticar.cnnarch.caffe2generator;
import de.monticore.lang.monticar.cnnarch.CNNArchGenerator; import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.GenericCNNArchCli; import de.monticore.lang.monticar.cnnarch.generator.GenericCNNArchCli;
public class CNNArch2Caffe2Cli { public class CNNArch2Caffe2Cli {
public static void main(String[] args) { public static void main(String[] args) {
......
package de.monticore.lang.monticar.cnnarch.caffe2generator; package de.monticore.lang.monticar.cnnarch.caffe2generator;
import de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedLayers; import de.monticore.lang.monticar.cnnarch.predefined.AllPredefinedLayers;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.LayerSupportChecker; import de.monticore.lang.monticar.cnnarch.generator.LayerSupportChecker;
public class CNNArch2Caffe2LayerSupportChecker extends LayerSupportChecker { public class CNNArch2Caffe2LayerSupportChecker extends LayerSupportChecker {
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
*/ */
package de.monticore.lang.monticar.cnnarch.caffe2generator; package de.monticore.lang.monticar.cnnarch.caffe2generator;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.LayerNameCreator; import de.monticore.lang.monticar.cnnarch.generator.LayerNameCreator;
import de.monticore.lang.monticar.cnnarch.mxnetgenerator.Target; import de.monticore.lang.monticar.cnnarch.generator.Target;
import de.monticore.lang.monticar.cnnarch._symboltable.*; import de.monticore.lang.monticar.cnnarch._symboltable.*;
import de.monticore.lang.monticar.cnnarch.predefined.Sigmoid; import de.monticore.lang.monticar.cnnarch.predefined.Sigmoid;
......
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