From 582c622d7ddaaa3c24b81769c2a424b169719eed Mon Sep 17 00:00:00 2001 From: gineshidalgo99 Date: Wed, 12 Jul 2017 16:19:01 -0400 Subject: [PATCH] Fix Ubuntu script paths --- 3rdparty/caffe/python/caffe/proto/__init__.py | 8 ++++++++ ubuntu/install_caffe_and_openpose_if_cuda8.sh | 2 +- ubuntu/install_openpose_if_cuda8.sh | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 3rdparty/caffe/python/caffe/proto/__init__.py diff --git a/3rdparty/caffe/python/caffe/proto/__init__.py b/3rdparty/caffe/python/caffe/proto/__init__.py new file mode 100644 index 00000000..776945ee --- /dev/null +++ b/3rdparty/caffe/python/caffe/proto/__init__.py @@ -0,0 +1,8 @@ +from .pycaffe import Net, SGDSolver, NesterovSolver, AdaGradSolver, RMSPropSolver, AdaDeltaSolver, AdamSolver, NCCL, Timer +from ._caffe import init_log, log, set_mode_cpu, set_mode_gpu, set_device, Layer, get_solver, layer_type_list, set_random_seed, solver_count, set_solver_count, solver_rank, set_solver_rank, set_multiprocess, has_nccl +from ._caffe import __version__ +from .proto.caffe_pb2 import TRAIN, TEST +from .classifier import Classifier +from .detector import Detector +from . import io +from .net_spec import layers, params, NetSpec, to_proto diff --git a/ubuntu/install_caffe_and_openpose_if_cuda8.sh b/ubuntu/install_caffe_and_openpose_if_cuda8.sh index cbc5c148..5808f8b7 100755 --- a/ubuntu/install_caffe_and_openpose_if_cuda8.sh +++ b/ubuntu/install_caffe_and_openpose_if_cuda8.sh @@ -46,4 +46,4 @@ exitIfError echo "------------------------- Caffe and OpenPose Installed -------------------------" -echo "" \ No newline at end of file +echo "" diff --git a/ubuntu/install_openpose_if_cuda8.sh b/ubuntu/install_openpose_if_cuda8.sh index 5855f69d..bf40584f 100755 --- a/ubuntu/install_openpose_if_cuda8.sh +++ b/ubuntu/install_openpose_if_cuda8.sh @@ -62,11 +62,15 @@ echo "" echo "------------------------- Compiling OpenPose -------------------------" +# Go back to main folder +cd .. +# Copy Makefile.config if [[ $ubuntu_le_14 == true ]]; then cp ubuntu/Makefile.config.Ubuntu14_cuda8.example Makefile.config else cp ubuntu/Makefile.config.Ubuntu16_cuda8.example Makefile.config fi +# Compile OpenPose make all -j$NUM_CORES exitIfError echo "------------------------- OpenPose Compiled -------------------------" -- GitLab