Skip to content

Commit

Permalink
Merge pull request #2 from lagadic/master
Browse files Browse the repository at this point in the history
Merge lagadic/visp to master
  • Loading branch information
SeaingAnt authored Sep 18, 2023
2 parents 197e4b7 + bd8598e commit 4480a32
Show file tree
Hide file tree
Showing 1,650 changed files with 59,592 additions and 24,193 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -31,7 +31,7 @@ jobs:
run: dpkg --list | grep compiler

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev lcov gcovr
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev lcov gcovr

- name: Clone visp-images
env:
Expand All @@ -46,7 +46,7 @@ jobs:
run: |
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_COVERAGE=ON
cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_COVERAGE=ON -DBUILD_DEPRECATED_FUNCTIONS=OFF
cat ViSP-third-party.txt
- name: Compile
Expand All @@ -58,10 +58,22 @@ jobs:
working-directory: build
run: |
lcov --zerocounters --directory .
cmake --build . --target all
cmake --build . --target test
cmake --build . --target all -j$(nproc)
cmake --build . --target test -j$(nproc)
lcov --directory . --capture --output-file visp-coverage.info
lcov --remove visp-coverage.info '/usr/*' '/home/runner/work/visp/visp/3rdparty/*' --output-file visp-coverage.cleaned
lcov --remove visp-coverage.info \
'/usr/*' \
'*/private/*' \
'*/test/*' \
"/home/runner/work/visp/visp/3rdparty/*" \
"/home/runner/work/visp/visp/demo/*" \
"/home/runner/work/visp/visp/example/*" \
"/home/runner/work/visp/visp/samples/*" \
"/home/runner/work/visp/visp/modules/gui*" \
"/home/runner/work/visp/visp/modules/io/src/parallel-port*" \
"/home/runner/work/visp/visp/modules/robot*" \
"/home/runner/work/visp/visp/modules/sensor*" \
--output-file visp-coverage.cleaned
- name: Upload report to Codecov
uses: codecov/codecov-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos-ustk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: |
Expand All @@ -34,15 +34,15 @@ jobs:
run: system_profiler SPSoftwareDataType

- name: Install dependencies
run: brew install libpng libjpeg libdc1394 opencv pcl librealsense zbar vtk fftw armadillo
run: brew install libpng libjpeg libdc1394 opencv pcl librealsense zbar vtk fftw armadillo nlohmann-json

- name: Clone visp-images
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Clone ustk-dataset
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
run: system_profiler SPSoftwareDataType

- name: Install dependencies
run: brew install libpng libjpeg libdc1394 opencv pcl librealsense zbar pkg-config
run: brew install libpng libjpeg libdc1394 opencv pcl librealsense zbar pkg-config nlohmann-json

- name: Install java dependencies
run: |
Expand All @@ -49,7 +49,7 @@ jobs:
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Clone visp_sample
Expand All @@ -76,7 +76,7 @@ jobs:

- name: Run unit tests
working-directory: build
run: ctest -j$(sysctl -n hw.logicalcpu) --output-on-failure
run: ctest -j$(sysctl -n hw.logicalcpu) --output-on-failure -V

- name: ViSP as 3rdparty with cmake
run: |
Expand Down Expand Up @@ -111,7 +111,8 @@ jobs:
run: |
cd ${HOME}/visp_sample
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/tmp/usr/local/lib/pkgconfig
/tmp/usr/local/bin/visp-config --cflags
/tmp/usr/local/bin/visp-config --libs
export VISP_INSTALL_PREFIX=/tmp/usr/local
$VISP_INSTALL_PREFIX/bin/visp-config --cflags
$VISP_INSTALL_PREFIX/bin/visp-config --libs
make -j$(sysctl -n hw.logicalcpu) -f Makefile.visp-config
make -j$(sysctl -n hw.logicalcpu) -f Makefile.visp-config clean
2 changes: 1 addition & 1 deletion .github/workflows/other-arch-isolated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Run on arch
uses: uraimo/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/other-arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Run on arch
uses: uraimo/[email protected]
Expand All @@ -64,7 +64,7 @@ jobs:
apt-get update && apt-get install -y libssl-dev libusb-1.0-0-dev pkg-config libgtk-3-dev libglfw3-dev libgl1-mesa-dev libglu1-mesa-dev
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
export VISP_INPUT_IMAGE_PATH=$HOME
export VISP_INPUT_IMAGE_PATH=$HOME/visp-images
echo ${VISP_INPUT_IMAGE_PATH}
pwd
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu-3rdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -37,11 +37,11 @@ jobs:

- name: Install dependencies for ubuntu 18.04 and 20.04
if: matrix.os != 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Install dependencies for ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Clone camera_localization
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu-contrib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -37,11 +37,11 @@ jobs:

- name: Install dependencies for ubuntu 18.04 and 20.04
if: matrix.os != 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Install dependencies for ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Clone visp_contrib
run: |
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/ubuntu-dep-apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -38,19 +38,19 @@ jobs:

- name: Install dependencies for ubuntu 18.04 and 20.04
if: matrix.os != 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Install dependencies for ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Clone visp-images
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Clone visp_sample
Expand Down Expand Up @@ -104,9 +104,10 @@ jobs:
run: |
cd ${HOME}/visp_sample
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/tmp/usr/local/lib/pkgconfig
export VISP_INSTALL_PREFIX=/tmp/usr/local
CC=${{ matrix.compiler.CC }}
CXX=${{ matrix.compiler.CXX }}
/tmp/usr/local/bin/visp-config --cflags
/tmp/usr/local/bin/visp-config --libs
$VISP_INSTALL_PREFIX/bin/visp-config --cflags
$VISP_INSTALL_PREFIX/bin/visp-config --libs
make CXX=${{ matrix.compiler.CXX }} -j$(nproc) -f Makefile.visp-config
make CXX=${{ matrix.compiler.CXX }} -j$(nproc) -f Makefile.visp-config clean
5 changes: 3 additions & 2 deletions .github/workflows/ubuntu-dep-src.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -47,6 +47,7 @@ jobs:
sudo apt-get install -y libx11-dev libv4l-dev gfortran liblapack-dev libeigen3-dev
sudo apt-get install -y libssl-dev libusb-1.0-0-dev pkg-config libgtk-3-dev libglfw3-dev libgl1-mesa-dev libglu1-mesa-dev
sudo apt-get install -y mesa-common-dev mesa-utils freeglut3-dev libflann-dev libboost-all-dev
sudo apt-get install -y nlohmann-json3-dev
- name: Install dependencies for ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'
Expand Down Expand Up @@ -117,7 +118,7 @@ jobs:
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Configure CMake
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-isolated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -34,22 +34,27 @@ jobs:
run: lsb_release -a

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libblas-dev libeigen3-dev nlohmann-json3-dev

- name: Linear algebra liblapack/libblas alternatives
run: |
update-alternatives --list liblapack.so.3-x86_64-linux-gnu
update-alternatives --list libblas.so.3-x86_64-linux-gnu
- name: Clone visp-images
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Configure CMake
run: |
mkdir build
cd build
cmake .. -DCMAKE_C_FLAGS=${{ matrix.flags }} -DCMAKE_CXX_FLAGS=${{ matrix.flags }} -DCMAKE_LDFLAGS=${{ matrix.flags }} -DCMAKE_BUILD_TYPE=Debug
cmake .. -DCMAKE_C_FLAGS=${{ matrix.flags }} -DCMAKE_CXX_FLAGS=${{ matrix.flags }} -DCMAKE_LDFLAGS=${{ matrix.flags }} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_OPENMP=OFF
cat ViSP-third-party.txt
- name: Compile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu-ustk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -36,19 +36,19 @@ jobs:

- name: Install dependencies for ubuntu 18.04 and 20.04
if: matrix.os != 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-22-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Install dependencies for ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev

- name: Clone visp-images
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Clone ustk-dataset
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
access_token: ${{ github.token }}

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Print system information
run: lscpu
Expand All @@ -28,15 +28,15 @@ jobs:
run: lsb_release -a

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev valgrind
run: sudo apt-get update && sudo apt-get install -y libx11-dev libdc1394-dev libv4l-dev liblapack-dev libopenblas-dev libeigen3-dev libopencv-dev nlohmann-json3-dev valgrind

- name: Clone visp-images
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
# https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
run: |
git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
echo ${VISP_INPUT_IMAGE_PATH}
- name: Configure CMake
Expand Down
Loading

0 comments on commit 4480a32

Please sign in to comment.