From ac2dde60021610ff77044c98b43eff644b713a05 Mon Sep 17 00:00:00 2001 From: Gines Hidalgo Date: Thu, 16 May 2019 09:13:15 -0400 Subject: [PATCH] OpenPose v1.5.0 --- CMakeLists.txt | 2 +- doc/release_notes.md | 9 ++++++++- examples/tutorial_api_python/01_body_from_image.py | 2 +- examples/tutorial_api_python/02_whole_body_from_image.py | 2 +- examples/tutorial_api_python/04_keypoints_from_images.py | 2 +- .../05_keypoints_from_images_multi_gpu.py | 2 +- examples/tutorial_api_python/06_face_from_image.py | 2 +- examples/tutorial_api_python/07_hand_from_image.py | 2 +- examples/tutorial_api_python/08_heatmaps_from_image.py | 2 +- .../tutorial_api_python/09_keypoints_from_heatmaps.py | 2 +- include/openpose/core/macros.hpp | 2 +- src/openpose/wrapper/wrapperAuxiliary.cpp | 2 +- 12 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8d50725..3e75a2d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ ### VERSION INFO set(OpenPose_VERSION_MAJOR 1) -set(OpenPose_VERSION_MINOR 4) +set(OpenPose_VERSION_MINOR 5) set(OpenPose_VERSION_PATCH 0) set(OpenPose_VERSION ${OpenPose_VERSION_MAJOR}.${OpenPose_VERSION_MINOR}.${OpenPose_VERSION_PATCH}) diff --git a/doc/release_notes.md b/doc/release_notes.md index 84aa502f..b10d4f97 100644 --- a/doc/release_notes.md +++ b/doc/release_notes.md @@ -258,7 +258,7 @@ OpenPose Library - Release Notes -## Current version - future OpenPose 1.5.0 +## OpenPose 1.5.0 (May 16, 2019) 1. Main improvements: 1. Added initial single-person tracker for further speed up or visual smoothing (`--tracking` flag). 2. Speed up of the CUDA functions of OpenPose: @@ -365,5 +365,12 @@ OpenPose Library - Release Notes +## Current version - future OpenPose 1.5.1 +1. Main improvements: +2. Functions or parameters renamed: +3. Main bugs fixed: + + + ## All OpenPose Versions Download and/or check any OpenPose version from [https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases](https://github.com/CMU-Perceptual-Computing-Lab/openpose/releases). diff --git a/examples/tutorial_api_python/01_body_from_image.py b/examples/tutorial_api_python/01_body_from_image.py index 70028ffe..a03e24b4 100644 --- a/examples/tutorial_api_python/01_body_from_image.py +++ b/examples/tutorial_api_python/01_body_from_image.py @@ -64,7 +64,7 @@ try: # Display Image print("Body keypoints: \n" + str(datum.poseKeypoints)) - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/02_whole_body_from_image.py b/examples/tutorial_api_python/02_whole_body_from_image.py index 31acb226..59aaee38 100644 --- a/examples/tutorial_api_python/02_whole_body_from_image.py +++ b/examples/tutorial_api_python/02_whole_body_from_image.py @@ -69,7 +69,7 @@ try: print("Face keypoints: \n" + str(datum.faceKeypoints)) print("Left hand keypoints: \n" + str(datum.handKeypoints[0])) print("Right hand keypoints: \n" + str(datum.handKeypoints[1])) - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/04_keypoints_from_images.py b/examples/tutorial_api_python/04_keypoints_from_images.py index 44bbcf96..9e92428a 100644 --- a/examples/tutorial_api_python/04_keypoints_from_images.py +++ b/examples/tutorial_api_python/04_keypoints_from_images.py @@ -72,7 +72,7 @@ try: print("Body keypoints: \n" + str(datum.poseKeypoints)) if not args[0].no_display: - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) key = cv2.waitKey(15) if key == 27: break diff --git a/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py b/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py index fded0b71..e0ef57c6 100644 --- a/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py +++ b/examples/tutorial_api_python/05_keypoints_from_images_multi_gpu.py @@ -99,7 +99,7 @@ try: print("Body keypoints: \n" + str(datum.poseKeypoints)) if not args[0].no_display: - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) key = cv2.waitKey(15) if key == 27: break diff --git a/examples/tutorial_api_python/06_face_from_image.py b/examples/tutorial_api_python/06_face_from_image.py index 11f99834..577e513f 100644 --- a/examples/tutorial_api_python/06_face_from_image.py +++ b/examples/tutorial_api_python/06_face_from_image.py @@ -76,7 +76,7 @@ try: # Process and display image opWrapper.emplaceAndPop([datum]) print("Face keypoints: \n" + str(datum.faceKeypoints)) - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/07_hand_from_image.py b/examples/tutorial_api_python/07_hand_from_image.py index b50e6abd..3927fd28 100644 --- a/examples/tutorial_api_python/07_hand_from_image.py +++ b/examples/tutorial_api_python/07_hand_from_image.py @@ -89,7 +89,7 @@ try: opWrapper.emplaceAndPop([datum]) print("Left hand keypoints: \n" + str(datum.handKeypoints[0])) print("Right hand keypoints: \n" + str(datum.handKeypoints[1])) - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/examples/tutorial_api_python/08_heatmaps_from_image.py b/examples/tutorial_api_python/08_heatmaps_from_image.py index 9b5e6267..47241a99 100644 --- a/examples/tutorial_api_python/08_heatmaps_from_image.py +++ b/examples/tutorial_api_python/08_heatmaps_from_image.py @@ -80,7 +80,7 @@ try: heatmap = heatmaps[counter, :, :].copy() heatmap = cv2.applyColorMap(heatmap, cv2.COLORMAP_JET) combined = cv2.addWeighted(outputImageF, 0.5, heatmap, 0.5, 0) - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", combined) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", combined) key = cv2.waitKey(-1) if key == 27: break diff --git a/examples/tutorial_api_python/09_keypoints_from_heatmaps.py b/examples/tutorial_api_python/09_keypoints_from_heatmaps.py index c116a68b..9c427a61 100644 --- a/examples/tutorial_api_python/09_keypoints_from_heatmaps.py +++ b/examples/tutorial_api_python/09_keypoints_from_heatmaps.py @@ -81,7 +81,7 @@ try: # Display Image print("Body keypoints: \n" + str(datum.poseKeypoints)) - cv2.imshow("OpenPose 1.4.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.5.0 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: # print(e) diff --git a/include/openpose/core/macros.hpp b/include/openpose/core/macros.hpp index d4e99f83..656fdc8a 100644 --- a/include/openpose/core/macros.hpp +++ b/include/openpose/core/macros.hpp @@ -11,7 +11,7 @@ // OpenPose name and version const std::string OPEN_POSE_NAME_STRING = "OpenPose"; -const std::string OPEN_POSE_VERSION_STRING = "1.4.0"; +const std::string OPEN_POSE_VERSION_STRING = "1.5.0"; const std::string OPEN_POSE_NAME_AND_VERSION = OPEN_POSE_NAME_STRING + " " + OPEN_POSE_VERSION_STRING; // #define COMMERCIAL_LICENSE diff --git a/src/openpose/wrapper/wrapperAuxiliary.cpp b/src/openpose/wrapper/wrapperAuxiliary.cpp index 445693af..352b1940 100644 --- a/src/openpose/wrapper/wrapperAuxiliary.cpp +++ b/src/openpose/wrapper/wrapperAuxiliary.cpp @@ -173,7 +173,7 @@ namespace op log("---------------------------------- WARNING ----------------------------------\n" "We have introduced an additional boost in accuracy of about 0.5% with respect to the official" " OpenPose 1.4.0 (using default settings). Currently, this increase is only applicable to CUDA" - " version, but will eventually be ported to CPU and OpenCL versions. Therefore, CPU and OpenCL" + " version, but might eventually be ported to CPU and OpenCL versions. Therefore, CPU and OpenCL" " results might vary. Nevertheless, this accuracy boost is almost insignificant so CPU and" " OpenCL versions can be safely used, they will simply provide the exact same accuracy than" " OpenPose 1.4.0." -- GitLab