Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.4.3 prep #575

Merged
merged 60 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
d6b9e9d
Implemented a class to generate point clouds of 3D geometric primitives
YoshuaNava Mar 6, 2023
1456a87
Merge branch 'master' into feature/point_cloud_generator
pomerlef Mar 17, 2023
c1b1a9c
Merge branch 'master' into feature/point_cloud_generator
pomerlef Mar 17, 2023
90dc3e0
Merge branch 'develop' into feature/point_cloud_generator
boxanm Nov 6, 2023
4831576
Merge branch 'develop' into feature/point_cloud_generator
boxanm Apr 23, 2024
376743f
Add yaml-cpp as a dependency in libpointmatcherConfig.cmake.in
boxanm May 2, 2024
b916981
Fix compilation error in PointCloudGenerator.cpp test caused by Eigen…
boxanm May 2, 2024
bf2c2e5
Add python bindings for Point Cloud Generator class
boxanm May 3, 2024
1ec55f8
Add example python script for Point Cloud Generator class
boxanm May 3, 2024
d9f4846
Add .cpp extension to PointCloudGenerator in CMakeLists.txt
boxanm May 3, 2024
f4bcbf2
Move 3D-specific types to PointCloudGenerator class
boxanm May 3, 2024
7d2a629
Merge branch 'develop' into fix/yaml-cpp-dependency-issue-563
boxanm May 5, 2024
c865d15
Move documentation to Material for MkDocs
boxanm May 5, 2024
67032b7
Move the compilation guides into a single file
boxanm May 5, 2024
a52470d
Add file that lists dependencies' version on MacOS
boxanm May 5, 2024
8fccac6
Merge pull request #565 from norlab-ulaval/fix/yaml-cpp-dependency-is…
boxanm May 5, 2024
a15ee01
Move library application youtube videos into a grid
boxanm May 6, 2024
81c68c8
Update documentation to Material for MkDocs
boxanm May 6, 2024
362cc85
Update README.md
boxanm May 6, 2024
82e6149
Add a square root for radius to have uniform density of points in gen…
boxanm May 6, 2024
5ddb820
Merge branch 'develop' into feature/point_cloud_generator
boxanm May 6, 2024
8f444fa
Add build setting to .readthedocs.yml
boxanm May 6, 2024
9a18472
Fix python version
boxanm May 6, 2024
b5afc8b
Update ReadTheDocs dependencies
boxanm May 6, 2024
39dee35
Add logo
boxanm May 6, 2024
d303d2f
Update site description
boxanm May 6, 2024
ad3a974
Update site description
boxanm May 6, 2024
99fb9cf
Fix url in Documentation.dox
boxanm May 7, 2024
ef652bf
Fix Doxygen doc build
boxanm May 7, 2024
fd79aff
Add API documentation GitHub workflow
boxanm May 7, 2024
156b09e
Update website repository field
boxanm May 7, 2024
abe2980
Update update-API-documentation.yaml
boxanm May 7, 2024
efba5ba
Remove PR creation
boxanm May 7, 2024
7e84e9f
Pull changes in the update-libpointmatcher-docs website branch before…
boxanm May 7, 2024
6151406
Safely exit when there's nothing new to commit
boxanm May 7, 2024
f781c4d
Checkout master branch of the website repo
boxanm May 7, 2024
6927f08
Update update-API-documentation.yaml
boxanm May 7, 2024
314eaf7
Use gh command to submit a PR for the website
boxanm May 7, 2024
d51c4f3
Update GH_TOKEN
boxanm May 7, 2024
af89a77
Try setting ssh key with ssh-agent
boxanm May 7, 2024
f98132c
Add github.token
boxanm May 7, 2024
3c307c4
Remove PR request creation
boxanm May 7, 2024
9f9b0aa
Update uniformly sampled circle
boxanm May 7, 2024
f858701
Merge remote-tracking branch 'YoshuaNava/feature/point_cloud_generato…
boxanm May 7, 2024
5df96e1
Merge pull request #508 from YoshuaNava/feature/point_cloud_generator
boxanm May 7, 2024
4a354eb
Merge branch 'develop' into doxygen-github-action
boxanm May 7, 2024
f6f3407
Merge branch 'develop' into mkdocs-material
boxanm May 7, 2024
226f6a1
Trigger on push to master
boxanm May 7, 2024
e0320b8
Merge pull request #569 from norlab-ulaval/mkdocs-material
boxanm May 9, 2024
52f03a4
Merge branch 'develop' into doxygen-github-action
boxanm May 9, 2024
e8697c2
Merge pull request #568 from norlab-ulaval/doxygen-github-action
boxanm May 10, 2024
1c578cb
Add function that allows loading Yaml configuration from a YAML::Node
boxanm May 10, 2024
04d8bb4
Add function that allows loading Yaml configuration from a YAML::Node
boxanm May 10, 2024
08f2b38
Merge pull request #570 from boxanm/yaml-processing
boxanm May 18, 2024
5b10e29
Add a method that returns a list of all available Descriptor's parame…
boxanm May 18, 2024
d5ce52a
Add python binding for the method that returns a list of all availabl…
boxanm May 18, 2024
67837fe
Merge pull request #572 from norlab-ulaval/available-parameters-getter
boxanm May 23, 2024
1dddcbe
ci: fix build system standalone dependencies installer and run config…
RedLeader962 Jun 5, 2024
ca12686
Merge branch 'develop' into fix-build-system-standand-alone-dependenc…
RedLeader962 Jun 5, 2024
0edf664
Merge pull request #573 from norlab-ulaval/fix-build-system-standand-…
RedLeader962 Jun 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/update-API-documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Update Documentation on Website

