[update] Update the version of 'pytorch_ros', 'docker-compose.xml', and 'README.md'

Author: ShigemichiMatsuzaki

README.md

@@ -1,33 +1,30 @@
 # enet-pytorch-docker
-Docker environment to use [PyTorch-ENet](https://github.com/davidtvs/PyTorch-ENet)
+
+Docker environment to use [pytorch_ros](https://github.com/ActiveIntelligentSystemsLab/pytorch_enet_ros/)
 
 # How to use
 ## Building the image
 ```
 make build
 ```
 
-## Running the codes in the container
-### Network training
-1. Example : Network training
-```
-docker-compose up pytorch-train
-```
-2. Visualization using Tensorboard
-```
-docker-compose up tensorboard  
-```
+## Running the ROS nodes in the container
 
-### ROS node
 1. Build (`catkin build`)
 ```
-docker-compose up build
+docker-compose up catkin-build
 ```
+
 2. Launch `roscore`
 ```
-docker-compose up pytorch-ros-master
+docker-compose up master
 ```
-3. Run a ROS node (`roslaunch pytorch_enet_ros pytorch_enet_ros.launch`)
+
+3. Run a ROS node (`roslaunch pytorch_ros pytorch_enet_ros.launch`)
 ```
-docker-compose up pytorch-ros-node
+docker-compose up pytorch-ros
 ```
+
+4. (Optional) Run `sh docker_ros_setup.sh` to set the environment variables in the host.
+   
+   If you want to run other nodes in the host and let them communicate with the nodes in the container, this is necessary.

catkin_ws/src/pytorch_enet_ros

@@ -1,32 +1,5 @@
 version: "2.3"
 services: 
-  pytorch-train:
-    container_name: pytorch-train
-    image: aisl/pytorch-enet:20.03-py3
-    runtime: nvidia
-    build: .
-    command: >
-      python /root/PyTorch-ENet/main.py -m train 
-      --save-dir /root/PyTorch-ENet/save/ENet_CamVid_matsuzaki_20190921/ 
-      --name my_cityscapes_20190921 
-      --dataset camvid 
-      --dataset-dir /tmp/dataset/CamVid/ 
-      --batch-size 8
-    volumes:
-      - ./PyTorch-ENet:/root/PyTorch-ENet
-      - /media/data/dataset/matsuzaki:/tmp/dataset
-    shm_size: 1G
-
-  tensorboard:
-    container_name: tensorboard
-    image: aisl/pytorch-enet:latest
-    command: tensorboard --logdir /root/PyTorch-ENet/runs
-    build: .
-    ports:
-      - 60006:6006
-    volumes:
-      - ./PyTorch-ENet:/root/PyTorch-ENet
-
   master:
     container_name: master
     image: ros:kinetic-ros-core
@@ -42,13 +15,11 @@ services:
     build: .
     runtime: nvidia
     image: aisl/pytorch-enet:20.03-py3
-    command: roslaunch pytorch_enet_ros pytorch_enet_ros.launch image:=/kinect2/qhd/image_color_rect
+    command: roslaunch pytorch_ros pytorch_enet_ros.launch image:=/kinect2/qhd/image_color_rect
     environment:
       - ROS_MASTER_URI=http://master:11311
-        #      - ROS_IP=172.24.0.3
     volumes:
       - ./catkin_ws/:/root/catkin_ws/
-      - ./PyTorch-ENet:/root/PyTorch-ENet
       - /media/data/dataset/matsuzaki:/tmp/dataset
     tty: true
     shm_size: 1G
@@ -63,7 +34,6 @@ services:
       - CMAKE_PREFIX_PATH=/opt/ros/melodic:${CMAKE_PREFIX_PATH}
     volumes:
       - ./catkin_ws/:/root/catkin_ws/
-      - ./PyTorch-ENet:/root/PyTorch-ENet
         #  - /media/data/dataset/matsuzaki:/tmp/dataset
     tty: true
     shm_size: 1G

docker-compose.yml

@@ -0,0 +1,14 @@
+#!/bin/sh
+# docker_ros_setup.sh
+#   set the ROS-related environment variables
+#   according to the docker container running 'roscore'
+
+#
+# Get an (virtual) IP address of a docker container named "master"
+#
+IP_ADDRESS=`docker inspect master | grep -E "IPAddress" | grep -o "[0-9]\+.[0-9]\+.[0-9]\+.[0-9]\+"`
+export ROS_MASTER_URI=http://$IP_ADDRESS:11311
+export ROS_IP="172.19.0.1" 
+
+echo "Docker ROS setup : $IP_ADDRESS"
+echo "ROS IP           : $ROS_IP"