Skip to content

Commit

Permalink
Merge branch 'ns/samples_timelapse' of https://github.com/nsabale7/Ap…
Browse files Browse the repository at this point in the history
…raPipes into ns/samples_timelapse
  • Loading branch information
nsabale7 committed Jul 9, 2024
2 parents 064cce5 + 1c2fa9d commit 197b75d
Show file tree
Hide file tree
Showing 152 changed files with 6,319 additions and 1,132 deletions.
137 changes: 0 additions & 137 deletions .clang-format

This file was deleted.

2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
data/mp4Reader_saveOrCompare/jpeg/*.jpg filter=lfs diff=lfs merge=lfs -text
data/mp4Reader_saveOrCompare/h264/*.h264 filter=lfs diff=lfs merge=lfs -text
3 changes: 2 additions & 1 deletion .github/workflows/CI-Linux-ARM64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
is-selfhosted: true
cuda: 'ON'
prep-cmd: 'echo skipping builder prep as I can not sudo'
bootstrap-cmd: 'export PATH="$HOME/.local/bin/gcc-8:$PATH" && export VCPKG_FORCE_SYSTEM_BINARIES=1 && ./vcpkg/bootstrap-vcpkg.sh'
cache-path: './none'
cmake-conf-cmd: 'export VCPKG_FORCE_SYSTEM_BINARIES=1 && export VCPKG_OVERLAY_PORTS=../thirdparty/custom-overlay && cmake -B . -DENABLE_ARM64=ON ../base'
cmake-conf-cmd: 'export VCPKG_OVERLAY_PORTS=../thirdparty/custom-overlay && cmake -B . -DENABLE_ARM64=ON ../base'
nProc: 6
jetson-publish:
needs: jetson-build-test
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/CI-Linux-CUDA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
is-selfhosted: true
cuda: 'ON'
prep-cmd: 'echo skipping builder prep as I can not sudo'
bootstrap-cmd: 'export PATH="/usr/bin/gcc-8:$PATH" && ./vcpkg/bootstrap-vcpkg.sh'
cache-path: './none'
nProc: 6
linux-cuda-publish:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-lin-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
prep-cmd:
type: string
description: 'commands required to be run on a builder to prep it for build'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev && pip3 install meson'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev python3-jinja2 && pip3 install meson'
required: false
prep-check-cmd:
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-lin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
prep-cmd:
type: string
description: 'commands required to be run on a builder to prep it for build'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxdamage-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev && pip3 install meson'
default: 'sudo apt-get update -qq && sudo apt-get -y install ca-certificates curl zip unzip tar autoconf automake autopoint build-essential flex git-core libass-dev libfreetype6-dev libgnutls28-dev libmp3lame-dev libsdl2-dev libtool libsoup-gnome2.4-dev libva-dev libvdpau-dev libvorbis-dev libxdamage-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libncurses5-dev libncursesw5-dev ninja-build pkg-config texinfo wget yasm zlib1g-dev nasm gperf bison python3 python3-pip dos2unix libx11-dev libgles2-mesa-dev libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev python3-jinja2 && pip3 install meson && pip3 install Jinja2'
required: false
prep-check-cmd:
type: string
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ jobs:
if: ${{ contains(inputs.cuda,'ON')}}
run: |
(nvcc --version) || echo 'please install cuda'
Get-Item 'c:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\include\cudnn.h' || echo 'install cudnn as described in the readme.md'
Get-Item 'c:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.8\include\cudnn.h' || echo 'install cudnn as described in the readme.md'
Get-Item Env:CUDA_HOME
Get-Item Env:CUDA_PATH
echo "CUDA_HOME=c:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7" >> $GITHUB_ENV
echo "CUDA_PATH=c:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\bin" >> $GITHUB_ENV
echo "CUDA_HOME=c:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.8" >> $GITHUB_ENV
echo "CUDA_PATH=c:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.8\bin" >> $GITHUB_ENV
- name: Cleanup workspace on self hosted runners
if: inputs.is-selfhosted
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/doxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@ name: Doxygen Action
on:
push:
branches: [ main ]

jobs:
build:
runs-on: ubuntu-latest
permissions:
pages: write
steps:
- uses: actions/checkout@v2

- name: Update Footer with Commit Hash
run: |
COMMIT_HASH=$(git rev-parse --short HEAD)
sed -i "s/@COMMIT_HASH@/$COMMIT_HASH/g" footer.html
sed -i "s/@COMMIT_HASH@/$COMMIT_HASH/g" data/gh-pages-assets/pages/footer.html
- name: Doxygen Action
uses: mattnotmitt/doxygen-action@v1.1.0
Expand Down
7 changes: 3 additions & 4 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PROJECT_NAME = "ApraPipes"
PROJECT_NUMBER = 1.0
# The directory where the documentation will be created
OUTPUT_DIRECTORY = ./documents
OUTPUT_DIRECTORY = ./documentation
# The root directory of the source code
INPUT = ./base/include ./base/src ./data/gh-pages-assets/pages/index.md ./data/gh-pages-assets/pages/introduction.md ./data/gh-pages-assets/pages/Tutorial_Adding_New_Module.md ./data/gh-pages-assets/pages/CUDAKernelProgrammingGuide.md
# File patterns to include in the documentation
Expand All @@ -29,7 +29,6 @@ HTML_COLORSTYLE = LIGHT
HTML_COLORSTYLE_HUE = 77
HTML_COLORSTYLE_SAT = 147
HTML_COLORSTYLE_GAMMA = 115
HTML_TIMESTAMP = YES
HTML_FOOTER = data/gh-pages-assets/pages/footer.html
HTML_HEADER = data/gh-pages-assets/pages/logo.html

Expand All @@ -48,11 +47,11 @@ UML_LOOK = YES
CALL_GRAPH = YES
CALLER_GRAPH = YES

IMAGE_PATH = data\gh-pages-assets\_images
IMAGE_PATH = data/gh-pages-assets/_images
HTML_EXTRA_STYLESHEET = data/gh-pages-assets/pages/custom.css
SHOW_NAMESPACES = NO
SHOW_FILES = NO
GENERATE_TREEVIEW = YES
DISABLE_INDEX = NO
HTML_EXTRA_FILES = data/gh-pages-assets/_images/apralogo.png
#$darkmode = YES

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Aprapipes is automatically built and tested on Ubuntu (18.04 and 20.04), Jetson

### Cuda
* Create an account on developer.nvidia.com if you're not already a member. Note : Otherwise the next step will show HTTP 404/403 error.
* Windows 10/11 : [Cuda Toolkit 10.2](https://developer.nvidia.com/cuda-10.2-download-archive?target_os=Windows&target_arch=x86_64&target_version=10&target_type=exelocal) or [CUDA Toolkit 11.7](https://developer.nvidia.com/cuda-downloads?target_os=Windows&target_arch=x86_64).
* Windows 10/11 : [Cuda Toolkit 10.2](https://developer.nvidia.com/cuda-10.2-download-archive?target_os=Windows&target_arch=x86_64&target_version=10&target_type=exelocal) or [CUDA Toolkit 11.8](https://developer.nvidia.com/cuda-11-8-0-download-archive?target_os=Windows).

### Cudnn
* Download [Cudnn](https://developer.nvidia.com/rdp/cudnn-archive#a-collapse765-102) and extract files where cuda is installed. Note: Please be aware that this process requires some effort. Here are the necessary steps:
Expand Down Expand Up @@ -118,7 +118,7 @@ Aprapipes is automatically built and tested on Ubuntu (18.04 and 20.04), Jetson
* Create an account on developer.nvidia.com if you're not already a member. Note : Otherwise the next step will show HTTP 404/403 error.
* Ubuntu 18.04/20.04:
18.04 - [CUDA Toolkit 10.2](https://developer.nvidia.com/cuda-10.2-download-archive?target_os=Linux&target_arch=x86_64&target_distro=Ubuntu&target_version=1804&target_type=debnetwork)
20.04 - [CUDA Toolkit 11.7](https://developer.nvidia.com/cuda-11-7-0-download-archive?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=20.04)
20.04 - [CUDA Toolkit 11.8](https://developer.nvidia.com/cuda-11-8-0-download-archive?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=20.04)

### Cudnn
* Download [Cudnn](https://developer.nvidia.com/rdp/cudnn-archive#a-collapse765-102)
Expand Down
Loading

0 comments on commit 197b75d

Please sign in to comment.