The C++ Inference Library of OpenPose-Plus v2.0.0

.clang-format

@@ -1,22 +1,115 @@
-# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-# clang-format version 6.0.0 (tags/RELEASE_600/final)
-
-AllowShortBlocksOnASingleLine: true
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
-
-IndentWidth: 4
-BreakBeforeBraces: Linux
-SortIncludes: true
-# IncludeBlocks: true
-# IncludeBlocks: IBS_Regroup  # clang-format 8
-
+---
+Language:        Cpp
+# BasedOnStyle:  WebKit
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: WebKit
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     0
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
 DerivePointerAlignment: false
-PointerAlignment: Right
-
-ColumnLimit: 80
-SpacesBeforeTrailingComments: 2
-
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: Inner
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+RawStringFormats:
+  - Delimiters:       [pb]
+    Language:        TextProto
+    BasedOnStyle:    google
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
 
-# TODO: require one blank line between blocks

.gitignore

@@ -22,6 +22,7 @@ __pycache__
 /lib
 /tensorlayer
 /vis
+build
 cmake_install.cmake
 CMakeCache.txt
 CMakeFiles
@@ -32,10 +33,14 @@ CPackConfig.cmake
 CPackSourceConfig.cmake
 CTestTestfile.cmake
 inference/*png
+install_manifest.txt
 libstdtensor-prefix
 libstdtracer-prefix
 Makefile
 test.py
 Testing
 third_party
 venv
+/doc
+_build
+docs/make.bat

.readthedocs.yml

@@ -4,7 +4,7 @@
 version: 2
 
 sphinx:
-  configuration: doc/conf.py
+  configuration: docs/conf.py
   fail_on_warning: true
 
 formats:
@@ -13,4 +13,4 @@ formats:
 python:
   version: 3.6
   install:
-  - requirements: doc/requirements.txt
+  - requirements: docs/requirements.txt

.travis.yml

@@ -15,19 +15,20 @@ sudo: required
 
 before_install:
 - docker info
-- sudo apt update
-- sudo apt install -y swig # FIXME: can't install libopencv-dev on travis CI
-- pip install -r requirements.txt
-- pip install pycocotools  # must be installed after cython is installed
-- ./scripts/install-pafprocess.sh
-- ./scripts/download-test-data.sh
+# - sudo apt update
+# - sudo apt install -y swig # FIXME: can't install libopencv-dev on travis CI
+# - pip install -r requirements.txt
+# - pip install pycocotools  # must be installed after cython is installed
+# - ./scripts/install-pafprocess.sh
+# - ./scripts/download-test-data.sh
 
 script:
-- docker build --rm -t openpose-plus-test:snapshot -f docker/Dockerfile.travis-ci .
-- docker run --rm -it openpose-plus-test:snapshot sh -c './configure --build-fake --with-trace && make && make test'
-- python ./examples/example-inference-1.py --path-to-npz='' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=vgg
-- python ./examples/example-inference-1.py --path-to-npz='' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=vggtiny
-- python ./examples/example-inference-1.py --path-to-npz='' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=mobilenet
+- echo TODO
+# - docker build --rm -t openpose-plus-test:snapshot -f docker/Dockerfile.travis-ci .
+# - docker run --rm -it openpose-plus-test:snapshot sh -c './configure --build-fake --with-trace && make && make test'
+# - python ./examples/example-inference-1.py --path-to-npz='' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=vgg
+# - python ./examples/example-inference-1.py --path-to-npz='' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=vggtiny
+# - python ./examples/example-inference-1.py --path-to-npz='' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=mobilenet
 
-- wget https://media.githubusercontent.com/media/tensorlayer/pretrained-models/master/models/hyperpose/hao28-pose345000.npz
-- python ./examples/example-inference-1.py --path-to-npz='hao28-pose345000.npz' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=hao28_experimental
+# - wget https://media.githubusercontent.com/media/tensorlayer/pretrained-models/master/models/hyperpose/hao28-pose345000.npz
+# - python ./examples/example-inference-1.py --path-to-npz='hao28-pose345000.npz' --images=$(ls data/media/*.jpg | sort | head -n 3 | tr '\n' ',') --base-model=hao28_experimental

CMakeLists.txt

@@ -1,28 +1,34 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
-PROJECT(openpose-plus)
+PROJECT(hyperpose)
 
 SET(CMAKE_CXX_STANDARD 17)
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE(cmake/3rdparty.cmake)
 
 OPTION(WITH_TRACE "Build with tracing library." OFF)
 OPTION(BUILD_FAKE "Build fake target without CUDA libraries." OFF)
 OPTION(ENABLE_CUDA "Build with CUDA support." ON)
+OPTION(BUILD_EXAMPLES "Build with examples." ON)
+OPTION(BUILD_TESTS "Build with tests." ON)
 
 IF(WITH_TRACE)
-    MESSAGE(STATUS "[OPENPOSE-PLUS] Trace Enabled.")
+    MESSAGE(STATUS "[HyperPose] Trace Enabled.")
     ADD_DEFINITIONS(-DENABLE_TRACE)
 ENDIF()
 
-IF(BUILD_FAKE)
-    MESSAGE(STATUS "[OPENPOSE-PLUS] Fake Building Enabled.")
-    ADD_LIBRARY(openpose-plus src/fake_openpose_plus.cpp)
-ELSE()
-    INCLUDE(cmake/openpose-plus.cmake)
-    INCLUDE(cmake/package.cmake)
+INCLUDE(cmake/hyperpose.cmake)
+INCLUDE(cmake/package.cmake)
+
+IF(BUILD_EXAMPLES)
+    MESSAGE(STATUS "[HyperPose] Examples Building Enabled.")
+    INCLUDE(cmake/helpers.cmake)
+    INCLUDE(cmake/examples.cmake)
 ENDIF()
-INCLUDE(cmake/examples.cmake)
 
-ENABLE_TESTING()
-# TODO: add tests
+IF(BUILD_TESTS)
+    MESSAGE(STATUS "[HyperPose] Tests Building Enabled.")
+    INCLUDE(cmake/helpers.cmake)
+    INCLUDE(cmake/tests.cmake)
+ENDIF()

Makefile

@@ -0,0 +1 @@
+Makefile.old

Makefile.config

@@ -1,4 +1,4 @@
-BUILD_DIR = $(CURDIR)/cmake-build/$(shell uname)
+BUILD_DIR = $(CURDIR)/cmake-build
 
 
 ifeq ($(shell uname), Darwin)

Makefile.old

@@ -0,0 +1,31 @@
+MAKEFILE ?= Makefile.config
+include $(MAKEFILE)
+
+default: build_with_cmake
+# default: docker-build-gpu
+
+cmake_targets:
+	mkdir -p $(BUILD_DIR)
+	cd $(BUILD_DIR); cmake $(CMAKE_FLAGS) $(CURDIR)
+
+cmake_targets_with_trace:
+	mkdir -p $(BUILD_DIR)
+	cd $(BUILD_DIR); cmake -DWITH_TRACE=ON $(CMAKE_FLAGS) $(CURDIR)
+
+build_with_cmake: cmake_targets
+	make -C $(BUILD_DIR) -j $(NPROC)
+
+pack: cmake_targets
+	make -C $(BUILD_DIR) -j $(NPROC) package
+
+pack_trace: cmake_targets_with_trace
+	make -C $(BUILD_DIR) -j  $(NPROC) package
+
+# Using Docker.
+CPU_TAG = openpose-plus:builder
+docker-build:
+	docker build --rm -t $(CPU_TAG) -f docker/Dockerfile.builder-cpu .
+
+GPU_TAG = openpose-plus:builder-gpu
+docker-build-gpu:
+	docker build --rm -t $(GPU_TAG) -f docker/Dockerfile.builder-gpu .