Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
autonomousdriving
torcs_dl
Commits
e659b7a3
Commit
e659b7a3
authored
Jun 18, 2018
by
Svetlana
Browse files
CMake fix: link to mxnet. Components fixes. Scripts fixes.
parent
bd4cf7b0
Changes
6
Show whitespace changes
Inline
Side-by-side
TorcsEMAMGenerator/src/main/java/de/monticore/lang/monticar/torcs_dl/EMADLGeneratorImpl.java
View file @
e659b7a3
...
...
@@ -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
;
}
}
TorcsEMAMGenerator/src/main/java/de/monticore/lang/monticar/torcs_dl/Generator.java
View file @
e659b7a3
...
...
@@ -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
();
...
...
TorcsEMAMGenerator/src/main/models/dp/Mastercomponent.emadl
View file @
e659b7a3
...
...
@@ -7,12 +7,12 @@ component Mastercomponent {
out
Q
(
0
:
1
)^{
3
,
1
,
1
}
commandsOut
;
instance
Imagepreprocessing
ip
;
instance
Dpnet
d
n
;
instance
Dpnet
d
pnet
;
instance
Drivercontroller
dc
;
connect
imageIn
->
ip
.
imageIn
;
connect
ip
.
imageOut
->
d
n
.
image
;
connect
d
n
.
predictions
->
dc
.
commandsOut
;
connect
ip
.
imageOut
->
d
pnet
.
image
;
connect
d
pnet
.
predictions
->
dc
.
affordanceIn
;
connect
dc
.
commandsOut
->
commandsOut
;
}
\ No newline at end of file
TorcsEMAMGenerator/src/main/resources/scripts/build_all.sh
View file @
e659b7a3
%
!/bin/bash
#
!/bin/bash
echo
"Building Mastercomponent"
cd
Mastercomponent
...
...
TorcsEMAMGenerator/src/main/resources/scripts/run_all.sh
View file @
e659b7a3
%
!/bin/bash
#
!/bin/bash
xterm
-T
ROSCORE
-e
roscore &
...
...
TorcsEMAMGenerator/src/main/resources/torcs/build.sh
View file @
e659b7a3
%
!/bin/bash
#
!/bin/bash
#source devel/setup.bash#
#catkin_make
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment