leggedrobotics · shinsoo0203 · Jul 31, 2021 · Jul 31, 2021 · Aug 1, 2021 · Aug 2, 2021
diff --git a/darknet b/darknet
diff --git a/darknet_ros/CMakeLists.txt b/darknet_ros/CMakeLists.txt
@@ -23,12 +23,13 @@ if (CUDA_FOUND)
     CUDA_NVCC_FLAGS
     ${CUDA_NVCC_FLAGS};
     -O3
-    -gencode arch=compute_30,code=sm_30
-    -gencode arch=compute_35,code=sm_35
-    -gencode arch=compute_50,code=[sm_50,compute_50]
-    -gencode arch=compute_52,code=[sm_52,compute_52]
-    -gencode arch=compute_61,code=sm_61
-    -gencode arch=compute_62,code=sm_62
+    #-gencode arch=compute_30,code=sm_30
+    #-gencode arch=compute_35,code=sm_35
+    #-gencode arch=compute_50,code=[sm_50,compute_50]
+    #-gencode arch=compute_52,code=[sm_52,compute_52]
+    #-gencode arch=compute_61,code=sm_61
+    #-gencode arch=compute_62,code=sm_62
+    -gencode arch=compute_75,code=sm_75
   )
   add_definitions(-DGPU)
 else()

diff --git a/darknet_ros/config/csresnext50.yaml b/darknet_ros/config/csresnext50.yaml
@@ -0,0 +1,90 @@
+yolo_model:
+
+  config_file:
+    name: csresnext50-panet-spp-original-optimal.cfg
+  weight_file:
+    name: csresnext50-panet-spp-original-optimal_final.weights
+  threshold:
+    value: 0.3
+  detection_classes:
+    names:
+      - person
+      - bicycle
+      - car
+      - motorbike
+      - aeroplane
+      - bus
+      - train
+      - truck
+      - boat
+      - traffic light
+      - fire hydrant
+      - stop sign
+      - parking meter
+      - bench
+      - bird
+      - cat
+      - dog
+      - horse
+      - sheep
+      - cow
+      - elephant
+      - bear
+      - zebra
+      - giraffe
+      - backpack
+      - umbrella
+      - handbag
+      - tie
+      - suitcase
+      - frisbee
+      - skis
+      - snowboard
+      - sports ball
+      - kite
+      - baseball bat
+      - baseball glove
+      - skateboard
+      - surfboard
+      - tennis racket
+      - bottle
+      - wine glass
+      - cup
+      - fork
+      - knife
+      - spoon
+      - bowl
+      - banana
+      - apple
+      - sandwich
+      - orange
+      - broccoli
+      - carrot
+      - hot dog
+      - pizza
+      - donut
+      - cake
+      - chair
+      - sofa
+      - pottedplant
+      - bed
+      - diningtable
+      - toilet
+      - tvmonitor
+      - laptop
+      - mouse
+      - remote
+      - keyboard
+      - cell phone
+      - microwave
+      - oven
+      - toaster
+      - sink
+      - refrigerator
+      - book
+      - clock
+      - vase
+      - scissors
+      - teddy bear
+      - hair drier
+      - toothbrush
diff --git a/darknet_ros/config/stereo_ros.yaml b/darknet_ros/config/stereo_ros.yaml
@@ -0,0 +1,33 @@
+subscribers:
+
+  camera_reading:
+    topic: /camera/rgb/image_raw
+    queue_size: 1
+
+actions:
+
+  camera_reading:
+    name: /darknet_ros/check_for_objects
+
+publishers:
+
+  object_detector:
+    topic: /darknet_ros/found_object
+    queue_size: 1
+    latch: false
+
+  bounding_boxes:
+    topic: /darknet_ros/bounding_boxes
+    queue_size: 1
+    latch: false
+
+  detection_image:
+    topic: /darknet_ros/detection_image
+    queue_size: 1
+    latch: true
+
+image_view:
+
+  enable_opencv: true
+  wait_key_delay: 1
+  enable_console_output: true
diff --git a/darknet_ros/config/yolov3.yaml b/darknet_ros/config/yolov3.yaml
@@ -5,86 +5,12 @@ yolo_model:
   weight_file:
     name: yolov3.weights
   threshold:
-    value: 0.3
+    value: 0.7
   detection_classes:
     names:
       - person
       - bicycle
       - car
       - motorbike
-      - aeroplane
       - bus
-      - train
       - truck
-      - boat
-      - traffic light
-      - fire hydrant
-      - stop sign
-      - parking meter
-      - bench
-      - bird
-      - cat
-      - dog
-      - horse
-      - sheep
-      - cow
-      - elephant
-      - bear
-      - zebra
-      - giraffe
-      - backpack
-      - umbrella
-      - handbag
-      - tie
-      - suitcase
-      - frisbee
-      - skis
-      - snowboard
-      - sports ball
-      - kite
-      - baseball bat
-      - baseball glove
-      - skateboard
-      - surfboard
-      - tennis racket
-      - bottle
-      - wine glass
-      - cup
-      - fork
-      - knife
-      - spoon
-      - bowl
-      - banana
-      - apple
-      - sandwich
-      - orange
-      - broccoli
-      - carrot
-      - hot dog
-      - pizza
-      - donut
-      - cake
-      - chair
-      - sofa
-      - pottedplant
-      - bed
-      - diningtable
-      - toilet
-      - tvmonitor
-      - laptop
-      - mouse
-      - remote
-      - keyboard
-      - cell phone
-      - microwave
-      - oven
-      - toaster
-      - sink
-      - refrigerator
-      - book
-      - clock
-      - vase
-      - scissors
-      - teddy bear
-      - hair drier
-      - toothbrush
diff --git a/darknet_ros/config/yolov3_(원본).yaml b/darknet_ros/config/yolov3_(원본).yaml
@@ -0,0 +1,90 @@
+yolo_model:
+
+  config_file:
+    name: yolov3.cfg
+  weight_file:
+    name: yolov3.weights
+  threshold:
+    value: 0.6
+  detection_classes:
+    names:
+      - person
+      - bicycle
+      - car
+      - motorbike
+      - aeroplane
+      - bus
+      - train
+      - truck
+      - boat
+      - traffic light
+      - fire hydrant
+      - stop sign
+      - parking meter
+      - bench
+      - bird
+      - cat
+      - dog
+      - horse
+      - sheep
+      - cow
+      - elephant
+      - bear
+      - zebra
+      - giraffe
+      - backpack
+      - umbrella
+      - handbag
+      - tie
+      - suitcase
+      - frisbee
+      - skis
+      - snowboard
+      - sports ball
+      - kite
+      - baseball bat
+      - baseball glove
+      - skateboard
+      - surfboard
+      - tennis racket
+      - bottle
+      - wine glass
+      - cup
+      - fork
+      - knife
+      - spoon
+      - bowl
+      - banana
+      - apple
+      - sandwich
+      - orange
+      - broccoli
+      - carrot
+      - hot dog
+      - pizza
+      - donut
+      - cake
+      - chair
+      - sofa
+      - pottedplant
+      - bed
+      - diningtable
+      - toilet
+      - tvmonitor
+      - laptop
+      - mouse
+      - remote
+      - keyboard
+      - cell phone
+      - microwave
+      - oven
+      - toaster
+      - sink
+      - refrigerator
+      - book
+      - clock
+      - vase
+      - scissors
+      - teddy bear
+      - hair drier
+      - toothbrush
diff --git a/darknet_ros/launch/darknet_ros.launch b/darknet_ros/launch/darknet_ros.launch
@@ -3,15 +3,16 @@
 <launch>
   <!-- Console launch prefix -->
   <arg name="launch_prefix" default=""/>
-  <arg name="image" default="/camera/rgb/image_raw" />
+  <!--arg name="image" default="/camera/rgb/image_raw" /-->
+  <arg name="image" default="/zed2/zed_node/stereo/image_rect_color" />
 
   <!-- Config and weights folder. -->
   <arg name="yolo_weights_path"          default="$(find darknet_ros)/yolo_network_config/weights"/>
   <arg name="yolo_config_path"           default="$(find darknet_ros)/yolo_network_config/cfg"/>
 
   <!-- ROS and network parameter files -->
   <arg name="ros_param_file"             default="$(find darknet_ros)/config/ros.yaml"/>
-  <arg name="network_param_file"         default="$(find darknet_ros)/config/yolov2-tiny.yaml"/>
+  <arg name="network_param_file"         default="$(find darknet_ros)/config/yolov3.yaml"/>
 
   <!-- Load parameters -->
   <rosparam command="load" ns="darknet_ros" file="$(arg ros_param_file)"/>