on:
push:
branches:
- master


jobs:
build_and_update_docs:
runs-on: ubuntu-latest
outputs:
libnabo_tag: ${{ steps.step1.outputs.libnabo_tag }}
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install dependencies
run: |
sudo apt update
sudo apt install -y build-essential cmake doxygen graphviz libboost-all-dev libeigen3-dev libyaml-cpp-dev

- name: Install libnabo 1) install jq
run: sudo apt install -y jq # Install jq for JSON processing

- name: Install libnabo 2) Get Latest Release Tag
id: get_latest_release
run: |
TAG=$(curl -s https://api.github.com/repos/norlab-ulaval/libnabo/releases/latest | jq -r '.tag_name')
echo "::set-output name=tag::$TAG"

- name: Install libnabo 4) Install libnabo
run: |
git clone -b ${{ steps.get_latest_release.outputs.tag }} https://github.com/norlab-ulaval/libnabo.git
echo "Latest release tag: ${{ steps.get_latest_release.outputs.tag }}"
mkdir -p libnabo/build
cd libnabo/build
cmake ..
sudo make install

- name: Set up libpointmatcher CMake
run: |
mkdir build
cd build
cmake -DGENERATE_API_DOC=TRUE ..

- name: Build Documentation
run: cd build && make doc

- name: Clone website repository
uses: actions/checkout@v2
with:
repository: norlab-ulaval/norlab-ulaval.github.io
path: website
ssh-key: ${{ secrets.NORLAB_WEBSITE_DOCUMENTATION }}
ref: master

- name: Replace documentation files
run: cp -r build/doc/html website/libpointmatcher-doc

- name: Commit and push changes
run: |
cd website
git config --local user.email "[email protected]"
git config --local user.name "GitHub Actions"
git add libpointmatcher-doc
git commit -m "Update documentation for new release" || exit 0
git push origin HEAD:refs/heads/update-libpointmatcher-docs --force

6 changes: 5 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
# Required
version: 2

build:
os: ubuntu-lts-latest
tools:
python: "3.12"

# Build documentation with MkDocs
mkdocs:
configuration: mkdocs.yml
Expand All @@ -15,6 +20,5 @@ mkdocs:

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3
install:
- requirements: doc/requirements.txt
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,10 @@ set(POINTMATCHER_SRC
pointmatcher/DataPointsFilters/DistanceLimit.cpp
pointmatcher/DataPointsFilters/RemoveSensorBias.cpp
pointmatcher/DataPointsFilters/Sphericality.cpp
pointmatcher/DataPointsFilters/Saliency.cpp
pointmatcher/DataPointsFilters/Saliency.cpp
pointmatcher/DataPointsFilters/SpectralDecomposition.cpp
#PointCloudGenerators
pointmatcher/PointCloudGenerator.cpp
)


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ on your workstation to speed up your local development workflow.
[//]: # (====Body=================================================================================)
# Documentation and Tutorials

**Quick link for the tutorial pages: [Tutorials](doc/index.md)** (also available on [readthedocs.org](http://libpointmatcher.readthedocs.org/) but might not be up-to-date).
**Quick link for the tutorial pages: [Tutorials](http://libpointmatcher.readthedocs.org/).

Those tutorials are written using Markdown syntax and stored in the project's `/doc` folder. Their scope ranges from introductory material on performing point cloud registration to instructions for the more experienced developer on how to extend the library's codebase.

Expand Down
2 changes: 1 addition & 1 deletion UseDoxygen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)

configure_file(${DOXYFILE_IN} Doxyfile IMMEDIATE @ONLY)

get_target_property(DOC_TARGET doc TYPE)
if(NOT DOC_TARGET)
add_custom_target(doc)
endif()
get_target_property(DOC_TARGET doc TYPE)

add_dependencies(doc doxygen)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="true" />
<envs>
<env name="DOCKER_CONTEXT" value="desktop-linux" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
</envs>
<method v="2" />
</configuration>
</component>
</component>
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
</envs>
<method v="2" />
</configuration>
</component>
</component>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="bash lpm_crawl_libpointmatcher_build_matrix.bash › build test_compilation_* (compilation test)" type="ShConfigurationType" folderName="[LPM] C | Execute compose over build matrix">
<option name="SCRIPT_TEXT" value="bash lpm_crawl_libpointmatcher_build_matrix.bash --fail-fast --cmake-build-type-build-matrix-override Release --os-name-build-matrix-override ubuntu --ubuntu-version-build-matrix-override jammy -- build test_compilation_prefixed_path test_compilation_auto_path_resolution" />
<option name="SCRIPT_TEXT" value="bash lpm_crawl_libpointmatcher_build_matrix.bash --fail-fast --cmake-build-type-build-matrix-override Release --os-name-build-matrix-override ubuntu --ubuntu-version-build-matrix-override focal -- build test_compilation_prefixed_path test_compilation_auto_path_resolution" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
Expand All @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
</envs>
<method v="2" />
</configuration>
</component>
</component>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs>
<env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG BASE_IMAGE=ubuntu
ARG BASE_IMAGE_TAG=jammy
#ARG BASE_IMAGE_TAG=jammy
ARG BASE_IMAGE_TAG=bionic
FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS base-image

LABEL org.opencontainers.image.authors="[email protected]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,19 @@ TMP_CWD=$(pwd)
LPM_PATH=$(git rev-parse --show-toplevel)
cd "${LPM_PATH}/build_system" || cd "${LPM_PATH}" || exit 1

NBS_PATH=${NBS_PATH:-"${LPM_PATH}/build_system/utilities/norlab-build-system"}
N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}

# ....Load environment variables from file.........................................................
set -o allexport
source .env
set +o allexport

# ....Helper function..............................................................................
# import shell functions from utilities library
N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"


# Set environment variable IMAGE_ARCH_AND_OS
cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash"

Expand Down
4 changes: 4 additions & 0 deletions build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@ if [[ $TEST_RUN == true ]]; then
BUILD_EXIT_CODE=0
INSTALL_EXIT_CODE=0
else
# # Hack to prevent LPM cmake build failure in ubuntu bionic
# BOOST_ROOT=$(whereis boost) && export BOOST_ROOT
# CMAKE_FLAGS=( -D BOOST_ROOT="$BOOST_ROOT" "${CMAKE_FLAGS[@]}" )

cmake "${CMAKE_FLAGS[@]}" "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}"

BUILD_EXIT_CODE=$?
Expand Down
Loading
Loading