* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/
@ 2017-09-05 18:16 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2017-09-05 18:16 UTC (permalink / raw
To: gentoo-commits
commit: b3b568163f74a14e7967589456a7ddf7b8e2d639
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Sep 5 16:29:22 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 18:15:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b56816
media-libs/opencv: remove unused patches
.../files/opencv-2.4.12-git-autodetect.patch | 57 ------------
.../files/opencv-3.1.0-gentooify-python.patch | 101 ---------------------
2 files changed, 158 deletions(-)
diff --git a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
deleted file mode 100644
index 8d6fcaf681f..00000000000
--- a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/CMakeLists.txt 2016-04-07 14:44:17.461912634 +0200
-+++ b/CMakeLists.txt 2016-04-07 14:45:10.674910396 +0200
-@@ -388,32 +388,32 @@
- # ----------------------------------------------------------------------------
-
- # don't use FindGit because it requires CMake 2.8.2
--set(git_names git eg) # eg = easy git
-+#set(git_names git eg) # eg = easy git
- # Prefer .cmd variants on Windows unless running in a Makefile in the MSYS shell
--if(CMAKE_HOST_WIN32)
-- if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-- set(git_names git.cmd git eg.cmd eg)
-- endif()
--endif()
-+#if(CMAKE_HOST_WIN32)
-+# if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-+# set(git_names git.cmd git eg.cmd eg)
-+# endif()
-+#endif()
-
--find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
--mark_as_advanced(GIT_EXECUTABLE)
-+#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
-+#mark_as_advanced(GIT_EXECUTABLE)
-
--if(GIT_EXECUTABLE)
-- execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
-- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-- OUTPUT_VARIABLE OPENCV_VCSVERSION
-- RESULT_VARIABLE GIT_RESULT
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
-- if(NOT GIT_RESULT EQUAL 0)
-- set(OPENCV_VCSVERSION "unknown")
-- endif()
--else()
-+#if(GIT_EXECUTABLE)
-+# execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
-+# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+# OUTPUT_VARIABLE OPENCV_VCSVERSION
-+# RESULT_VARIABLE GIT_RESULT
-+# ERROR_QUIET
-+# OUTPUT_STRIP_TRAILING_WHITESPACE
-+# )
-+# if(NOT GIT_RESULT EQUAL 0)
-+# set(OPENCV_VCSVERSION "unknown")
-+# endif()
-+#else()
- # We don't have git:
-- set(OPENCV_VCSVERSION "unknown")
--endif()
-+# set(OPENCV_VCSVERSION "unknown")
-+#endif()
-
-
- # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch b/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch
deleted file mode 100644
index 7bb01b455f0..00000000000
--- a/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -purN a/cmake/OpenCVDetectGentooPython.cmake b/cmake/OpenCVDetectGentooPython.cmake
---- a/cmake/OpenCVDetectGentooPython.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ b/cmake/OpenCVDetectGentooPython.cmake 2016-06-09 10:21:09.236148446 +0100
-@@ -0,0 +1,77 @@
-+# Find specified Python version
-+# Arguments:
-+# found (variable): Set if interpreter found
-+# executable (variable): Output of executable found
-+# version_string (variable): Output of found version
-+# version_major (variable): Output of found major version
-+# version_minor (variable): Output of found minor version
-+# libs_found (variable): Set if libs found
-+# libs_version_string (variable): Output of found libs version
-+# libraries (variable): Output of found Python libraries
-+# library (variable): Output of found Python library
-+# debug_libraries (variable): Output of found Python debug libraries
-+# debug_library (variable): Output of found Python debug library
-+# include_path (variable): Output of found Python include path
-+# include_dir (variable): Output of found Python include dir
-+# include_dir2 (variable): Output of found Python include dir2
-+# packages_path (variable): Output of found Python packages path
-+# numpy_include_dirs (variable): Output of found Python Numpy include dirs
-+function(find_python found executable version_string version_major version_minor
-+ libs_found libs_version_string libraries library debug_libraries
-+ debug_library include_path include_dir include_dir2 packages_path
-+ numpy_include_dirs)
-+
-+ set(${found} "TRUE" PARENT_SCOPE)
-+ set(${executable} "${GENTOO_PYTHON_EXECUTABLE}" CACHE FILEPATH "Path to Python interpretor")
-+ set(${version_string} "${GENTOO_PYTHON_MAJOR}.${GENTOO_PYTHON_MINOR}" PARENT_SCOPE)
-+ set(${version_major} "${GENTOO_PYTHON_MAJOR}" PARENT_SCOPE)
-+ set(${version_minor} "${GENTOO_PYTHON_MINOR}" PARENT_SCOPE)
-+ set(${libs_found} "TRUE" PARENT_SCOPE)
-+ set(${libs_version_string} "${version_string}" PARENT_SCOPE)
-+ set(${libraries} "${GENTOO_PYTHON_LIBRARIES}" PARENT_SCOPE)
-+ set(${library} "${GENTOO_PYTHON_LIBRARIES}" CACHE FILEPATH "Path to Python library")
-+ set(${debug_libraries} "${GENTOO_PYTHON_DEBUG_LIBRARIES}" PARENT_SCOPE)
-+ set(${debug_library} "${GENTOO_PYTHON_DEBUG_LIBRARIES}" CACHE FILEPATH "Path to Python debug")
-+ set(${include_path} "${GENTOO_PYTHON_INCLUDE_PATH}" PARENT_SCOPE)
-+ set(${include_dir} "${GENTOO_PYTHON_INCLUDE_PATH}" CACHE PATH "Python include dir")
-+ set(${include_dir2} "${GENTOO_PYTHON_INCLUDE_PATH}" CACHE PATH "Python include dir 2")
-+ set(${packages_path} "${GENTOO_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")
-+ set(${numpy_include_dirs} "${GENTOO_PYTHON_PACKAGES_PATH}/numpy/core/include/" CACHE PATH "Path to numpy headers")
-+endfunction(find_python)
-+
-+# In order to use existing CMake files, this needs to be here to switch between
-+# Python 2 and 3. It's messy and could be in the ebuild to declare this,
-+# but then the ebuild would be a mile long and unreadable. This makes then
-+# messy stuff hidden out of the way.
-+set(PYTHON2INTERP_FOUND "FALSE")
-+set(PYTHON3INTERP_FOUND "FALSE")
-+
-+if(WITH_PYTHON)
-+ if(GENTOO_PYTHON_MAJOR EQUAL 2)
-+ find_python(PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING
-+ PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND
-+ PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY
-+ PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH
-+ PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH
-+ PYTHON2_NUMPY_INCLUDE_DIRS)
-+ endif()
-+
-+ if(GENTOO_PYTHON_MAJOR EQUAL 3)
-+ find_python(PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
-+ PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND
-+ PYTHON3LIBS_VERSION_STRING PYTHON3_LIBRARIES PYTHON3_LIBRARY
-+ PYTHON3_DEBUG_LIBRARIES PYTHON3_LIBRARY_DEBUG PYTHON3_INCLUDE_PATH
-+ PYTHON3_INCLUDE_DIR PYTHON3_INCLUDE_DIR2 PYTHON3_PACKAGES_PATH
-+ PYTHON3_NUMPY_INCLUDE_DIRS)
-+ endif()
-+endif()
-+
-+if(PYTHON2INTERP_FOUND) # Use Python 2 as default Python interpreter
-+ set(PYTHON_DEFAULT_AVAILABLE "TRUE")
-+ set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON2_EXECUTABLE}")
-+elseif(PYTHON3INTERP_FOUND) # Use Python 2 as fallback Python interpreter (if there is no Python 2)
-+ set(PYTHON_DEFAULT_AVAILABLE "TRUE")
-+ set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON3_EXECUTABLE}")
-+else()
-+ set(PYTHON_DEFAULT_AVAILABLE "FALSE")
-+endif()
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-12-18 15:02:16.000000000 +0000
-+++ b/CMakeLists.txt 2016-06-08 18:57:53.489793304 +0100
-@@ -215,6 +215,7 @@ OCV_OPTION(WITH_VA "Include
- OCV_OPTION(WITH_VA_INTEL "Include Intel VA-API/OpenCL support" OFF IF (UNIX AND NOT ANDROID) )
- OCV_OPTION(WITH_GDAL "Include GDAL Support" OFF IF (NOT ANDROID AND NOT IOS AND NOT WINRT) )
- OCV_OPTION(WITH_GPHOTO2 "Include gPhoto2 library support" ON IF (UNIX AND NOT ANDROID) )
-+OCV_OPTION(WITH_PYTHON "Include python bindings" OFF)
-
- # OpenCV build components
- # ===================================================
-@@ -559,7 +560,7 @@ if(BUILD_DOCS)
- endif(BUILD_DOCS)
-
- # --- Python Support ---
--include(cmake/OpenCVDetectPython.cmake)
-+include(cmake/OpenCVDetectGentooPython.cmake)
-
- # --- Java Support ---
- include(cmake/OpenCVDetectApacheAnt.cmake)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/
@ 2018-02-05 17:50 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2018-02-05 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 40e8ca0d2be44a4aaa1947e945c38630f7cc9119
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 17:44:07 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 17:49:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e8ca0d
media-libs/opencv: add missing patch
Closes: https://bugs.gentoo.org/646582
Package-Manager: Portage-2.3.13, Repoman-2.3.3
...opencv-3.3.0-remove-tiny-dnn-autodownload.patch | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
new file mode 100644
index 00000000000..6929a4c2ce4
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
@@ -0,0 +1,27 @@
+diff -purN a/modules/dnn_modern/CMakeLists.txt b/modules/dnn_modern/CMakeLists.txt
+--- a/modules/dnn_modern/CMakeLists.txt 2017-07-31 15:58:38.000000000 +0100
++++ b/modules/dnn_modern/CMakeLists.txt 2018-01-15 17:15:15.202454388 +0000
+@@ -15,23 +15,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CU
+ # MODULE REQUIREMENTS
+ # ----------------------------------------------------------------------------
+
+-set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
+-set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
+-ocv_download(FILENAME "v1.0.0a3.tar.gz"
+- HASH "adb1c512e09ca2c7a6faef36f9c53e59"
+- URL
+- "${OPENCV_TINY_DNN_URL}"
+- "$ENV{OPENCV_TINY_DNN_URL}"
+- "https://github.com/tiny-dnn/tiny-dnn/archive/"
+- DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
+- STATUS TINY_DNN_DOWNLOAD_SUCCESS
+- ID "tiny-dnn"
+- UNPACK RELATIVE_URL)
+-
+-if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
+- message(STATUS "Failed to download tiny-dnn sources")
+-endif()
+-
+ find_package(TinyDNN QUIET)
+
+ include(CheckCXXCompilerFlag)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/
@ 2018-05-25 19:36 Amy Liffey
0 siblings, 0 replies; 4+ messages in thread
From: Amy Liffey @ 2018-05-25 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 002d99b2bfde3f4dfc53c79087b6367ee2cf704d
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 19:35:49 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri May 25 19:35:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002d99b2
media-libs/opencv: remove unused patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/opencv-3.1.0-cmake-no-opengl.patch | 22 ------------
.../opencv/files/opencv-3.1.0-git-autodetect.patch | 42 ----------------------
.../opencv-3.1.0-remove-graphcut-for-cuda-8.patch | 23 ------------
3 files changed, 87 deletions(-)
diff --git a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch b/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
deleted file mode 100644
index d6d70d717d3..00000000000
--- a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cdb9c60dcb65e04e7c0bd6bef9b86841191c785a Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin <alexander.alekhin@itseez.com>
-Date: Thu, 31 Dec 2015 02:24:54 +0300
-Subject: [PATCH] gpu samples: fix REMOVE_ITEM error
-
----
- samples/gpu/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
-index 6085cac..852a8c2 100644
---- a/samples/gpu/CMakeLists.txt
-+++ b/samples/gpu/CMakeLists.txt
-@@ -97,7 +97,7 @@ endif()
- if(INSTALL_C_EXAMPLES AND NOT WIN32)
- file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
- if(NOT WITH_OPENGL)
-- list(REMOVE_ITEM all_samples "opengl.cpp")
-+ list(REMOVE_ITEM install_list "opengl.cpp")
- endif(NOT WITH_OPENGL)
- install(FILES ${install_list}
- DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
diff --git a/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch b/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
deleted file mode 100644
index f4bf0da2cc9..00000000000
--- a/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/CMakeLists.txt 2016-04-07 14:34:35.090937125 +0200
-+++ b/CMakeLists.txt 2016-04-07 14:35:18.492935300 +0200
-@@ -444,23 +444,23 @@
- # ----------------------------------------------------------------------------
- # Autodetect if we are in a GIT repository
- # ----------------------------------------------------------------------------
--find_host_package(Git QUIET)
-+#find_host_package(Git QUIET)
-
--if(GIT_FOUND)
-- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
-- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-- OUTPUT_VARIABLE OPENCV_VCSVERSION
-- RESULT_VARIABLE GIT_RESULT
-- ERROR_QUIET
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
-- if(NOT GIT_RESULT EQUAL 0)
-- set(OPENCV_VCSVERSION "unknown")
-- endif()
--else()
-- # We don't have git:
-- set(OPENCV_VCSVERSION "unknown")
--endif()
-+#if(GIT_FOUND)
-+# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
-+# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+# OUTPUT_VARIABLE OPENCV_VCSVERSION
-+# RESULT_VARIABLE GIT_RESULT
-+# ERROR_QUIET
-+# OUTPUT_STRIP_TRAILING_WHITESPACE
-+# )
-+# if(NOT GIT_RESULT EQUAL 0)
-+# set(OPENCV_VCSVERSION "unknown")
-+# endif()
-+#else()
-+# # We don't have git:
-+# set(OPENCV_VCSVERSION "unknown")
-+#endif()
-
-
- # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch b/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch
deleted file mode 100644
index 64761a263a1..00000000000
--- a/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 10896129b39655e19e4e7c529153cb5c2191a1db Mon Sep 17 00:00:00 2001
-From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
-Date: Fri, 6 May 2016 11:37:32 +0300
-Subject: [PATCH] GraphCut deprecated in CUDA 7.5 and removed in 8.0
-
----
- modules/cudalegacy/src/graphcuts.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules/cudalegacy/src/graphcuts.cpp b/modules/cudalegacy/src/graphcuts.cpp
-index eb08c3c..1a1eb85 100644
---- a/modules/cudalegacy/src/graphcuts.cpp
-+++ b/modules/cudalegacy/src/graphcuts.cpp
-@@ -42,7 +42,8 @@
-
- #include "precomp.hpp"
-
--#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
-+// GraphCut has been removed in NPP 8.0
-+#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || (CUDART_VERSION >= 8000)
-
- void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
- void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/
@ 2023-08-28 6:44 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-08-28 6:44 UTC (permalink / raw
To: gentoo-commits
commit: f86f0e650d2bc739837a28cd32bc4c255cca258a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 06:43:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 06:43:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86f0e65
media-libs/opencv: fix amd64 build (oops)
Bug: https://bugs.gentoo.org/913031
Closes: https://bugs.gentoo.org/913131
Fixes: 4e6bb1138e0e8009b6e66b479e417d4d7c066fda
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../opencv/files/opencv-4.8.0-arm64-fp16.patch | 56 +++++++++++-----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch b/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch
index 84e36f88e6f7..6bf04daf58ae 100644
--- a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch
+++ b/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch
@@ -23,7 +23,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
conv->useFP16 = false;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
// TODO: add FP16 support for Winograd.
if (_useFP16 && (conv->conv_type == CONV_TYPE_GENERIC || conv->conv_type == CONV_TYPE_DEPTHWISE_REMAIN))
conv->useFP16 = true;
@@ -32,7 +32,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int nweights = C * padded_ksize;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (conv->useFP16)
{
conv->weightsBuf_FP16.resize(nweights + VEC_ALIGN);
@@ -41,7 +41,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
const int CONV_WINO_NATOMS_F32 = CONV_WINO_AREA / CONV_WINO_ATOM_F32; // for AVX2, it is 8, otherwise, it's 16.
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
// FP 16
const int CONV_WINO_ATOM_F16 = CONV_WINO_ATOM_F32 * 2;
const int CONV_WINO_NATOMS_F16 = CONV_WINO_AREA / CONV_WINO_ATOM_F16;
@@ -50,7 +50,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
float* wptrWino = nullptr;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
float16_t* wptrWino_FP16 = nullptr;
if (conv->useFP16)
{
@@ -59,7 +59,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
// repack the data.
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (conv->useFP16)
{
float16_t* wptr = wptrWino_FP16 + (g*Kg_nblocks + ki) * Cg *CONV_WINO_KBLOCK*CONV_WINO_AREA +
@@ -68,7 +68,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
float* weightsBufPtr = nullptr;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
int numStripsMR_FP16 = (Kg + CONV_MR_FP16 - 1) / CONV_MR_FP16;
int Kg_aligned_FP16 = numStripsMR_FP16 * CONV_MR_FP16;
size_t nweights_FP16 = ngroups * Kg_aligned_FP16 * DkHkWkCg;
@@ -77,7 +77,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
// Pack the weight.
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (conv->useFP16)
{
parallel_for_(Range(0, ngroups * numStripsMR_FP16), [&](const Range& r0){
@@ -86,7 +86,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
float* inptrInC = (float* )inptrIn;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
float16_t* inpbufC_FP16 = (float16_t *)inpbufC;
if (esz == sizeof(float16_t))
{
@@ -95,7 +95,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
float* inptrInC = inptrIn;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
float16_t* inpbufC_FP16 = (float16_t *)inpbufC;
if (esz == sizeof(float16_t))
{
@@ -104,7 +104,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
}
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
// Fast convert float 32 to float16
static inline void _cvt32f16f( const float* src, float16_t* dst, int len)
{
@@ -113,7 +113,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
// Make special branch where memcpy() is called with a constant buffer size.
// Compilers will likely unroll this loop properly.
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inptr += inp_planesize, inpbuf += CONV_NR_esz)
@@ -122,7 +122,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
else
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inptr += inp_planesize, inpbuf += CONV_NR_esz)
@@ -131,7 +131,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w);
const float* inptrInC = inptrIn;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
float16_t* inpbufC = (float16_t *)inpbuf + s0;
@@ -140,7 +140,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
const float* inptrInC = inptrIn;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
float16_t* inpbufC = (float16_t *)inpbuf + s0;
@@ -149,7 +149,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w);
const float* inptrInC = inptrIn;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
float16_t* inpbufC = (float16_t* )inpbuf + s0;
@@ -158,7 +158,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
{
float* inpbuf_ki = (float* )inpbuf + k * CONV_NR * Cg + i;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
float16_t * inpbuf_ki_FP16 = (float16_t *)inpbuf + k * CONV_NR * Cg + i;
#endif
@@ -167,7 +167,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
if (stride_w == 1)
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize)
@@ -176,7 +176,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
else if (stride_w == 2)
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize)
@@ -185,7 +185,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
else
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize)
@@ -194,7 +194,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
if (stride_w == 1)
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize)
@@ -203,7 +203,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
else
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize)
@@ -212,7 +212,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
else
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize)
@@ -221,7 +221,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
else
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR)
@@ -230,7 +230,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int esz = sizeof(float );
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
// works at FP 16.
@@ -239,7 +239,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
char *weights = nullptr;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
CV_Assert(!conv->weightsBuf_FP16.empty());
@@ -248,7 +248,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
if (conv->useNEON)
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
opt_NEON::convBlockMR1_FP16(DkHkWkCg, weights, inptr, cptr, biasVal, fusedAdd, minval, maxval, ifMinMaxAct, outLen, CONV_NR);
@@ -257,7 +257,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
if (conv->useNEON)
{
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
opt_NEON::convBlock_FP16(c1 - c0, wptr, inptr, (char *)cptr_f16, ldc, c0 == 0, outLen, CONV_MR, CONV_NR);
@@ -266,7 +266,7 @@ Signed-off-by: Sam James <sam@gentoo.org>
int j = 0;
-#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
if (useFP16)
{
float32x4_t vbias = vdupq_n_f32(biasval);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-28 6:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 18:16 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/ Amy Liffey
-- strict thread matches above, loose matches on Subject: below --
2018-02-05 17:50 Amy Liffey
2018-05-25 19:36 Amy Liffey
2023-08-28 6:44 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox