[viennacl] 04/12: Remove unused d/patch.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jan 25 10:50:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository viennacl.
commit 146f7303e5aab254dc2d521215427231553b7b81
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jan 25 10:45:06 2016 +0100
Remove unused d/patch.
---
...-virtual-dtor-to-abstract-result_of-class.patch | 27 --------
...ration-order-of-prod_impl-trans_prod_impl.patch | 56 ---------------
...003-Generate-kernel-sources-in-build-tree.patch | 81 ----------------------
debian/patches/series | 0
4 files changed, 164 deletions(-)
diff --git a/debian/patches/0001-Add-virtual-dtor-to-abstract-result_of-class.patch b/debian/patches/0001-Add-virtual-dtor-to-abstract-result_of-class.patch
deleted file mode 100644
index fa1d7da..0000000
--- a/debian/patches/0001-Add-virtual-dtor-to-abstract-result_of-class.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Tue, 29 May 2012 10:50:41 +0200
-Subject: Add virtual dtor to abstract result_of class
-
-Otherwise its default dtor will not be called from the derived-class
-dtor.
-
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3530454&group_id=322140&atid=1353702
-Forwarded: https://sourceforge.net/tracker/download.php?group_id=322140&atid=1353702&file_id=444734&aid=3530454
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- viennacl/generator/traits/result_of.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/viennacl/generator/traits/result_of.hpp b/viennacl/generator/traits/result_of.hpp
-index a4a7d59..00a7522 100644
---- a/viennacl/generator/traits/result_of.hpp
-+++ b/viennacl/generator/traits/result_of.hpp
-@@ -51,6 +51,7 @@ namespace viennacl
- public:
- runtime_wrapper(bool _is_temporary, std::string const & _name, int _arg_id)
- : is_temporary_(_is_temporary), name_(_name), arg_id_(_arg_id) {}
-+ virtual ~runtime_wrapper() {}
-
- bool is_temporary() const { return is_temporary_; }
- int arg_id() const { return arg_id_; }
---
diff --git a/debian/patches/0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch b/debian/patches/0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch
deleted file mode 100644
index 0ef25e5..0000000
--- a/debian/patches/0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Tue, 29 May 2012 10:50:41 +0200
-Subject: Fix declaration order of prod_impl()/trans_prod_impl()
-
-In viennacl/linalg/matrix_operations.hpp. GCC-4.7 detects this error.
-
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3530507&group_id=322140&atid=1353702
-Forwarded: https://sourceforge.net/tracker/download.php?group_id=322140&atid=1353702&file_id=444751&aid=3530507
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- viennacl/linalg/matrix_operations.hpp | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/viennacl/linalg/matrix_operations.hpp b/viennacl/linalg/matrix_operations.hpp
-index 1dcc167..36a741c 100644
---- a/viennacl/linalg/matrix_operations.hpp
-+++ b/viennacl/linalg/matrix_operations.hpp
-@@ -439,18 +439,6 @@ namespace viennacl
- const viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT>,
- op_prod >(proxy, vec);
- }
--
-- /** @brief Unwraps the transposed matrix proxy and forwards to trans_prod_impl()
-- */
-- template<class SCALARTYPE, typename F, unsigned int ALIGNMENT, unsigned int VECTOR_ALIGNMENT>
-- void prod_impl(const viennacl::matrix_expression< const matrix<SCALARTYPE, F, ALIGNMENT>,
-- const matrix<SCALARTYPE, F, ALIGNMENT>,
-- op_trans> & mat,
-- const viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & vec,
-- viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & result)
-- {
-- trans_prod_impl(mat.lhs(), vec, result);
-- }
-
- /** @brief Carries out matrix-vector multiplication with a transposed matrix
- *
-@@ -490,6 +478,18 @@ namespace viennacl
- ) );
- }
-
-+ /** @brief Unwraps the transposed matrix proxy and forwards to trans_prod_impl()
-+ */
-+ template<class SCALARTYPE, typename F, unsigned int ALIGNMENT, unsigned int VECTOR_ALIGNMENT>
-+ void prod_impl(const viennacl::matrix_expression< const matrix<SCALARTYPE, F, ALIGNMENT>,
-+ const matrix<SCALARTYPE, F, ALIGNMENT>,
-+ op_trans> & mat,
-+ const viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & vec,
-+ viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & result)
-+ {
-+ trans_prod_impl(mat.lhs(), vec, result);
-+ }
-+
-
-
-
---
diff --git a/debian/patches/0003-Generate-kernel-sources-in-build-tree.patch b/debian/patches/0003-Generate-kernel-sources-in-build-tree.patch
deleted file mode 100644
index 279d7bc..0000000
--- a/debian/patches/0003-Generate-kernel-sources-in-build-tree.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Tue, 29 May 2012 16:50:26 +0200
-Subject: Generate kernel sources in build tree
-
-To avoid polluting the source tree. Might need further changes for the
-generation of the "pre-compiled" package, but this is not required for
-the packaging in Debian.
-
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3530554&group_id=322140&atid=1353702
-Forwarded: https://sourceforge.net/tracker/download.php?group_id=322140&atid=1353702&file_id=444794&aid=3530554
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- CMakeLists.txt | 2 +-
- auxiliary/CMakeLists.txt | 7 ++++---
- auxiliary/converter.cpp | 4 ++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6011ec2..12277ec 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,6 +88,6 @@ add_subdirectory(doc)
- # Install
- #########
-
--install(DIRECTORY viennacl
-+install(DIRECTORY viennacl ${CMAKE_CURRENT_BINARY_DIR}/viennacl
- DESTINATION ${INSTALL_INCLUDE_DIR} COMPONENT dev
- FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
-diff --git a/auxiliary/CMakeLists.txt b/auxiliary/CMakeLists.txt
-index 662eb98..230a490 100644
---- a/auxiliary/CMakeLists.txt
-+++ b/auxiliary/CMakeLists.txt
-@@ -296,7 +296,8 @@ foreach(f IN LISTS COMPRESSED_MATRIX_SRCS COORDINATE_MATRIX_SRCS ELL_MATRIX_SRCS
- endforeach()
- list(APPEND CL_SRCS ${MATRIX_PROD_SRCS} ${MATRIX_SOLVE_SRCS})
-
--add_executable(converter converter.cpp)
-+configure_file(converter.cpp ${CMAKE_CURRENT_BINARY_DIR}/converter.cpp @ONLY)
-+add_executable(converter ${CMAKE_CURRENT_BINARY_DIR}/converter.cpp)
- target_link_libraries(converter ${Boost_LIBRARIES})
-
- set(KERNEL_HDRS)
-@@ -327,12 +328,12 @@ foreach(d
- spai
- nmf
- )
-- set(f "${PROJECT_SOURCE_DIR}/viennacl/linalg/kernels/${d}")
-+ set(f "${PROJECT_BINARY_DIR}/viennacl/linalg/kernels/${d}")
- list(APPEND KERNEL_HDRS "${f}_kernels.h")
- list(APPEND KERNEL_SRCS "${f}_source.h")
- endforeach()
-
--file(MAKE_DIRECTORY "${PROJECT_SOURCE_DIR}/viennacl/linalg/kernels")
-+file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/viennacl/linalg/kernels")
-
- add_custom_command(OUTPUT ${KERNEL_HDRS} ${KERNEL_SRCS}
- COMMAND converter
-diff --git a/auxiliary/converter.cpp b/auxiliary/converter.cpp
-index 03f624c..feab31f 100644
---- a/auxiliary/converter.cpp
-+++ b/auxiliary/converter.cpp
-@@ -53,7 +53,7 @@ void createSourceFile(const char * dirname)
- {
- //Step 1: Open source file
- std::string header_name(dirname);
-- std::ofstream source_file(("../../viennacl/linalg/kernels/" + header_name + "_source.h").c_str());
-+ std::ofstream source_file(("@PROJECT_BINARY_DIR@/viennacl/linalg/kernels/" + header_name + "_source.h").c_str());
-
- //Step 2: Write source header file preamble
- std::string dirname_uppercase(dirname);
-@@ -261,7 +261,7 @@ void createKernelFile(const char * dirname)
- {
- //Step 1: Open kernel file
- std::string header_name(dirname);
-- std::ofstream kernel_file(("../../viennacl/linalg/kernels/" + header_name + "_kernels.h").c_str());
-+ std::ofstream kernel_file(("@PROJECT_BINARY_DIR@/viennacl/linalg/kernels/" + header_name + "_kernels.h").c_str());
-
- //Step 2: Write kernel header file preamble
- std::string dirname_uppercase(dirname);
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/viennacl.git
More information about the debian-science-commits
mailing list