From d6d596a3ea890db6d5dba35f0ce7a67e2af94311 Mon Sep 17 00:00:00 2001 From: yanzhang25 Date: Wed, 16 Nov 2022 00:00:04 +0100 Subject: [PATCH 1/3] setup local configs to successfully compile --- scripts/build_all.sh | 13 +++++++------ sfm/gmapper/cmake/FindOpenMP.cmake | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/build_all.sh b/scripts/build_all.sh index 79486ed..7cbdcb4 100755 --- a/scripts/build_all.sh +++ b/scripts/build_all.sh @@ -2,14 +2,15 @@ # set your customized python executable # PYTHON_EXECUTABLE=/media/shaoliu/anaconda/envs/particlesfm/bin/python -PYTHON_EXECUTABLE= # need to be set here +PYTHON_EXECUTABLE=/home/yzhang/miniconda3/envs/particlesfm/bin/python + # build point trajectory optimizer -cd point_trajectory/optimize -mkdir -p build && cd build -cmake -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} .. -make -j -cd ../../../ +# cd point_trajectory/optimize +# mkdir -p build && cd build +# cmake -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} .. +# make -j +# cd ../../../ # build global mapper cd sfm/gmapper diff --git a/sfm/gmapper/cmake/FindOpenMP.cmake b/sfm/gmapper/cmake/FindOpenMP.cmake index 867826c..97c7a0e 100755 --- a/sfm/gmapper/cmake/FindOpenMP.cmake +++ b/sfm/gmapper/cmake/FindOpenMP.cmake @@ -7,6 +7,7 @@ find_path(OpenMP_INCLUDE_DIR omp.h #HINTS /usr/lib/gcc/x86_64-linux-gnu/4.9/include/ HINTS /usr/lib/gcc/x86_64-linux-gnu/8/include/ + HINTS /usr/lib/gcc/x86_64-linux-gnu/9/include/ ) mark_as_advanced(OpenMP_LIBRARY OpenMP_INCLUDE_DIR) From d27dcfa1860b5240527b24eb1f2c3161aad69376 Mon Sep 17 00:00:00 2001 From: yanzhang25 Date: Wed, 16 Nov 2022 13:02:13 +0100 Subject: [PATCH 2/3] add supports of gcc 9.4.0 --- README.md | 4 +++- scripts/build_all.sh | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5fecf2e..9e43ec5 100755 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ conda env create -f particlesfm_env.yaml conda activate particlesfm ``` -3. Build our point trajectory optimizer and global structure-from-motion module. **The path to your customized python executable should be set [here](https://github.com/bytedance/particle-sfm/blob/main/scripts/build_all.sh#L5)**. +3. Build our point trajectory optimizer and global structure-from-motion module. +- The path to your customized python executable should be set [here](https://github.com/bytedance/particle-sfm/blob/main/scripts/build_all.sh#L5). +- (Optional) Add another gcc search path (e.g. gcc 9) [here](https://github.com/bytedance/particle-sfm/blob/b079361510f5241477d11e11082140b45b5d1c27/sfm/gmapper/cmake/FindOpenMP.cmake#L6) to compile gmapper correctly. ``` git submodule update --init --recursive sudo apt-get install libhdf5-dev diff --git a/scripts/build_all.sh b/scripts/build_all.sh index 7cbdcb4..213b56d 100755 --- a/scripts/build_all.sh +++ b/scripts/build_all.sh @@ -6,11 +6,11 @@ PYTHON_EXECUTABLE=/home/yzhang/miniconda3/envs/particlesfm/bin/python # build point trajectory optimizer -# cd point_trajectory/optimize -# mkdir -p build && cd build -# cmake -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} .. -# make -j -# cd ../../../ +cd point_trajectory/optimize +mkdir -p build && cd build +cmake -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} .. +make -j +cd ../../../ # build global mapper cd sfm/gmapper From d6c8087e1cd83f593fa114d41fc7b61cb033b46c Mon Sep 17 00:00:00 2001 From: yz-cnsdqz Date: Wed, 16 Nov 2022 13:35:29 +0100 Subject: [PATCH 3/3] add supports with gcc 9.4.0 --- scripts/build_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_all.sh b/scripts/build_all.sh index 213b56d..d79c2f2 100755 --- a/scripts/build_all.sh +++ b/scripts/build_all.sh @@ -2,7 +2,7 @@ # set your customized python executable # PYTHON_EXECUTABLE=/media/shaoliu/anaconda/envs/particlesfm/bin/python -PYTHON_EXECUTABLE=/home/yzhang/miniconda3/envs/particlesfm/bin/python +PYTHON_EXECUTABLE= # need to be set here # build point trajectory optimizer