Skip to content

Commit b3bd172

Browse files
Merge pull request #165 from CVCUDA/feat/dlesage/v0.8.x
feat: adding code for release v0.8.0 of CV-CUDA
2 parents 11d40a4 + 48df11e commit b3bd172

File tree

75 files changed

+4349
-1002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+4349
-1002
lines changed

.github/workflows/codeql.yml

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL"
132

143
on:
@@ -22,11 +11,11 @@ on:
2211
jobs:
2312
analyze:
2413
name: Analyze
25-
runs-on: ${{ (matrix.language == 'c-cpp' && 'ubuntu-20.04-64core') || 'ubuntu-latest' }}
26-
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
14+
runs-on: ubuntu-20.04-64core
15+
timeout-minutes: 360
2716
permissions:
28-
actions: read
29-
contents: read
17+
actions: write
18+
contents: write
3019
security-events: write
3120

3221
strategy:
@@ -36,27 +25,35 @@ jobs:
3625

3726
steps:
3827
- name: Checkout repository
39-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
4029
with:
4130
lfs: true
4231
submodules: 'recursive'
4332

4433
- if: matrix.language == 'c-cpp'
4534
name: Setup environment
4635
run: |
36+
sudo apt update -y && sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
4737
sudo apt update -y && sudo apt install -y --no-install-recommends \
4838
git git-lfs gcc-11 g++-11 ninja-build ccache libgtest-dev libgmock-dev \
49-
shellcheck curl doxygen python3 python3-pip python3-dev python3-distutils
39+
shellcheck curl doxygen python3 python3-pip python3-dev python3-distutils \
40+
texlive-latex-extra ghostscript graphviz \
41+
&& curl -L https://cmake.org/files/v3.20/cmake-3.20.1-linux-x86_64.tar.gz --output /tmp/cmake-3.20.1.tar.gz \
42+
&& tar -xzf /tmp/cmake-3.20.1.tar.gz -C /tmp/ && sudo cp -r /tmp/cmake-3.20.1-linux-x86_64/bin/ /usr/local/ \
43+
&& sudo cp -r /tmp/cmake-3.20.1-linux-x86_64/share/ /usr/local/ && sudo cp -r /tmp/cmake-3.20.1-linux-x86_64/doc/ /usr/local/ \
44+
&& rm -rf /tmp/cmake-3.20.1*
5045
5146
- if: matrix.language == 'c-cpp'
5247
name: Install Python Dependencies
5348
run: |
54-
python3 -m pip install sphinx-rtd-theme sphinx==4.5.0 breathe exhale \
55-
recommonmark graphviz numpy==1.24.1
49+
sudo apt update -y && sudo apt install -y --no-install-recommends \
50+
python3 python3-pip python3-dev python3-distutils doxygen && sudo rm -rf /var/lib/apt/lists/* \
51+
&& python3 -m pip install sphinx-rtd-theme sphinx breathe exhale recommonmark graphviz \
52+
&& python3 -m pip install numpy==1.24.1 patchelf==0.17.2.1
5653
5754
- if: matrix.language == 'c-cpp'
5855
name: Install CUDA Toolkit
59-
uses: Jimver/[email protected].11
56+
uses: Jimver/[email protected].15
6057
id: cuda-toolkit
6158
with:
6259
cuda: '11.7.1'
@@ -72,22 +69,44 @@ jobs:
7269
nvcc -V
7370
7471
- name: Initialize CodeQL
75-
uses: github/codeql-action/init@v2
72+
uses: github/codeql-action/init@v3
7673
with:
7774
languages: ${{ matrix.language }}
7875
queries: +security-and-quality
7976

8077
- if: matrix.language != 'c-cpp'
8178
name: Autobuild
82-
uses: github/codeql-action/autobuild@v2
79+
uses: github/codeql-action/autobuild@v3
8380

8481
- if: matrix.language == 'c-cpp'
8582
name: Build CMake project
8683
run: |
8784
echo "Running CMake project build script"
88-
./ci/build.sh debug build "-DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF" $*
85+
./ci/build.sh debug build "-DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PYTHON=ON" $*
8986
9087
- name: Perform CodeQL Analysis
91-
uses: github/codeql-action/analyze@v2
88+
uses: github/codeql-action/analyze@v3
9289
with:
9390
category: "/language:${{matrix.language}}"
91+
92+
- if: matrix.language == 'c-cpp' && github.event_name == 'push'
93+
name: Build Docs and Clean up Sphinx Build Directory
94+
run: |
95+
./ci/build.sh debug build "-DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_DOCS=ON -DBUILD_PYTHON=ON" $*
96+
find build/docs/sphinx -name '*.doctree' -delete
97+
find build/docs/sphinx -name '*.map' -delete
98+
find build/docs/sphinx -name '*.pickle' -delete
99+
find build/docs/sphinx -name '*.inv' -delete
100+
find build/docs/sphinx -name '*.gz' -delete
101+
102+
- if: matrix.language == 'c-cpp' && github.event_name == 'push'
103+
name: Create .nojekyll file
104+
run: touch build/docs/sphinx/.nojekyll
105+
106+
- if: matrix.language == 'c-cpp' && github.event_name == 'push'
107+
name: Deploy to GitHub Pages
108+
uses: JamesIves/github-pages-deploy-action@v4
109+
with:
110+
folder: build/docs/sphinx
111+
branch: gh-pages
112+
clean: true

.pre-commit-config.yaml

Lines changed: 0 additions & 91 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323

2424
project(cvcuda
2525
LANGUAGES C CXX
26-
VERSION 0.7.0
26+
VERSION 0.8.0
2727
DESCRIPTION "CUDA-accelerated Computer Vision algorithms"
2828
)
2929

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# Contributing to CV-CUDA
1818

19-
**As of release v0.7.0-beta, CV-CUDA is not accepting outside contribution.**
19+
**Currently, CV-CUDA is not accepting outside contributions.**
2020

2121
Contributions to CV-CUDA fall into the following categories:
2222

@@ -28,8 +28,8 @@ Contributions to CV-CUDA fall into the following categories:
2828
1. To propose a new feature, please file a new feature request
2929
[issue](https://github.com/CVCUDA/CV-CUDA/issues/new/choose). Describe the
3030
intended feature and discuss the design and implementation with the team and
31-
community. NOTE: Currently, as of release v0.7.0-beta, CV-CUDA is not accepting
32-
outside contribution.
31+
community. NOTE: Currently, CV-CUDA is not accepting
32+
outside contributions.
3333
1. To ask a general question, please sumbit a question
3434
[issue](https://github.com/CVCUDA/CV-CUDA/issues/new/choose). If you need
3535
more context on a particular issue, please ask in a comment.

DEVELOPER_GUIDE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ CV-CUDA includes:
8080
| Reformat | Converts a planar image into non-planar and vice versa |
8181
| Remap | Maps pixels in an image with one projection to another projection in a new image. |
8282
| Resize | Changes the size and scale of an image |
83+
| ResizeCropConvertReformat | Performs fused Resize-Crop-Convert-Reformat sequence with optional channel reordering |
8384
| Rotate | Rotates a 2D array in multiples of 90 degrees |
8485
| SIFT | Identifies and describes features in images that are invariant to scale rotation and affine distortion. |
8586
| Thresholding | Chooses a global threshold value that is the same for all pixels across the image. |

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
[![License](https://img.shields.io/badge/License-Apache_2.0-yellogreen.svg)](https://opensource.org/licenses/Apache-2.0)
2020

21-
![Version](https://img.shields.io/badge/Version-v0.7.0--beta-blue)
21+
![Version](https://img.shields.io/badge/Version-v0.8.0--beta-blue)
2222

2323
![Platform](https://img.shields.io/badge/Platform-linux--64_%7C_win--64_wsl2%7C_aarch64-gray)
2424

@@ -76,10 +76,10 @@ Choose the installation method that meets your environment needs.
7676

7777
Download the appropriate .whl file for your computer architecture, Python and CUDA version from the release assets of current CV-CUDA release. Release information of all CV-CUDA releases can be found [here][CV-CUDA GitHub Releases]. Once downloaded, execute the `pip install` command to install the Python wheel. For example:
7878
```shell
79-
pip install cvcuda_<cu_ver>-0.7.0b0-cp<py_ver>-cp<py_ver>-linux_<arch>.whl
79+
pip install cvcuda_<cu_ver>-<x.x.x>-cp<py_ver>-cp<py_ver>-linux_<arch>.whl
8080
```
8181

82-
where `<cu_ver>` is the desired CUDA version, `<py_ver>` is the desired Python version and `<arch>` is the desired architecture.
82+
where `<cu_ver>` is the desired CUDA version, `<x.x.x>` is the CV-CUDA release version, `<py_ver>` is the desired Python version and `<arch>` is the desired architecture.
8383

8484
Please note that the Python wheels are standalone, they include both the C++/CUDA libraries and the Python bindings.
8585

@@ -185,8 +185,8 @@ Install the dependencies required to build the documentation:
185185

186186
On Ubuntu, install the following packages using `apt` and `pip`:
187187
```shell
188-
apt install -y doxygen graphviz python3 python3-pip
189-
python3 -m pip install sphinx==4.5.0 breathe exhale recommonmark graphviz sphinx-rtd-theme
188+
apt install -y doxygen graphviz python3 python3-pip sphinx
189+
python3 -m pip install breathe exhale recommonmark graphviz sphinx-rtd-theme
190190
```
191191

192192
Build the documentation:
@@ -249,7 +249,7 @@ pip install cvcuda_cu12-<x.x.x>-cp310-cp310-linux_x86_64.whl
249249

250250
CV-CUDA is an open source project. As part of the Open Source Community, we are
251251
committed to the cycle of learning, improving, and updating that makes this
252-
community thrive. However, as of release v0.7.0-beta, CV-CUDA is not yet ready
252+
community thrive. However, CV-CUDA is not yet ready
253253
for external contributions.
254254

255255
To understand the process for contributing the CV-CUDA, see our

0 commit comments

Comments
 (0)