* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/
@ 2018-06-13 21:18 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2018-06-13 21:18 UTC (permalink / raw
To: gentoo-commits
commit: f09934d575ae6a8115687ec29a2fec96f6e98c26
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 17:55:17 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 21:15:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f09934d5
sci-libs/flann: remove unused patch(es)
.../flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch | 16 ------
sci-libs/flann/files/flann-1.8.4-cuda5.5.patch | 61 ----------------------
sci-libs/flann/files/flann-1.8.4-docdir.patch | 24 ---------
sci-libs/flann/files/flann-1.8.4-examples.patch | 35 -------------
sci-libs/flann/files/flann-1.8.4-multilib.patch | 15 ------
sci-libs/flann/files/flann-1.8.4-options.patch | 41 ---------------
6 files changed, 192 deletions(-)
diff --git a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch b/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
deleted file mode 100644
index 1a068af2835..00000000000
--- a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/cpp/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 8e72409..a4b35b1 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
-
- if (BUILD_CUDA_LIB)
-- SET(CUDA_NVCC_FLAGS -DFLANN_USE_CUDA)
-+ SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA")
- if(CMAKE_COMPILER_IS_GNUCC)
- set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler;-fPIC;-arch=sm_13" )
- if (NVCC_COMPILER_BINDIR)
diff --git a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch b/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
deleted file mode 100644
index 046b3252c36..00000000000
--- a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- src/cpp/flann/util/cuda/result_set.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/cpp/flann/util/cuda/result_set.h b/src/cpp/flann/util/cuda/result_set.h
-index 9ac8111..324ca1e 100644
---- a/src/cpp/flann/util/cuda/result_set.h
-+++ b/src/cpp/flann/util/cuda/result_set.h
-@@ -54,7 +54,7 @@ struct SingleResultSet
- DistanceType bestDist;
- const DistanceType epsError;
-
-- __device__
-+ __device__ __host__
- SingleResultSet( DistanceType eps ) : bestIndex(-1),bestDist(INFINITY), epsError(eps){ }
-
- __device__
-@@ -129,7 +129,7 @@ struct KnnResultSet
- const DistanceType epsError;
-
-
-- __device__
-+ __device__ __host__
- KnnResultSet(int knn, bool sortResults, DistanceType eps) : foundNeighbors(0),largestHeapDist(INFINITY),k(knn), sorted(sortResults), epsError(eps){ }
-
- // __host__ __device__
-@@ -229,7 +229,7 @@ struct CountingRadiusResultSet
- DistanceType radius_sq_;
- int max_neighbors_;
-
-- __device__
-+ __device__ __host__
- CountingRadiusResultSet(DistanceType radius, int max_neighbors) : count_(0),radius_sq_(radius), max_neighbors_(max_neighbors){ }
-
- __device__
-@@ -279,7 +279,7 @@ struct RadiusKnnResultSet
- // int count_;
-
-
-- __device__
-+ __device__ __host__
- RadiusKnnResultSet(DistanceType radius, int knn, int* segment_starts, bool sortResults) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), radius_sq_(radius),segment_starts_(segment_starts) { }
-
- // __host__ __device__
-@@ -381,7 +381,7 @@ struct KnnRadiusResultSet
- const DistanceType radius_sq;
-
-
-- __device__
-+ __device__ __host__
- KnnRadiusResultSet(int knn, bool sortResults, DistanceType eps, DistanceType radius) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), epsError(eps),radius_sq(radius){ }
-
- // __host__ __device__
-@@ -484,7 +484,7 @@ struct RadiusResultSet
- int count_;
- bool sorted_;
-
-- __device__
-+ __device__ __host__
- RadiusResultSet(DistanceType radius, int* segment_starts, bool sorted) : radius_sq_(radius), segment_starts_(segment_starts), count_(0), sorted_(sorted){ }
-
- __device__
diff --git a/sci-libs/flann/files/flann-1.8.4-docdir.patch b/sci-libs/flann/files/flann-1.8.4-docdir.patch
deleted file mode 100644
index 4b16684de14..00000000000
--- a/sci-libs/flann/files/flann-1.8.4-docdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 2d8eb24..aeac8ed 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,4 +1,8 @@
- find_package(LATEX)
-+
-+if (NOT DOCDIR)
-+ set(DOCDIR share/doc/flann)
-+endif ()
-
- if (EXISTS ${PDFLATEX_COMPILER} AND EXISTS ${BIBTEX_COMPILER})
- include(${PROJECT_SOURCE_DIR}/cmake/UseLATEX.cmake)
-@@ -14,6 +18,6 @@ endif()
-
- install(
- FILES manual.pdf
-- DESTINATION share/doc/flann
-+ DESTINATION ${DOCDIR}
- OPTIONAL
- )
diff --git a/sci-libs/flann/files/flann-1.8.4-examples.patch b/sci-libs/flann/files/flann-1.8.4-examples.patch
deleted file mode 100644
index b3346b35f73..00000000000
--- a/sci-libs/flann/files/flann-1.8.4-examples.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3922081fbd6710f4b72421069f6bf24dc37d35a8 Mon Sep 17 00:00:00 2001
-From: Casey Goodlett <casey.goodlett@kitware.com>
-Date: Thu, 8 Aug 2013 18:42:45 -0400
-Subject: [PATCH] Option to disable example building
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b19367..410a8f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ option(BUILD_C_BINDINGS "Build C bindings" ON)
- option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
-+option(BUILD_EXAMPLES "Build examples" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
-
-@@ -154,7 +155,9 @@ endif()
-
- add_subdirectory( cmake )
- add_subdirectory( src )
--add_subdirectory( examples )
-+if (BUILD_EXAMPLES)
-+ add_subdirectory( examples )
-+endif(BUILD_EXAMPLES)
- add_subdirectory( test )
- add_subdirectory( doc )
-
---
-1.8.5.1
-
diff --git a/sci-libs/flann/files/flann-1.8.4-multilib.patch b/sci-libs/flann/files/flann-1.8.4-multilib.patch
deleted file mode 100644
index 17a9d65dd77..00000000000
--- a/sci-libs/flann/files/flann-1.8.4-multilib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- cmake/flann_utils.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
-index 1a10939..afe4742 100644
---- a/cmake/flann_utils.cmake
-+++ b/cmake/flann_utils.cmake
-@@ -1,6 +1,6 @@
- macro(GET_OS_INFO)
- string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
-- set(FLANN_LIB_INSTALL_DIR "lib")
-+ set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
- set(FLANN_INCLUDE_INSTALL_DIR
- "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
- endmacro(GET_OS_INFO)
diff --git a/sci-libs/flann/files/flann-1.8.4-options.patch b/sci-libs/flann/files/flann-1.8.4-options.patch
deleted file mode 100644
index dd212aca66a..00000000000
--- a/sci-libs/flann/files/flann-1.8.4-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- CMakeLists.txt | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 410a8f9..b6244a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,6 +54,8 @@ option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
- option(BUILD_EXAMPLES "Build examples" ON)
-+option(BUILD_TESTS "Build tests" ON)
-+option(BUILD_DOC "Build documentation" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
-
-@@ -158,8 +160,12 @@ add_subdirectory( src )
- if (BUILD_EXAMPLES)
- add_subdirectory( examples )
- endif(BUILD_EXAMPLES)
--add_subdirectory( test )
--add_subdirectory( doc )
-+if (BUILD_TESTS)
-+ add_subdirectory( test )
-+endif (BUILD_TESTS)
-+if (BUILD_DOC)
-+ add_subdirectory( doc )
-+endif (BUILD_DOC)
-
-
- # CPACK options
-@@ -202,6 +208,9 @@ include(CPack)
- message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
- message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
- message(STATUS "Building C bindings: ${BUILD_C_BINDINGS}")
-+message(STATUS "Building examples: ${BUILD_EXAMPLES}")
-+message(STATUS "Building tests: ${BUILD_TESTS}")
-+message(STATUS "Building documentation: ${BUILD_DOC}")
- message(STATUS "Building python bindings: ${BUILD_PYTHON_BINDINGS}")
- message(STATUS "Building matlab bindings: ${BUILD_MATLAB_BINDINGS}")
- message(STATUS "Building CUDA library: ${BUILD_CUDA_LIB}")
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/
@ 2025-01-05 11:11 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2025-01-05 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 0b877136e3f52d5a7da9e05bf0d7258d97fc669b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 11:11:17 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 11:11:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b877136
sci-libs/flann/files: scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
sci-libs/flann/files/flann-1.9.1-boost-1.87.patch | 4 ----
....1-build-oct-rather-than-mex-files-for-octave.patch | 6 ------
sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch | 4 ++--
sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch | 11 -----------
sci-libs/flann/files/flann-1.9.1-cuda-9.patch | 6 ------
sci-libs/flann/files/flann-1.9.1-system-lz4.patch | 18 ------------------
6 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
index e18604528684..a19b8a3f4183 100644
--- a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
+++ b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch
@@ -1,5 +1,3 @@
-diff --git a/src/cpp/flann/mpi/client.h b/src/cpp/flann/mpi/client.h
-index 19a410c..b7df70e 100644
--- a/src/cpp/flann/mpi/client.h
+++ b/src/cpp/flann/mpi/client.h
@@ -45,17 +45,16 @@ class Client
@@ -35,8 +33,6 @@ index 19a410c..b7df70e 100644
};
-diff --git a/src/cpp/flann/mpi/server.h b/src/cpp/flann/mpi/server.h
-index 2caab43..a90538e 100644
--- a/src/cpp/flann/mpi/server.h
+++ b/src/cpp/flann/mpi/server.h
@@ -119,18 +119,18 @@ public:
diff --git a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
index f29aef41977c..d0e9ea04bf09 100644
--- a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
+++ b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch
@@ -9,12 +9,6 @@ Subject: [PATCH] build *.oct rather than *.mex files for octave
LOCATION
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
----
- src/matlab/CMakeLists.txt | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt
-index a89b6b8..ebacaea 100755
--- a/src/matlab/CMakeLists.txt
+++ b/src/matlab/CMakeLists.txt
@@ -16,9 +16,6 @@ endif()
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
index 4cf8f3a990fc..fccac407c1e6 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch
@@ -1,5 +1,5 @@
---- a/src/cpp/CMakeLists.txt 2019-02-14 21:58:41.567625108 +0100
-+++ b/src/cpp/CMakeLists.txt 2019-02-14 21:59:04.017920926 +0100
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
@@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN
target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
index b37bedcf6d50..e199a511a48e 100644
--- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch
@@ -40,14 +40,6 @@ http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7
[3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c
Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/cpp/CMakeLists.txt | 4 ++--
- src/cpp/empty.cpp | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 src/cpp/empty.cpp
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b44a735..a816863 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB)
@@ -68,9 +60,6 @@ index b44a735..a816863 100644
set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
else()
-diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp
-new file mode 100644
-index 0000000..40a8c17
--- /dev/null
+++ b/src/cpp/empty.cpp
@@ -0,0 +1 @@
diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
index 561c379af9ae..5f3483ea6756 100644
--- a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
+++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch
@@ -4,12 +4,6 @@ Date: Fri, 4 May 2018 07:50:24 +0000
Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include
<thrust/gather> to kdtree_cuda_3d_index.cu
----
- src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
-index e9b05080..8465322e 100644
--- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
+++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu
@@ -32,6 +32,7 @@
diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
index dcc9fedd4a97..04ef15939284 100644
--- a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
+++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch
@@ -3,16 +3,6 @@ Date: Sun, 14 Oct 2018 00:25:05 +0200
Subject: Use system version of liblz4
Also make sure that flann_cpp is linked against LZ4.
----
- CMakeLists.txt | 3 +++
- cmake/flann.pc.in | 2 +-
- examples/CMakeLists.txt | 3 +++
- src/cpp/CMakeLists.txt | 8 ++++++--
- src/cpp/flann/util/serialization.h | 4 ++--
- 5 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a01fb7a..995e54e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB)
@@ -25,8 +15,6 @@ index a01fb7a..995e54e 100644
#set the C/C++ include path to the "include" directory
include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
-diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in
-index 82eee5e..07b8d64 100644
--- a/cmake/flann.pc.in
+++ b/cmake/flann.pc.in
@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@
@@ -37,8 +25,6 @@ index 82eee5e..07b8d64 100644
+Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp
Cflags: -I${includedir}
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index e9fef04..2b2bb9d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -3,6 +3,7 @@ add_custom_target(examples ALL)
@@ -65,8 +51,6 @@ index e9fef04..2b2bb9d 100644
target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(examples flann_example_mpi)
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index b453b27..5c4f693 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
@@ -108,8 +92,6 @@ index b453b27..5c4f693 100644
if(MINGW AND OPENMP_FOUND)
target_link_libraries(flann gomp)
-diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h
-index d731021..cdc2e5e 100644
--- a/src/cpp/flann/util/serialization.h
+++ b/src/cpp/flann/util/serialization.h
@@ -6,8 +6,8 @@
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-05 11:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-13 21:18 [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2025-01-05 11:11 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox