change filenames: *_python3.py => *.py

Python 3 was not well supported by ROS Melodic.
stretch_deep_perception required Python 3, which could
cause issues and confusion. To help clarify when code
used Python 3, the filenames had the pattern *_python3.py.

I've changed the filenames to remove this pattern,
since all of the ROS Noetic code will be using Python 3
by default, and ROS Noetic supports Python 3.

stretch_deep_perception/launch/stretch_detect_body_landmarks.launch

@@ -21,7 +21,7 @@
   <!-- -->
 
   <!-- BODY LANDMARK DETECTOR -->
-  <node name="body_landmark_detector" pkg="stretch_deep_perception" type="detect_body_landmarks_python3.py" output="screen">
+  <node name="body_landmark_detector" pkg="stretch_deep_perception" type="detect_body_landmarks.py" output="screen">
     <param name="debug_directory" type="string" value="$(arg debug_directory)"/>
   </node>
   <!-- -->

stretch_deep_perception/launch/stretch_detect_faces.launch

@@ -21,7 +21,7 @@
   <!-- -->
 
   <!-- FACIAL LANDMARK DETECTOR -->
-  <node name="face_detector" pkg="stretch_deep_perception" type="detect_faces_python3.py" output="screen">
+  <node name="face_detector" pkg="stretch_deep_perception" type="detect_faces.py" output="screen">
     <param name="debug_directory" type="string" value="$(arg debug_directory)"/>
   </node>
   <!-- -->

stretch_deep_perception/launch/stretch_detect_nearest_mouth.launch

@@ -21,7 +21,7 @@
   <!-- -->
   
   <!-- NEAREST MOUTH DETECTOR -->
-  <node name="nearest_mouth_detector" pkg="stretch_deep_perception" type="detect_nearest_mouth_python3.py" output="screen">
+  <node name="nearest_mouth_detector" pkg="stretch_deep_perception" type="detect_nearest_mouth.py" output="screen">
     <param name="debug_directory" type="string" value="$(arg debug_directory)"/>
   </node>
   <!-- -->

stretch_deep_perception/launch/stretch_detect_objects.launch

@@ -21,7 +21,7 @@
   <!-- -->
   
   <!-- OBJECT DETECTOR -->
-  <node name="object_detector" pkg="stretch_deep_perception" type="detect_objects_python3.py" output="screen">
+  <node name="object_detector" pkg="stretch_deep_perception" type="detect_objects.py" output="screen">
     <param name="debug_directory" type="string" value="$(arg debug_directory)"/>
   </node>
   <!-- -->

stretch_deep_perception/nodes/body_landmark_detector_python3.py → stretch_deep_perception/nodes/body_landmark_detector.py

@@ -4,7 +4,7 @@ import cv2
 import numpy as np
 from scipy.spatial.transform import Rotation
 
-import deep_models_shared_python3 as dm
+import deep_models_shared as dm
 
 class BodyLandmarkDetector:
     def __init__(self, models_directory, confidence_threshold=0.2, landmarks_to_detect=None, use_neural_compute_stick=False):

stretch_deep_perception/nodes/detect_body_landmarks_python3.py → stretch_deep_perception/nodes/detect_body_landmarks.py

@@ -3,8 +3,8 @@
 import cv2
 import sys
 import rospy
-import body_landmark_detector_python3 as bl
-import detection_node_python3 as dn
+import body_landmark_detector as bl
+import detection_node as dn
 import deep_learning_model_options as do
         
 if __name__ == '__main__':    

stretch_deep_perception/nodes/detect_faces_python3.py → stretch_deep_perception/nodes/detect_faces.py

@@ -3,8 +3,8 @@
 import cv2
 import sys
 import rospy
-import head_estimator_python3 as he
-import detection_node_python3 as dn
+import head_estimator as he
+import detection_node as dn
 import deep_learning_model_options as do
 
 

stretch_deep_perception/nodes/detect_nearest_mouth_python3.py → stretch_deep_perception/nodes/detect_nearest_mouth.py

@@ -4,8 +4,8 @@ import cv2
 import sys
 import rospy
 import numpy as np
-import head_estimator_python3 as he
-import detection_node_python3 as dn
+import head_estimator as he
+import detection_node as dn
 import deep_learning_model_options as do
 
 def faces_3d_to_nearest_mouth_position(detections_3d):

stretch_deep_perception/nodes/detect_objects_python3.py → stretch_deep_perception/nodes/detect_objects.py

@@ -3,8 +3,8 @@
 import cv2
 import sys
 import rospy
-import object_detector_python3 as od
-import detection_node_python3 as dn
+import object_detector as od
+import detection_node as dn
 import deep_learning_model_options as do
         
 if __name__ == '__main__':    

stretch_deep_perception/nodes/detection_node_python3.py → stretch_deep_perception/nodes/detection_node.py

@@ -22,10 +22,10 @@ import message_filters
 
 import struct
 
-import body_landmark_detector_python3 as bl
+import body_landmark_detector as bl
 
-import detection_ros_markers_python3 as dr
-import detection_2d_to_3d_python3 as d2
+import detection_ros_markers as dr
+import detection_2d_to_3d as d2
 
 
 class DetectionNode:

stretch_deep_perception/nodes/head_estimator_python3.py → stretch_deep_perception/nodes/head_estimator.py

@@ -3,7 +3,7 @@
 import cv2
 import numpy as np
 from scipy.spatial.transform import Rotation
-import deep_models_shared_python3 as dm
+import deep_models_shared as dm
 
 class HeadPoseEstimator:
     def __init__(self, models_directory, use_neural_compute_stick=False):

stretch_deep_perception/nodes/object_detector_python3.py → stretch_deep_perception/nodes/object_detector.py

@@ -4,7 +4,7 @@ import cv2
 import numpy as np
 from scipy.spatial.transform import Rotation
 
-import deep_models_shared_python3 as dm
+import deep_models_shared as dm
 
 
 class ObjectDetector:

stretch_deep_perception/nodes/test_body_landmark_detection_with_images_python3.py → stretch_deep_perception/nodes/test_body_landmark_detection_with_images.py

@@ -5,7 +5,7 @@ import cv2
 import numpy as np
 import math
 import glob
-import body_landmark_detector_python3 as bl
+import body_landmark_detector as bl
 import deep_learning_model_options as do
 
 

stretch_deep_perception/nodes/test_head_estimation_with_images_python3.py → stretch_deep_perception/nodes/test_head_estimation_with_images.py

@@ -2,7 +2,7 @@
 
 import sys
 import glob
-import head_estimator_python3 as he
+import head_estimator as he
 import cv2
 import deep_learning_model_options as do
 

stretch_deep_perception/nodes/test_object_detection_with_images_python3.py → stretch_deep_perception/nodes/test_object_detection_with_images.py

@@ -2,7 +2,7 @@
 
 import sys
 import glob
-import object_detector_python3 as jd
+import object_detector as jd
 import cv2
 import deep_learning_model_options as do
 

stretch_demos/launch/handover_object.launch

@@ -38,7 +38,7 @@
   <!-- -->
 
   <!-- HANDOVER POSITION DETECTOR -->
-  <node name="detect_handover_position" pkg="stretch_deep_perception" type="detect_nearest_mouth_python3.py" output="screen" />
+  <node name="detect_handover_position" pkg="stretch_deep_perception" type="detect_nearest_mouth.py" output="screen" />
   <!-- -->
   
   <!-- HANDOVER OBJECT -->