Commit e659b7a3 authored by Svetlana's avatar Svetlana

CMake fix: link to mxnet. Components fixes. Scripts fixes.

parent bd4cf7b0
......@@ -48,6 +48,7 @@ public class EMADLGeneratorImpl implements GeneratorImpl {
cmake.setFileName("CMakeLists.txt");
String name = NameHelper.getNameTargetLanguage(componentInstanceSymbol.getFullName());
cmake.setFileContent(TemplateHelper.getCmakeCppTemplate().replace("${compName}", name));
cmake.setFileContent(cmake.getFileContent() + "target_link_libraries(" + name + " -lmxnet)");
return cmake;
}
}
......@@ -52,9 +52,8 @@ public class Generator {
FileUtils.copyDirectory(new File(RESOURCES_PATH+"torcs"), new File(TARGET_PATH_GENERATED+"torcs"));
Runtime.getRuntime().exec("chmod u+x "+TARGET_PATH_GENERATED+"torcs/build.sh");
Runtime.getRuntime().exec("chmod u+x "+TARGET_PATH_GENERATED+"torcs/run_all.sh");
FileUtils.copyDirectory(new File(RESOURCES_PATH+"dpnet"), new File(TARGET_PATH_GENERATED+"model/dpnet"));
FileUtils.copyDirectory(new File(RESOURCES_PATH+"dpnet"), new File(TARGET_PATH_GENERATED+"model/dp_mastercomponent_dpnet"));
} catch (IOException e) {
System.err.println("Failed to copy build and start scripts.");
e.printStackTrace();
......
......@@ -7,12 +7,12 @@ component Mastercomponent {
out Q(0:1)^{3,1,1} commandsOut;
instance Imagepreprocessing ip;
instance Dpnet dn;
instance Dpnet dpnet;
instance Drivercontroller dc;
connect imageIn -> ip.imageIn;
connect ip.imageOut -> dn.image;
connect dn.predictions -> dc.commandsOut;
connect ip.imageOut -> dpnet.image;
connect dpnet.predictions -> dc.affordanceIn;
connect dc.commandsOut -> commandsOut;
}
\ No newline at end of file
%!/bin/bash
#!/bin/bash
echo "Building Mastercomponent"
cd Mastercomponent
......
%!/bin/bash
#!/bin/bash
xterm -T ROSCORE -e roscore &
......@@ -9,4 +9,4 @@ xterm -T TORCSDriver -e torcs/src/driver/build/driver &
xterm -T TORCSCamera -e torcs/src/camera/build/camera &
xterm -T Mastercomponent -e Mastercomponent/build/coordinator/Coordinator_dp_mastercomponent &
\ No newline at end of file
xterm -T Mastercomponent -e Mastercomponent/build/coordinator/Coordinator_dp_mastercomponent &
%!/bin/bash
#!/bin/bash
#source devel/setup.bash#
#catkin_make
......
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