diff --git a/CMakeLists.txt b/CMakeLists.txt index 32cda067bbf289f1bd08142fee9089a27a94f201..285ff9ef1270fc317f3958da6b6de743bc9bd8ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ ### VERSION INFO set(OpenPose_VERSION_MAJOR 1) -set(OpenPose_VERSION_MINOR 6) +set(OpenPose_VERSION_MINOR 7) 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 374151dd82ea724706bc773187d2f1e54ca73a15..294f3ff57f8013e50b4fda730960c1b6506aa27d 100644 --- a/doc/release_notes.md +++ b/doc/release_notes.md @@ -414,7 +414,7 @@ OpenPose Library - Release Notes -## Current version - Future OpenPose 1.7.0 +## OpenPose 1.7.0 (Nov 15, 2020) 1. Main improvements: 1. Added compatibility with CUDA 11.X and cuDNN 8.X. 2. Added compatibility with Ubuntu 20.04. @@ -423,7 +423,7 @@ OpenPose Library - Release Notes 5. Installation documentation highly simplified and improved. 6. Removed all compiler warnings for Ubuntu 20.04 (GCC and Clang) as well as some for Windows 10. 2. Functions or parameters renamed: - 1. `USE_MKL` disabled by default in Ubuntu. Reason: Not compatible with non-intel CPUs and Ubuntu 20. + 1. `USE_MKL` disabled by default in Ubuntu. Reason: Not compatible with non-intel CPUs or Ubuntu 20. 3. Main bugs fixed: 1. 90 and 270-degree rotations working again. 2. C++ tutorial API demos only try to cv::imshow the image if it is not empty (avoding the assert that it would trigger otherwise). @@ -431,5 +431,12 @@ OpenPose Library - Release Notes +## Current version - Future OpenPose 1.7.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 a6d65699b6e779bd57bb770ed0cf44e979cebc19..e78b0340c7c9c202742001d62ae9c45be1010431 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.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.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 a09e654f1121d158f0a7216ff30a5a74a1579142..5bd87a1071bf32e086910311eb29a545714d2691 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.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.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 3a7e6cf564762a5dfcc7ffe39eec26a76a77e2f1..72f0a89b26af0b45871ee35685dc85687c14d1e6 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.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.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 6a2ffb2555a5ce19a1e211a61de19bb8169a3aa9..424715d84af64e92f72c8d534ac29b47c73fdb6b 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 @@ -98,7 +98,7 @@ try: print("Body keypoints: \n" + str(datum.poseKeypoints)) if not args[0].no_display: - cv2.imshow("OpenPose 1.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.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 e96654a3d0c8f833925edf6f3b97401d09854619..d5646804aaf22ccd6291f76567dc37a10a446e8b 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(op.VectorDatum([datum])) print("Face keypoints: \n" + str(datum.faceKeypoints)) - cv2.imshow("OpenPose 1.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.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 0ecfa06b164ecdf07f90519407478039ffd8cdd2..8c004fdd34f3bc027e72abe01efab2b8b56a4e64 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(op.VectorDatum([datum])) print("Left hand keypoints: \n" + str(datum.handKeypoints[0])) print("Right hand keypoints: \n" + str(datum.handKeypoints[1])) - cv2.imshow("OpenPose 1.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.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 6f79be994ea2385a94083d490e848bcd4d150dbb..2675bef15eb0840bf532548c94878acb2bd1b7a6 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.6.0 - Tutorial Python API", combined) + cv2.imshow("OpenPose 1.7.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 4cefc0e3fb110c00df60685b714663bbf2ad831f..fe09593e4e10d604d53ad941f4c9f9ba2a528d4d 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.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.0 - Tutorial Python API", datum.cvOutputData) cv2.waitKey(0) except Exception as e: print(e) diff --git a/examples/tutorial_api_python/12_asynchronous_custom_output.py b/examples/tutorial_api_python/12_asynchronous_custom_output.py index c54e52ebc3f0c06096da01aa47a05a7ce60e561a..9c39ebcd112d37ab4e6b7619548667498894ebb5 100644 --- a/examples/tutorial_api_python/12_asynchronous_custom_output.py +++ b/examples/tutorial_api_python/12_asynchronous_custom_output.py @@ -9,7 +9,7 @@ import argparse def display(datums): datum = datums[0] - cv2.imshow("OpenPose 1.6.0 - Tutorial Python API", datum.cvOutputData) + cv2.imshow("OpenPose 1.7.0 - Tutorial Python API", datum.cvOutputData) key = cv2.waitKey(1) return (key == 27) diff --git a/include/openpose/core/macros.hpp b/include/openpose/core/macros.hpp index c9ce1f546058a2cc9e60e41a7f88519a43dae34c..9b84b016d43b0e699101773495be46f1fdf6d7c3 100644 --- a/include/openpose/core/macros.hpp +++ b/include/openpose/core/macros.hpp @@ -10,7 +10,7 @@ // OpenPose name and version const std::string OPEN_POSE_NAME_STRING = "OpenPose"; -const std::string OPEN_POSE_VERSION_STRING = "1.6.0"; +const std::string OPEN_POSE_VERSION_STRING = "1.7.0"; const std::string OPEN_POSE_NAME_AND_VERSION = OPEN_POSE_NAME_STRING + " " + OPEN_POSE_VERSION_STRING; // #define COMMERCIAL_LICENSE diff --git a/scripts/ubuntu/Makefile.example b/scripts/ubuntu/Makefile.example index dc55fcf958ca4142988451657aa7ca06e2e13a42..76aaaf068ce8e76feb76751291f80b9d6b0a0b5f 100644 --- a/scripts/ubuntu/Makefile.example +++ b/scripts/ubuntu/Makefile.example @@ -33,7 +33,7 @@ LIBRARY_NAME := $(PROJECT) LIB_BUILD_DIR := $(BUILD_DIR)/lib STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a DYNAMIC_VERSION_MAJOR := 1 -DYNAMIC_VERSION_MINOR := 6 +DYNAMIC_VERSION_MINOR := 7 DYNAMIC_VERSION_REVISION := 0 DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so #DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR)