提交 e9754167 编写于 作者: G gineshidalgo99

Mac version released, Ubuntu fix

上级 4b07e7a2
...@@ -36,32 +36,34 @@ You might select multiple topics, delete the rest: ...@@ -36,32 +36,34 @@ You might select multiple topics, delete the rest:
### Your System Configuration ### Your System Configuration
1. **General configuration**: 1. **OpenPose version**: Latest GitHub code? Or specific commit (e.g., d52878f)? Or specific version from `Release` section (e.g., 1.2.0)?
2. **General configuration**:
- **Installation mode**: CMake, sh script, manual Makefile installation, ... (Ubuntu); CMake, ... (Windows); ...? - **Installation mode**: CMake, sh script, manual Makefile installation, ... (Ubuntu); CMake, ... (Windows); ...?
- **Operating system** (`lsb_release -a` in Ubuntu): - **Operating system** (`lsb_release -a` in Ubuntu):
- **Release or Debug mode**? (by defualt: release): - **Release or Debug mode**? (by defualt: release):
- Compiler (`gcc --version` in Ubuntu or VS version in Windows): 5.4.0, ... (Ubuntu); VS2015 Enterprise Update 3, VS2017 community, ... (Windows); ...? - Compiler (`gcc --version` in Ubuntu or VS version in Windows): 5.4.0, ... (Ubuntu); VS2015 Enterprise Update 3, VS2017 community, ... (Windows); ...?
2. **Non-default settings**: 3. **Non-default settings**:
- **3-D Reconstruction module added**? (by default: no): - **3-D Reconstruction module added**? (by default: no):
- Any other custom CMake configuration with respect to the default version? (by default: no): - Any other custom CMake configuration with respect to the default version? (by default: no):
3. **3rd-party software**: 4. **3rd-party software**:
- **Caffe version**: Default from OpenPose, custom version, ...? - **Caffe version**: Default from OpenPose, custom version, ...?
- **CMake version** (`cmake --version` in Ubuntu): - **CMake version** (`cmake --version` in Ubuntu):
- **OpenCV version**: pre-compiled `apt-get install libopencv-dev` (only Ubuntu); OpenPose default (only Windows); compiled from source? If so, 2.4.9, 2.4.12, 3.1, 3.2?; ...? - **OpenCV version**: pre-compiled `apt-get install libopencv-dev` (only Ubuntu); OpenPose default (only Windows); compiled from source? If so, 2.4.9, 2.4.12, 3.1, 3.2?; ...?
4. If **GPU mode** issue: 5. If **GPU mode** issue:
- **CUDA version** (`cat /usr/local/cuda/version.txt` in most cases): - **CUDA version** (`cat /usr/local/cuda/version.txt` in most cases):
- **cuDNN version**: - **cuDNN version**:
- **GPU model** (`nvidia-smi` in Ubuntu): - **GPU model** (`nvidia-smi` in Ubuntu):
5. If **CPU-only mode** issue: 6. If **CPU-only mode** issue:
- **CPU brand & model**: - **CPU brand & model**:
- Total **RAM memory** available: - Total **RAM memory** available:
6. If **Windows** system: 7. If **Windows** system:
- Portable demo or compiled library? - Portable demo or compiled library?
7. If **speed performance** issue: 8. If **speed performance** issue:
- Report OpenPose timing speed based on [this link](https://github.com/CMU-Perceptual-Computing-Lab/openpose/blob/master/doc/installation.md#profiling-speed). - Report OpenPose timing speed based on [this link](https://github.com/CMU-Perceptual-Computing-Lab/openpose/blob/master/doc/installation.md#profiling-speed).
...@@ -23,11 +23,12 @@ ...@@ -23,11 +23,12 @@
- **Input**: Image, video, webcam, and IP camera. Included C++ demos to add your custom input. - **Input**: Image, video, webcam, and IP camera. Included C++ demos to add your custom input.
- **Output**: Basic image + keypoint display/saving (PNG, JPG, AVI, ...), keypoint saving (JSON, XML, YML, ...), and/or keypoints as array class. - **Output**: Basic image + keypoint display/saving (PNG, JPG, AVI, ...), keypoint saving (JSON, XML, YML, ...), and/or keypoints as array class.
- Available: command-line demo, C++ wrapper, and C++ API. - Available: command-line demo, C++ wrapper, and C++ API.
- **OS**: Ubuntu (14, 16), Windows (8, 10), Nvidia TX2. - **OS**: Ubuntu (14, 16), Windows (8, 10), Mac OSX, Nvidia TX2.
## Latest Features ## Latest Features
- Jun 2018: [**Mac OSX version (CPU)**](doc/installation.md)!
- Mar 2018: [**CPU version**](doc/installation.md#cpu-version)! - Mar 2018: [**CPU version**](doc/installation.md#cpu-version)!
- Mar 2018: Improved [**3-D keypoint reconstruction module**](doc/3d_reconstruction_demo.md) (from multiple camera views)! - Mar 2018: Improved [**3-D keypoint reconstruction module**](doc/3d_reconstruction_demo.md) (from multiple camera views)!
- Sep 2017: [**CMake**](doc/installation.md) installer and **IP camera** support! - Sep 2017: [**CMake**](doc/installation.md) installer and **IP camera** support!
......
...@@ -30,16 +30,15 @@ Note: In order to maximize calibration quality, **do not reuse the same video se ...@@ -30,16 +30,15 @@ Note: In order to maximize calibration quality, **do not reuse the same video se
1. Run OpenPose and save images for your desired camera. Use a grid (chessboard) pattern and move around all the image area. 1. Run OpenPose and save images for your desired camera. Use a grid (chessboard) pattern and move around all the image area.
1. Quality tips: 1. Quality tips:
1. Keep the same orientation of the chessboard, i.e., do not rotate it circularly more than ~15-30 degress. Our algorithm assumes that the origin is the corner at the top left, so rotating the chessboard circularly will change this origin across frames, resulting in many frames being rejected for the final calibration, i.e., lower calibration accuracy. 1. Keep the same orientation of the chessboard, i.e., do not rotate it circularly more than ~15-30 degress. Our algorithm assumes that the origin is the corner at the top left, so rotating the chessboard circularly will change this origin across frames, resulting in many frames being rejected for the final calibration, i.e., lower calibration accuracy.
2. You should get at least 100-200 images for a good calibration (and no more than 500). 2. Cover several distances, and within each distance, cover all parts of the image view (all corners and center).
3. Cover several distances, and within each distance, cover all parts of the image view (all corners and center). 3. Save the images in PNG format (default behavior) in order to improve calibration quality. PNG images are bigger than JPG equivalent, but do not lose information by compression.
4. Save the images in PNG format (default behavior) in order to improve calibration quality. 4. Recommended about 400 image views for high quality calibration. You should get at least 150 images for a good calibration, while no more than 500. The calibration of a camera takes about 3 minutes with about 100 images, about 1.5h with 200 images, and about 9.5h with 450 images. Required RAM memory also grows exponentially.
5. The calibration of a camera takes about 3 minutes with about 100 images, about 1.5h with 200 images, and about 9.5h with 450 images. Required RAM memory also grows exponentially.
2. Changing image source: 2. Changing image source:
1. Webcam calibration: `./build/examples/openpose/openpose.bin --num_gpu 0 --frame_keep_distortion --write_images {intrinsic_images_folder_path}`. 1. Webcam calibration: `./build/examples/openpose/openpose.bin --num_gpu 0 --frame_keep_distortion --write_images {intrinsic_images_folder_path}`.
2. Flir camera calibration: Add the flags `--flir_camera --flir_camera_index 0` (or the desired flir camera index) to the webcam command. 2. Flir camera calibration: Add the flags `--flir_camera --flir_camera_index 0` (or the desired flir camera index) to the webcam command.
3. Calibration from video sequence: Add the flag `--video {video_path}` to the webcam command. 3. Calibration from video sequence: Add the flag `--video {video_path}` to the webcam command.
4. Any other camera brand: Simply save your images in {intrinsic_images_folder_path}, file names are not relevant. 4. Any other camera brand: Simply save your images in {intrinsic_images_folder_path}, file names are not relevant.
2. Get familiar with the calibration parameters used in point 3 (i.e., `grid_square_size_mm`, `grid_number_inner_corners`, etc.) by running: 2. Get familiar with the calibration parameters used in point 3 (i.e., `grid_square_size_mm`, `grid_number_inner_corners`, etc.) by running the `--help` flag:
``` ```
./build/examples/calibration/calibration.bin --help ./build/examples/calibration/calibration.bin --help
``` ```
......
...@@ -32,7 +32,7 @@ This installation section is only intended if you plan to modify the OpenPose co ...@@ -32,7 +32,7 @@ This installation section is only intended if you plan to modify the OpenPose co
## Operating Systems ## Operating Systems
- **Ubuntu** 14 and 16. - **Ubuntu** 14 and 16.
- **Windows** 8 and 10. - **Windows** 8 and 10.
- **Mac / OSX** Mavericks and above (only CPU version tested). If you want to test our Mac GPU version, email gines@cmu.edu. - **Mac OSX** Mavericks and above (only CPU version tested). If you want to test our Mac GPU version, email gines@cmu.edu.
- **Nvidia Jetson TX2**, installation instructions in [doc/installation_jetson_tx2.md](./installation_jetson_tx2.md). - **Nvidia Jetson TX2**, installation instructions in [doc/installation_jetson_tx2.md](./installation_jetson_tx2.md).
- OpenPose has also been used on **Windows 7**, **CentOS**, and **Nvidia Jetson (TK1 and TX1)** embedded systems. However, we do not officially support them at the moment. - OpenPose has also been used on **Windows 7**, **CentOS**, and **Nvidia Jetson (TK1 and TX1)** embedded systems. However, we do not officially support them at the moment.
......
OpenPose Library - Latest Released Features OpenPose Library - Latest Released Features
==================================== ====================================
- Jun 2018: [**Mac OSX version (CPU)**](./installation.md)!
- Mar 2018: [**CPU version**](./installation.md#cpu-version)! - Mar 2018: [**CPU version**](./installation.md#cpu-version)!
- Mar 2018: Improved [**3-D keypoint reconstruction module**](./3d_reconstruction_demo.md) (from multiple camera views)! - Mar 2018: Improved [**3-D keypoint reconstruction module**](./3d_reconstruction_demo.md) (from multiple camera views)!
- Sep 2017: [**CMake**](./installation.md) installer and **IP camera** support! - Sep 2017: [**CMake**](./installation.md) installer and **IP camera** support!
......
...@@ -26,10 +26,9 @@ if (UNIX OR APPLE) ...@@ -26,10 +26,9 @@ if (UNIX OR APPLE)
add_library(openpose_core ${SOURCES_OP_CORE}) add_library(openpose_core ${SOURCES_OP_CORE})
endif () endif ()
target_link_libraries(openpose_core openpose caffe ${OpenCV_LIBS} ${Caffe_LIBS} ${GLUT_LIBRARY} ${SPINNAKER_LIB} ${OpenCL_LIBRARIES}
${GLOG_LIBRARY} ${OpenCV_LIBS} ${Caffe_LIBS} ${GFLAGS_LIBRARY} ${GLOG_LIBRARY} ${MKL_LIBS} ${GLUT_LIBRARY} ${SPINNAKER_LIB})
if (APPLE) if (APPLE)
target_link_libraries(openpose_core openpose caffe ${OpenCV_LIBS} ${Caffe_LIBS} ${GLUT_LIBRARY} ${SPINNAKER_LIB} ${OpenCL_LIBRARIES}
${GLOG_LIBRARY} ${OpenCV_LIBS} ${Caffe_LIBS} ${GFLAGS_LIBRARY} ${GLOG_LIBRARY} ${MKL_LIBS} ${GLUT_LIBRARY} ${SPINNAKER_LIB})
add_library(caffe SHARED IMPORTED) add_library(caffe SHARED IMPORTED)
set_property(TARGET caffe PROPERTY IMPORTED_LOCATION ${Caffe_LIBS}) set_property(TARGET caffe PROPERTY IMPORTED_LOCATION ${Caffe_LIBS})
endif (APPLE) endif (APPLE)
......
...@@ -140,10 +140,10 @@ namespace op ...@@ -140,10 +140,10 @@ namespace op
|| wrapperStructInput.producerSharedPtr->getType() == ProducerType::ImageDirectory) || wrapperStructInput.producerSharedPtr->getType() == ProducerType::ImageDirectory)
// If netInputSize is -1 // If netInputSize is -1
&& (wrapperStructPose.netInputSize.x == -1 || wrapperStructPose.netInputSize.y == -1)) && (wrapperStructPose.netInputSize.x == -1 || wrapperStructPose.netInputSize.y == -1))
error("Dynamic `--net_resolution` is not supported in MKL (CPU) and OpenCL Caffe versions. Please" error("The default dynamic `--net_resolution` is not supported in MKL (CPU Caffe) and OpenCL Caffe"
" remove `-1` from `net_resolution` or use the Caffe master branch when processing images" " versions. Please, use a static `net_resolution` (recommended `--net_resolution 656x368`)"
" and when using your custom image reader.", " or use the Caffe CUDA master branch when processing images and/or when using your custom"
__LINE__, __FUNCTION__, __FILE__); " image reader.", __LINE__, __FUNCTION__, __FILE__);
#endif #endif
log("", Priority::Low, __LINE__, __FUNCTION__, __FILE__); log("", Priority::Low, __LINE__, __FUNCTION__, __FILE__);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册