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

5.x merge 4.x #3621

Merged
merged 19 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b2bb3d6
add function to load font from buffer
razaqq Oct 30, 2023
9e71621
Regression test for the new Freetype method.
asmorkalov Nov 1, 2023
9b32dd9
fix for review
Kumataro Nov 16, 2023
7b97851
Merge pull request #3542 from cudawarped:cudacodec_videoreader_seek
cudawarped Nov 16, 2023
e8ec6ac
Merge pull request #3593 from Kumataro:refix_freetype_loadFontData
asmorkalov Nov 17, 2023
5bf7569
cudaoptflow: fix FarnebackOpticalFlow internal stream synchronization…
cudawarped Nov 17, 2023
3c5635e
Add operators support for Ascend NPU (CANN backend) (#3552)
hipudding Nov 21, 2023
8042bd3
Fixed CUDA StereoBM initialization.
asmorkalov Nov 23, 2023
66d93ce
Merge pull request #3598 from asmorkalov:as/cuda_stereo_init_fix
asmorkalov Dec 1, 2023
faa5468
Merge pull request #3595 from cudawarped:fix_FarnebackOpticalFlow_str…
asmorkalov Dec 1, 2023
eca7f1c
cuda: add moments
cudawarped May 28, 2023
0bcbc73
Merge pull request #3516 from cudawarped:cuda_moments
asmorkalov Dec 5, 2023
1ae5f03
build: add first class cuda support
cudawarped Nov 30, 2022
daded36
Binding fix for matchLOGOS with python test,
asmorkalov Nov 17, 2023
ab4bfc2
Merge pull request #3594 from asmorkalov:as/matchLOGOS_bindining_fix
asmorkalov Dec 15, 2023
144e188
Disable SUFF CUDA kenrel build by default.
asmorkalov Dec 26, 2023
d680f58
Merge pull request #3400 from cudawarped:add_cuda_first_class_support
asmorkalov Dec 26, 2023
c7602a8
Merge pull request #3611 from asmorkalov:as/disable_cuda_surf
alalek Dec 26, 2023
4b7de5a
Merge branch 4.x
asmorkalov Jan 17, 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
17 changes: 17 additions & 0 deletions modules/cannops/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
if(IOS OR WINRT OR ANDROID OR APPLE OR WIN32 OR (NOT HAVE_CANN))
ocv_module_disable(cannops)
endif()

set(the_description "Ascend-accelerated Operations on Matrices")

ocv_add_module(cannops opencv_core WRAP python)
ocv_module_include_directories(${CANN_INCLUDE_DIRS})
ocv_glob_module_sources()
ocv_install_used_external_targets(${CANN_LIBRARIES})
ocv_create_module(${CANN_LIBRARIES})

ocv_include_directories(${CMAKE_SOURCE_DIR}/modules/ts/include)

ocv_add_accuracy_tests(DEPENDS_ON opencv_cannops)
ocv_add_perf_tests(DEPENDS_ON opencv_cannops)
ocv_add_samples(opencv_cannops)
67 changes: 67 additions & 0 deletions modules/cannops/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# User guides
#
# 0. Install Ascend driver on host.
# (https://www.hiascend.com/en/hardware/firmware-drivers)
#
# 1. Run docker container.
# docker run -it \
# --name opencv \
# --device /dev/davinci0 \
# --device /dev/davinci_manager \
# --device /dev/devmm_svm \
# --device /dev/hisi_hdc \
# -v /usr/local/dcmi:/usr/local/dcmi \
# -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi \
# -v /usr/local/Ascend/driver/lib64/:/usr/local/Ascend/driver/lib64/ \
# opencv bash
#
# 2. Check environment.
# npu-smi info
#
# 3. Compile opencv with Ascend NPU backend.
# cmake -DWITH_CANN=1
#
# 4. Run opencv_test_cannops.
# ./bin/opencv_test_cannops

FROM openeuler/openeuler:22.03-lts-sp2

RUN yum install -y \
git \
wget \
gcc \
g++ \
cmake \
make \
python-pip \
python3-devel

RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple \
numpy \
sympy \
decorator \
scipy \
attrs \
psutil

# Install CANN
RUN wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%207.0.RC1/Ascend-cann-toolkit_7.0.RC1_linux-"$(uname -i)".run && \
chmod +x Ascend-cann-toolkit_7.0.RC1_linux-"$(uname -i)".run && \
./Ascend-cann-toolkit_7.0.RC1_linux-"$(uname -i)".run --quiet --install && \
rm -f ./Ascend-cann-toolkit_7.0.RC1_linux-"$(uname -i)".run

# Install kernel
RUN wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%207.0.RC1/Ascend-cann-kernels-310p_7.0.RC1_linux.run && \
chmod +x Ascend-cann-kernels-310p_7.0.RC1_linux.run && \
./Ascend-cann-kernels-310p_7.0.RC1_linux.run --quiet --install && \
rm -f ./Ascend-cann-kernels-310p_7.0.RC1_linux.run

ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64:/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:$LD_LIBRARY_PATH:/usr/lib64
ENV ASCEND_TOOLKIT_HOME=/usr/local/Ascend/ascend-toolkit/latest
ENV LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/lib64:${ASCEND_TOOLKIT_HOME}/lib64/plugin/opskernel:${ASCEND_TOOLKIT_HOME}/lib64/plugin/nnengine:${ASCEND_TOOLKIT_HOME}/opp/built-in/op_impl/ai_core/tbe/op_tiling:$LD_LIBRARY_PATH
ENV PYTHONPATH=${ASCEND_TOOLKIT_HOME}/python/site-packages:${ASCEND_TOOLKIT_HOME}/opp/built-in/op_impl/ai_core/tbe:$PYTHONPATH
ENV PATH=${ASCEND_TOOLKIT_HOME}/bin:${ASCEND_TOOLKIT_HOME}/compiler/ccec_compiler/bin:$PATH
ENV ASCEND_AICPU_PATH=${ASCEND_TOOLKIT_HOME}
ENV ASCEND_OPP_PATH=${ASCEND_TOOLKIT_HOME}/opp
ENV TOOLCHAIN_HOME=${ASCEND_TOOLKIT_HOME}/toolkit
ENV ASCEND_HOME_PATH=${ASCEND_TOOLKIT_HOME}
Loading
Loading