Updated submodules and TX2 JetPack scripts

caffe @ b5ede488

-Subproject commit 9453eb00f6073ab9091f8a3a973538c7bdcb6785
+Subproject commit b5ede488952e40861e84e51a9f9fd8fe2395cc8a

pybind11 @ 085a2943

-Subproject commit 111b25b260fd687df9524d850c9d91927a661623
+Subproject commit 085a29436a8c472caaaf7157aa644b571079bcaa

CMakeLists.txt

@@ -640,7 +640,7 @@ if (UNIX OR APPLE)
       list(LENGTH CAFFE_DIR_VALID CAFFE_DIR_VALID_LENGTH)
       if (CAFFE_DIR_VALID_LENGTH EQUAL 0)
         execute_process(COMMAND git submodule update --init ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
-        # execute_process(COMMAND git submodule update --init --recursive) # This would initialize them all
+        # execute_process(COMMAND git submodule update --init --recursive --remote) # This would initialize them all
       else (CAFFE_DIR_VALID_LENGTH EQUAL 0)
         message(STATUS "Caffe has already been downloaded.")
       endif (CAFFE_DIR_VALID_LENGTH EQUAL 0)
@@ -923,7 +923,7 @@ if (BUILD_PYTHON)
   elseif (UNIX OR APPLE)
     if (Caffe_FOUND)
       execute_process(COMMAND git submodule update --init ${CMAKE_SOURCE_DIR}/3rdparty/pybind11/)
-      # execute_process(COMMAND git submodule update --init --recursive) # This would initialize them all
+      # execute_process(COMMAND git submodule update --init --recursive --remote) # This would initialize them all
       add_subdirectory(3rdparty/pybind11)
       add_subdirectory(python)
     endif (Caffe_FOUND)

doc/installation_deprecated.md

@@ -66,7 +66,7 @@ Alternatively to the script installation, if you want to use CUDA 7, avoid using
 2. Compile Caffe and OpenPose by running these lines:
     ```
     ### Install Caffe ###
-    git submodule update --init --recursive
+    git submodule update --init --recursive --remote
     cd 3rdparty/caffe/
     # Select your desired Makefile file (run only one of the next 4 commands)
     cp Makefile.config.Ubuntu14_cuda7.example Makefile.config # Ubuntu 14, cuda 7

doc/installation_jetson_tx2_jetpack3.1.md

@@ -31,7 +31,7 @@ Notes:
 ## Installation
 Use the following script for installation of both caffe and OpenPose: 
 ```
-./scripts/ubuntu/install_caffe_and_openpose_JetsonTX2_JetPack3.1.sh
+bash ./scripts/ubuntu/install_caffe_and_openpose_JetsonTX2_JetPack3.1.sh
 ```
 
 

doc/installation_jetson_tx2_jetpack3.3.md

@@ -31,7 +31,7 @@ Notes:
 ## Installation
 Use the following script for installation of both caffe and OpenPose: 
 ```
-./scripts/ubuntu/install_caffe_and_openpose_JetsonTX2_JetPack3.3.sh
+bash ./scripts/ubuntu/install_caffe_and_openpose_JetsonTX2_JetPack3.3.sh
 ```
 
 

examples/tutorial_api_python/1_body_from_image.py

@@ -14,13 +14,13 @@ try:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append(dir_path + '/../../python/openpose/Release');
         os.environ['PATH']  = os.environ['PATH'] + ';' + dir_path + '/../../x64/Release;' +  dir_path + '/../../bin;'
-        import openpose_python as op
+        import pyopenpose as op
     else:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append('../../python');
         # If you run `make install` (default path is `/usr/local/python` for Ubuntu), you can also access the OpenPose/python module from there. This will install OpenPose and the python library at your desired installation path. Ensure that this is in your python path in order to use it.
         # sys.path.append('/usr/local/python')
-        from openpose import openpose_python as op
+        from openpose import pyopenpose as op
 except:
     raise Exception('Error: OpenPose library could not be found. Did you enable `BUILD_PYTHON` in CMake and have this Python script in the right folder?')
 

examples/tutorial_api_python/2_whole_body_from_image.py

@@ -14,13 +14,13 @@ try:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append(dir_path + '/../../python/openpose/Release');
         os.environ['PATH']  = os.environ['PATH'] + ';' + dir_path + '/../../x64/Release;' +  dir_path + '/../../bin;'
-        import openpose_python as op
+        import pyopenpose as op
     else:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append('../../python');
         # If you run `make install` (default path is `/usr/local/python` for Ubuntu), you can also access the OpenPose/python module from there. This will install OpenPose and the python library at your desired installation path. Ensure that this is in your python path in order to use it.
         # sys.path.append('/usr/local/python')
-        from openpose import openpose_python as op
+        from openpose import pyopenpose as op
 except:
     raise Exception('Error: OpenPose library could not be found. Did you enable `BUILD_PYTHON` in CMake and have this Python script in the right folder?')
 

examples/tutorial_api_python/3_heatmaps_from_image.py

@@ -15,13 +15,13 @@ try:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append(dir_path + '/../../python/openpose/Release');
         os.environ['PATH']  = os.environ['PATH'] + ';' + dir_path + '/../../x64/Release;' +  dir_path + '/../../bin;'
-        import openpose_python as op
+        import pyopenpose as op
     else:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append('../../python');
         # If you run `make install` (default path is `/usr/local/python` for Ubuntu), you can also access the OpenPose/python module from there. This will install OpenPose and the python library at your desired installation path. Ensure that this is in your python path in order to use it.
         # sys.path.append('/usr/local/python')
-        from openpose import openpose_python as op
+        from openpose import pyopenpose as op
 except:
     raise Exception('Error: OpenPose library could not be found. Did you enable `BUILD_PYTHON` in CMake and have this Python script in the right folder?')
 

examples/tutorial_api_python/CMakeLists.txt

 ### Add Python Test
-configure_file(openpose_test.py openpose_test.py)
+configure_file(openpose_python.py openpose_python.py)
 configure_file(1_body_from_image.py 1_body_from_image.py)
 configure_file(2_whole_body_from_image.py 2_whole_body_from_image.py)
 configure_file(3_heatmaps_from_image.py 3_heatmaps_from_image.py)

examples/tutorial_api_python/openpose_test.py → examples/tutorial_api_python/openpose_python.py

@@ -14,13 +14,13 @@ try:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append(dir_path + '/../../python/openpose/Release');
         os.environ['PATH']  = os.environ['PATH'] + ';' + dir_path + '/../../x64/Release;' +  dir_path + '/../../bin;'
-        import openpose_python as op
+        import pyopenpose as op
     else:
         # Change these variables to point to the correct folder (Release/x64 etc.) 
         sys.path.append('../../python');
         # If you run `make install` (default path is `/usr/local/python` for Ubuntu), you can also access the OpenPose/python module from there. This will install OpenPose and the python library at your desired installation path. Ensure that this is in your python path in order to use it.
         # sys.path.append('/usr/local/python')
-        from openpose import openpose_python as op
+        from openpose import pyopenpose as op
 except:
     raise Exception('Error: OpenPose library could not be found. Did you enable `BUILD_PYTHON` in CMake and have this Python script in the right folder?')
 

python/openpose/CMakeLists.txt

@@ -3,12 +3,12 @@ set(PYTHON_FILES
     __init__.py
     openpose_python.cpp)
 
-pybind11_add_module(openpose_python openpose_python.cpp)
+pybind11_add_module(pyopenpose openpose_python.cpp)
 
-target_link_libraries(openpose_python PRIVATE pybind11::module openpose ${OpenPose_3rdparty_libraries})
-SET_TARGET_PROPERTIES(openpose_python PROPERTIES PREFIX "")
+target_link_libraries(pyopenpose PRIVATE pybind11::module openpose ${OpenPose_3rdparty_libraries})
+SET_TARGET_PROPERTIES(pyopenpose PROPERTIES PREFIX "")
 configure_file(__init__.py __init__.py)
 
-# install(TARGETS openpose_python DESTINATION python)
+# install(TARGETS pyopenpose DESTINATION python)
 # install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION python/openpose FILES_MATCHING PATTERN "*.so")
 # install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION python/openpose FILES_MATCHING PATTERN "*.py")

python/openpose/__init__.py

-from . import openpose_python as openpose_python
+from . import pyopenpose as pyopenpose

python/openpose/openpose_python.cpp

@@ -168,7 +168,7 @@ public:
     }
 };
 
-PYBIND11_MODULE(openpose_python, m) {
+PYBIND11_MODULE(pyopenpose, m) {
 
     // Functions for Init Params
     m.def("init_int", &init_int, "Init Function");

scripts/travis/run_tests.sh

@@ -40,7 +40,7 @@ if [[ $RUN_EXAMPLES == true ]] ; then
   if [[ $WITH_PYTHON == true ]] ; then
     echo "Python API C++: OpenPose demo..."
     cd build/examples/tutorial_api_python
-    python openpose_test.py --net_resolution -1x32 --image_dir ../../../examples/media/ --write_json output/ --display 0 --render_pose 0
+    python openpose_python.py --net_resolution -1x32 --image_dir ../../../examples/media/ --write_json output/ --display 0 --render_pose 0
     echo " "
     # Note: All Python examples require GUI
   fi

scripts/ubuntu/Makefile.config.Ubuntu16_cuda9_JetsonTX2_caffe

-## Refer to http://caffe.berkeleyvision.org/installation.html
-# Contributions simplifying and improving our build system are welcome!
-
-# cuDNN acceleration switch (uncomment to build with cuDNN).
-USE_CUDNN := 1
-
-# CPU-only switch (uncomment to build without GPU support).
-# CPU_ONLY := 1
-
-# uncomment to disable IO dependencies and corresponding data layers
-# USE_OPENCV := 0
-# USE_LEVELDB := 0
-# USE_LMDB := 0
-
-# uncomment to allow MDB_NOLOCK when reading LMDB files (only if necessary)
-#	You should not set this flag if you will be reading LMDBs with any
-#	possibility of simultaneous read and write
-# ALLOW_LMDB_NOLOCK := 1
-
-# Uncomment if you're using OpenCV 3
-OPENCV_VERSION := 3
-
-# To customize your choice of compiler, uncomment and set the following.
-# N.B. the default for Linux is g++ and the default for OSX is clang++
-# CUSTOM_CXX := g++
-
-# CUDA directory contains bin/ and lib/ directories that we need.
-CUDA_DIR := /usr/local/cuda
-# On Ubuntu 14.04, if cuda tools are installed via
-# "sudo apt-get install nvidia-cuda-toolkit" then use this instead:
-# CUDA_DIR := /usr
-
-# CUDA architecture setting: going with all of them.
-# For CUDA < 6.0, comment the *_50 through *_61 lines for compatibility.
-# For CUDA < 8.0, comment the *_60 and *_61 lines for compatibility.
-CUDA_ARCH := -gencode arch=compute_30,code=sm_30 \
-		-gencode arch=compute_35,code=sm_35 \
-		-gencode arch=compute_50,code=sm_50 \
-		-gencode arch=compute_52,code=sm_52 \
-		-gencode arch=compute_60,code=sm_60 \
-		-gencode arch=compute_61,code=sm_61 \
-		-gencode arch=compute_61,code=compute_61
-# Deprecated
-# CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
-# 		-gencode arch=compute_20,code=sm_21 \
-# 		-gencode arch=compute_30,code=sm_30 \
-# 		-gencode arch=compute_35,code=sm_35 \
-# 		-gencode arch=compute_50,code=sm_50 \
-# 		-gencode arch=compute_52,code=sm_52 \
-# 		-gencode arch=compute_60,code=sm_60 \
-# 		-gencode arch=compute_61,code=sm_61 \
-# 		-gencode arch=compute_61,code=compute_61
-
-# BLAS choice:
-# atlas for ATLAS (default)
-# mkl for MKL
-# open for OpenBlas
-BLAS := atlas
-# Custom (MKL/ATLAS/OpenBLAS) include and lib directories.
-# Leave commented to accept the defaults for your choice of BLAS
-# (which should work)!
-# BLAS_INCLUDE := /path/to/your/blas
-# BLAS_LIB := /path/to/your/blas
-
-# Homebrew puts openblas in a directory that is not on the standard search path
-# BLAS_INCLUDE := $(shell brew --prefix openblas)/include
-# BLAS_LIB := $(shell brew --prefix openblas)/lib
-
-# This is required only if you will compile the matlab interface.
-# MATLAB directory should contain the mex binary in /bin.
-# MATLAB_DIR := /usr/local
-# MATLAB_DIR := /Applications/MATLAB_R2012b.app
-
-# NOTE: this is required only if you will compile the python interface.
-# We need to be able to find Python.h and numpy/arrayobject.h.
-PYTHON_INCLUDE := /usr/include/python2.7 \
-		/usr/lib/python2.7/dist-packages/numpy/core/include \
-		/usr/local/lib/python2.7/dist-packages/numpy/core/include
-# Anaconda Python distribution is quite popular. Include path:
-# Verify anaconda location, sometimes it's in root.
-# ANACONDA_HOME := $(HOME)/anaconda
-# PYTHON_INCLUDE := $(ANACONDA_HOME)/include \
-		# $(ANACONDA_HOME)/include/python2.7 \
-		# $(ANACONDA_HOME)/lib/python2.7/site-packages/numpy/core/include
-
-# Uncomment to use Python 3 (default is Python 2)
-# PYTHON_LIBRARIES := boost_python3 python3.5m
-# PYTHON_INCLUDE := /usr/include/python3.5m \
-#                 /usr/lib/python3.5/dist-packages/numpy/core/include
-
-# We need to be able to find libpythonX.X.so or .dylib.
-PYTHON_LIB := /usr/lib /usr/local/lib
-# PYTHON_LIB := $(ANACONDA_HOME)/lib
-
-# Homebrew installs numpy in a non standard path (keg only)
-# PYTHON_INCLUDE += $(dir $(shell python -c 'import numpy.core; print(numpy.core.__file__)'))/include
-# PYTHON_LIB += $(shell brew --prefix numpy)/lib
-
-# Uncomment to support layers written in Python (will link against Python libs)
-# WITH_PYTHON_LAYER := 1
-
-# Whatever else you find you need goes here.
-INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include /usr/include/hdf5/serial
-LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib /usr/lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu/hdf5/serial
-
-# If Homebrew is installed at a non standard location (for example your home directory) and you use it for general dependencies
-# INCLUDE_DIRS += $(shell brew --prefix)/include
-# LIBRARY_DIRS += $(shell brew --prefix)/lib
-
-# NCCL acceleration switch (uncomment to build with NCCL)
-# https://github.com/NVIDIA/nccl (last tested version: v1.2.3-1+cuda8.0)
-# USE_NCCL := 1
-
-# Uncomment to use `pkg-config` to specify OpenCV library paths.
-# (Usually not necessary -- OpenCV libraries are normally installed in one of the above $LIBRARY_DIRS.)
-# USE_PKG_CONFIG := 1
-
-# N.B. both build and distribute dirs are cleared on `make clean`
-BUILD_DIR := build
-DISTRIBUTE_DIR := distribute
-
-# Uncomment for debugging. Does not work on OSX due to https://github.com/BVLC/caffe/issues/171
-# DEBUG := 1
-
-# The ID of the GPU that 'make runtest' will use to run unit tests.
-TEST_GPUID := 0
-
-# enable pretty build (comment to see full commands)
-Q ?= @

scripts/ubuntu/install_caffe_JetsonTX2_JetPack3.3.sh

-#!/bin/bash
-
-
-
-echo "------------------------- Installing Caffe -------------------------"
-echo "NOTE: This script assumes that just flashed JetPack 3.3 : Ubuntu 16, CUDA 9, cuDNN 7 and OpenCV are already installed on your machine. Otherwise, it might fail."
-
-
-
-function exitIfError {
-    if [[ $? -ne 0 ]] ; then
-        echo ""
-        echo "------------------------- -------------------------"
-        echo "Errors detected. Exiting script. The software might have not been successfully installed."
-        echo "------------------------- -------------------------"
-        exit 1
-    fi
-}
-
-
-
-echo "------------------------- Checking Ubuntu Version -------------------------"
-# If you respected the installation assumptions, nothing to do. 
-echo "------------------------- Ubuntu Version Checked -------------------------"
-echo ""
-
-
-
-echo "------------------------- Installing some Caffe Dependencies -------------------------"
-# Basic
-sudo apt-get --assume-yes update
-sudo apt-get --assume-yes install build-essential
-# General dependencies
-sudo apt-get --assume-yes install libprotobuf-dev libleveldb-dev libsnappy-dev libhdf5-serial-dev protobuf-compiler libatlas-base-dev
-sudo apt-get --assume-yes install --no-install-recommends libboost-all-dev
-sudo apt-get --assume-yes install libgflags-dev libgoogle-glog-dev liblmdb-dev
-# Python libs
-sudo apt-get --assume-yes install python-pip python-dev build-essential
-sudo -H pip install --upgrade pip
-sudo -H pip install --upgrade numpy protobuf
-# OpenCV is provided for tegra in JetPack
-exitIfError
-echo "------------------------- Some Caffe Dependencies Installed -------------------------"
-echo ""
-
-
-
-echo "------------------------- Compiling Caffe -------------------------"
-cp Makefile.config.Ubuntu16_cuda9_JetsonTX2_caffe Makefile.config
-make all -j`nproc` && make distribute -j`nproc`
-# make test -j`nproc`
-# make runtest -j`nproc`
-exitIfError
-echo "------------------------- Caffe Compiled -------------------------"
-echo ""
-
-
-
-echo "------------------------- Caffe Installed -------------------------"
-echo ""

scripts/ubuntu/install_caffe_and_openpose_JetsonTX2_JetPack3.1.sh

@@ -35,7 +35,7 @@ function executeShInItsFolder {
 
 
 
-git submodule update --init --recursive
+git submodule update --init --recursive --remote
 executeShInItsFolder "install_caffe_JetsonTX2_JetPack3.1.sh" "./3rdparty/caffe" "../.."
 exitIfError
 

scripts/ubuntu/install_caffe_and_openpose_JetsonTX2_JetPack3.3.sh

@@ -34,10 +34,9 @@ function executeShInItsFolder {
 }
 
 
-rm -r ./3rdparty/caffe
-git submodule update --init --recursive
-mv ./scripts/ubuntu/install_caffe_JetsonTX2_JetPack3.3.sh ./3rdparty/caffe/install_caffe_JetsonTX2_JetPack3.3.sh
-mv ./scripts/ubuntu/Makefile.config.Ubuntu16_cuda9_JetsonTX2_caffe ./3rdparty/caffe/Makefile.config.Ubuntu16_cuda9_JetsonTX2_caffe
+
+rm -rf ./3rdparty/caffe && mkdir ./3rdparty/caffe
+git submodule update --init --recursive --remote
 executeShInItsFolder "install_caffe_JetsonTX2_JetPack3.3.sh" "./3rdparty/caffe" "../.."
 exitIfError
 

scripts/ubuntu/install_openpose_JetsonTX2_JetPack3.1.sh

@@ -41,8 +41,6 @@ echo ""
 
 
 echo "------------------------- Compiling OpenPose -------------------------"
-# Go back to main folder
-cd ../..
 # Copy Makefile & Makefile.config
 cp scripts/ubuntu/Makefile.example Makefile
 cp scripts/ubuntu/Makefile.config.Ubuntu16_cuda8_JetsonTX2 Makefile.config

scripts/ubuntu/install_openpose_JetsonTX2_JetPack3.3.sh

@@ -3,7 +3,7 @@
 
 
 echo "------------------------- Installing OpenPose -------------------------"
-echo "NOTE: This script assumes that just flashed JetPack 3.1 : Ubuntu 16, CUDA 8, cuDNN 6 and OpenCV are already installed on your machine. Otherwise, it might fail."
+echo "NOTE: This script assumes that just flashed JetPack 3.3 : Ubuntu 16, CUDA 9, cuDNN 7 and OpenCV are already installed on your machine. Otherwise, it might fail."
 
 function exitIfError {
     if [[ $? -ne 0 ]] ; then
@@ -41,11 +41,9 @@ echo ""
 
 
 echo "------------------------- Compiling OpenPose -------------------------"
-# Go back to main folder
-cd ../..
 # Copy Makefile & Makefile.config
 cp scripts/ubuntu/Makefile.example_openpose Makefile
-cp scripts/ubuntu/Makefile.config.Ubuntu16_cuda9_JetsonTX2_openpose Makefile.config
+cp scripts/ubuntu/Makefile.config.Ubuntu16_cuda9_JetsonTX2_JetPack33 Makefile.config
 # Compile OpenPose
 make all -j`nproc`
 exitIfError

scripts/ubuntu_deprecated/install_caffe_and_openpose_if_cuda8.sh

@@ -35,7 +35,7 @@ function executeShInItsFolder {
 
 
 
-git submodule update --init --recursive
+git submodule update --init --recursive --remote
 executeShInItsFolder "install_caffe_if_cuda8.sh" "./3rdparty/caffe" "../.."
 exitIfError