Skip to content

Commit

Permalink
feat: rename workspace (#9)
Browse files Browse the repository at this point in the history
Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
  • Loading branch information
isamu-takagi authored May 30, 2024
1 parent 3185c75 commit 31223da
Show file tree
Hide file tree
Showing 48 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ RUN mkdir /ws
RUN git clone --depth 1 https://github.com/AutomotiveAIChallenge/aichallenge-2024 /ws/repository
RUN mv /ws/repository/aichallenge /aichallenge
RUN rm -rf /aichallenge/simulator
RUN rm -rf /aichallenge/autoware/src/aichallenge_submit
RUN rm -rf /aichallenge/workspace/src/aichallenge_submit
RUN chmod 757 /aichallenge

COPY aichallenge/simulator/ /aichallenge/simulator/
COPY submit/aichallenge_submit.tar.gz /ws
RUN tar zxf /ws/aichallenge_submit.tar.gz -C /aichallenge/autoware/src
RUN tar zxf /ws/aichallenge_submit.tar.gz -C /aichallenge/workspace/src
RUN rm -rf /ws

RUN bash -c ' \
source /autoware/install/setup.bash; \
cd /aichallenge/autoware; \
cd /aichallenge/workspace; \
rosdep update; \
rosdep install -y -r -i --from-paths src --ignore-src --rosdistro $ROS_DISTRO; \
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release'
Expand Down
4 changes: 2 additions & 2 deletions aichallenge/build_autoware.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

if [[ ${1} == "clean" ]]; then
echo "clean build"
rm -r autoware/build/* autoware/install/*
rm -r ./workspace/build/* ./workspace/install/*
fi

cd ./autoware || exit
cd ./workspace || exit
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release
2 changes: 1 addition & 1 deletion aichallenge/run_autoware.bash
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# shellcheck disable=SC1091
source /aichallenge/autoware/install/setup.bash
source /aichallenge/workspace/install/setup.bash
sudo ip link set multicast on lo
ros2 launch aichallenge_system_launch aichallenge_system.launch.xml
4 changes: 2 additions & 2 deletions aichallenge/run_evaluation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mkdir "$OUTPUT_DIRECTORY"
cd "$OUTPUT_DIRECTORY" || exit

# shellcheck disable=SC1091
source /aichallenge/autoware/install/setup.bash
source /aichallenge/workspace/install/setup.bash
sudo ip link set multicast on lo
sudo sysctl -w net.core.rmem_max=2147483647 >/dev/null

Expand Down Expand Up @@ -62,7 +62,7 @@ wait $PID_AUTOWARE

# Convert result
echo "Convert result"
python3 /aichallenge/autoware/src/aichallenge_system/script/result-converter.py 60 11
python3 /aichallenge/workspace/src/aichallenge_system/script/result-converter.py 60 11

# Compress rosbag
echo "Compress rosbag"
Expand Down
2 changes: 1 addition & 1 deletion aichallenge/run_simulator.bash
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# shellcheck disable=SC1091
source /aichallenge/autoware/install/setup.bash
source /aichallenge/workspace/install/setup.bash
sudo ip link set multicast on lo
/aichallenge/simulator/AWSIM.x86_64
File renamed without changes.
2 changes: 1 addition & 1 deletion create_submit_file.bash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

tar zcvf submit/aichallenge_submit.tar.gz -C ./aichallenge/autoware/src aichallenge_submit
tar zcvf submit/aichallenge_submit.tar.gz -C ./aichallenge/workspace/src aichallenge_submit

0 comments on commit 31223da

Please sign in to comment.