提交 425de2f5 编写于 作者: G Gines Hidalgo

Eigen updated to 3.3.8 and working on Windows

Signed-off-by: NGines Hidalgo <gineshidalgo99@gmail.com>
上级 3c4b284a
......@@ -3,8 +3,8 @@ Asio:
- Link: https://think-async.com/Asio/Download
Eigen:
- Version 3.3.4
- Link: http://eigen.tuxfamily.org/index.php?title=Main_Page
- Version 3.3.8
- Link: http://eigen.tuxfamily.org/index.php
Unix:
- Caffe:
......
......@@ -290,11 +290,10 @@ option(WITH_OPENCV_WITH_OPENGL "Much faster GUI display, but you must also enabl
# Set the acceleration library
if (WIN32 OR APPLE)
set(WITH_EIGEN NONE CACHE STRING "Select the Eigen mode: NONE if not required, BUILD to let OpenPose download it, or FIND to let CMake find it (e.g., if you installed it manually).")
set_property(CACHE WITH_EIGEN PROPERTY STRINGS NONE BUILD FIND)
elseif (UNIX AND NOT APPLE)
set(WITH_EIGEN NONE CACHE STRING "Select the Eigen mode: NONE if not required, BUILD to let OpenPose download it, or FIND to let CMake find it (e.g., if you installed it manually or used `sudo apt-get install libeigen3-dev`).")
set_property(CACHE WITH_EIGEN PROPERTY STRINGS NONE BUILD FIND)
endif (WIN32 OR APPLE)
set_property(CACHE WITH_EIGEN PROPERTY STRINGS NONE BUILD FIND)
# # Suboptions for OpenPose tracking
# if (UNIX AND NOT APPLE)
......@@ -402,7 +401,7 @@ else (${WITH_EIGEN} MATCHES "NONE")
# Download it
set(OP_URL "${DOWNLOAD_SERVER}3rdparty/")
set(FIND_LIB_PREFIX ${CMAKE_SOURCE_DIR}/3rdparty/)
download_zip("eigen_2018_05_23.zip" ${OP_URL} ${FIND_LIB_PREFIX} 29B9B2FD4679D587BB67467F09EE8365)
download_zip("eigen_2020_11_18.zip" ${OP_URL} ${FIND_LIB_PREFIX} 57672715C62C1A795300FE1AE4D2687E)
# Set path
set(EIGEN3_INCLUDE_DIRS "3rdparty/eigen/include/")
# Leave to CMake to find it
......@@ -860,32 +859,28 @@ endif (USE_ASIO)
# Calibration
if (NOT ${WITH_EIGEN} MATCHES "NONE")
include_directories(
${EIGEN3_INCLUDE_DIRS})
set(OpenPose_3rdparty_libraries ${OpenPose_3rdparty_libraries} Eigen3::Eigen)
include_directories(${EIGEN3_INCLUDE_DIRS})
if (${WITH_EIGEN} MATCHES "FIND")
set(OpenPose_3rdparty_libraries ${OpenPose_3rdparty_libraries} Eigen3::Eigen)
endif (${WITH_EIGEN} MATCHES "FIND")
endif (NOT ${WITH_EIGEN} MATCHES "NONE")
if (APPLE)
include_directories(
"/usr/local/opt/openblas/include")
include_directories("/usr/local/opt/openblas/include")
endif (APPLE)
if (USE_MKL)
include_directories(
"${MKL_PATH}/include/")
include_directories("${MKL_PATH}/include/")
endif (USE_MKL)
if (Caffe_FOUND)
include_directories(
${Caffe_INCLUDE_DIRS})
include_directories(${Caffe_INCLUDE_DIRS})
endif (Caffe_FOUND)
if (${GPU_MODE} MATCHES "CUDA")
include_directories(
${CUDA_INCLUDE_DIRS})
include_directories(${CUDA_INCLUDE_DIRS})
elseif (${GPU_MODE} MATCHES "OPENCL")
include_directories(
${OpenCL_INCLUDE_DIRS})
include_directories(${OpenCL_INCLUDE_DIRS})
endif (${GPU_MODE} MATCHES "CUDA")
# 3D
if (WITH_3D_RENDERER)
......@@ -908,9 +903,7 @@ if (WITH_3D_ADAM_MODEL)
endif (WITH_3D_ADAM_MODEL)
# Windows includes
if (WIN32)
include_directories(
# ${Boost_INCLUDE_DIRS}
${WINDOWS_INCLUDE_DIRS})
include_directories(${WINDOWS_INCLUDE_DIRS})
endif (WIN32)
......
......@@ -61,7 +61,7 @@ You might prefer to download them manually:
7. **Eigen prerequisite** (optional, only required for some specific extra functionality, such as extrinsic camera calibration):
- If you enable the `WITH_EIGEN` flag when running CMake, you must have Eigen already installed in your system. Note that [Eigen <= 3.3.6 is not supported by CUDA >=9.1](https://bitbucket.org/eigen/eigen/commits/034b6c3e101792a3cc3ccabd9bfaddcabe85bb58?at=default). In order to install it, you can perform any of the 3 following options (but only 1 of them!), while making sure that Eigen version is compatible with CUDA:
1. Do not do anything if you set the `WITH_EIGEN` flag to `BUILD`, CMake will automatically download Eigen. Alternatively, you might prefer to download it manually:
- [Eigen3](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/eigen_2018_05_23.zip): Unzip as `3rdparty/eigen/`.
- [Eigen3](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/eigen_2020_11_18.zip): Unzip as `3rdparty/eigen/`.
2. Run `sudo apt-get install libeigen3-dev` if you prefer to set `WITH_EIGEN` to `FIND`.
3. Use your own version of Eigen by setting `WITH_EIGEN` to `BUILD`, run CMake so that OpenPose downloads the zip file, and then replace the contents of `3rdparty/eigen/` by your own version.
......@@ -74,7 +74,7 @@ You might prefer to download them manually:
4. **Eigen prerequisite** (optional, only required for some specific extra functionality, such as extrinsic camera calibration):
- Enable the `WITH_EIGEN` flag when running CMake, and set it to `BUILD`.
- CMake will automatically download Eigen.
- Alternatively, you can manually download it from the [Eigen3 website](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/eigen_2018_05_23.zip), and unzip as `3rdparty/eigen/`.
- Alternatively, you can manually download it from the [Eigen3 website](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/eigen_2020_11_18.zip), and unzip as `3rdparty/eigen/`.
......@@ -110,4 +110,4 @@ NOTE: These instructions are only required when compiling OpenPose brom source.
6. **Eigen prerequisite** (optional, only required for some specific extra functionality, such as extrinsic camera calibration):
- Enable the `WITH_EIGEN` flag when running CMake, and set it to `BUILD`.
- CMake will automatically download Eigen.
- Alternatively, you can manually download it from the [Eigen3 website](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/eigen_2018_05_23.zip), run CMake so that OpenPose downloads the zip file, and then replace the contents of `3rdparty/eigen/` by your own version.
- Alternatively, you can manually download it from the [Eigen3 website](http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/eigen_2020_11_18.zip), run CMake so that OpenPose downloads the zip file, and then replace the contents of `3rdparty/eigen/` by your own version.
......@@ -435,11 +435,13 @@ OpenPose Library - Release Notes
1. Main improvements:
1. Webcam speed boosted on Windows (by updating OpenCV).
2. Third party versions updated:
1. OpenCV: from 4.2 to 4.5.
2. `wget`: from 1.19.1 to 1.20.3.
1. OpenCV: From 4.2 to 4.5.
2. Eigen: From 3.3.4 to 3.3.8.
3. `wget`: From 1.19.1 to 1.20.3.
2. Functions or parameters renamed:
3. Main bugs fixed:
1. Windows links to the right OpenCV DLL Files (v15, while it was linking to v14).
1. Eigen working again on Windows.
2. OpenPose links to the right OpenCV DLL Files on Windows (it was wrongly linking to v14 rather than v15).
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册