[mlpack-svn] r13435 - mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Aug 20 15:58:00 EDT 2012
Author: speet3
Date: 2012-08-20 15:57:59 -0400 (Mon, 20 Aug 2012)
New Revision: 13435
Removed:
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/fully_qualified_as_scalar.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/get_kernel_matrix.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no_sparse_tests.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-manpage-generation-for-less-errors.patch
mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/zero-memory-before-starting-test-r12476.patch
Log:
don't need these patches anymore
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/fully_qualified_as_scalar.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/fully_qualified_as_scalar.patch 2012-08-20 19:37:25 UTC (rev 13434)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/fully_qualified_as_scalar.patch 2012-08-20 19:57:59 UTC (rev 13435)
@@ -1,22 +0,0 @@
-From: Ryan Curtin <gth671b at mail.gatech.edu>
-Subject: fix an issue related to full qualification of as_scalar
---- a/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp
-+++ b/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp
-@@ -32,7 +32,7 @@
- // this is the sensible thing to do.
- for (size_t i = 0; i < data.n_cols; i++)
- {
-- variances[assignments[i]] += as_scalar(
-+ variances[assignments[i]] += arma::as_scalar(
- var(data.col(i) - centroids.col(assignments[i])));
- }
-
-@@ -47,7 +47,7 @@
- {
- if (assignments[i] == maxVarCluster)
- {
-- double distance = as_scalar(
-+ double distance = arma::as_scalar(
- var(data.col(i) - centroids.col(maxVarCluster)));
-
- if (distance > maxDistance)
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/get_kernel_matrix.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/get_kernel_matrix.patch 2012-08-20 19:37:25 UTC (rev 13434)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/get_kernel_matrix.patch 2012-08-20 19:57:59 UTC (rev 13435)
@@ -1,54 +0,0 @@
-From: Ryan Curtin <gth671b at mail.gatech.edu>
-Decription: This should fix problems with some different
- compilers complaining about odd things.
-
---- a/src/mlpack/methods/kernel_pca/kernel_pca_impl.hpp
-+++ b/src/mlpack/methods/kernel_pca/kernel_pca_impl.hpp
-@@ -17,6 +17,24 @@
- namespace kpca {
-
- template <typename KernelType>
-+arma::mat GetKernelMatrix(KernelType kernel, arma::mat transData)
-+{
-+ arma::mat kernelMat(transData.n_rows, transData.n_rows);
-+
-+ for (size_t i = 0; i < transData.n_rows; i++)
-+ {
-+ for (size_t j = 0; j < transData.n_rows; j++)
-+ {
-+ arma::vec v1 = trans(transData.row(i));
-+ arma::vec v2 = trans(transData.row(j));
-+ kernelMat(i, j) = kernel.Evaluate(v1, v2);
-+ }
-+ }
-+
-+ return kernelMat;
-+}
-+
-+template <typename KernelType>
- KernelPCA<KernelType>::KernelPCA(const KernelType kernel,
- const bool centerData,
- const bool scaleData) :
-@@ -112,22 +130,4 @@
- }; // namespace mlpack
- }; // namespace kpca
-
--template <typename KernelType>
--arma::mat GetKernelMatrix(KernelType kernel, arma::mat transData)
--{
-- arma::mat kernelMat(transData.n_rows, transData.n_rows);
--
-- for (size_t i = 0; i < transData.n_rows; i++)
-- {
-- for (size_t j = 0; j < transData.n_rows; j++)
-- {
-- arma::vec v1 = trans(transData.row(i));
-- arma::vec v2 = trans(transData.row(j));
-- kernelMat(i, j) = kernel.Evaluate(v1, v2);
-- }
-- }
--
-- return kernelMat;
--}
--
- #endif
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch 2012-08-20 19:37:25 UTC (rev 13434)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no-debug-or-profiling-info.patch 2012-08-20 19:57:59 UTC (rev 13435)
@@ -1,21 +0,0 @@
-From: Stelring Lewis Peet <sterling.peet at gatech.edu>
-Description: Ensure that CMake compiles without DEBUG or
- PROFILE symbols in the code, so the binaries comply with
- Debian policy. Upstream prefers these flags on by default.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,9 +70,10 @@
- include_directories(${Boost_INCLUDE_DIRS})
- endif(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 45)
-
--# Default to debugging mode for developers.
--option(DEBUG "Compile with debugging information" ON)
--option(PROFILE "Compile with profiling information" ON)
-+# Default to clean for packaging and release, developers can call
-+# for debugging and profiling if they need it.
-+option(DEBUG "Compile with debugging information" OFF)
-+option(PROFILE "Compile with profiling information" OFF)
- option(ARMA_EXTRA_DEBUG "Compile with extra Armadillo debugging symbols." OFF)
-
- # This is as of yet unused.
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no_sparse_tests.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no_sparse_tests.patch 2012-08-20 19:37:25 UTC (rev 13434)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/no_sparse_tests.patch 2012-08-20 19:57:59 UTC (rev 13435)
@@ -1,42 +0,0 @@
-From: Ryan Curtin <gth671b at mail.gatech.edu>
-Description: Temporarily remove sparse k-means tests from the test suite.
- They fail often, and nobody uses it anyway. We will remove this patch
- when the code works in the next release, but don't break the build for
- the distributable builds in debian just because these tests fail.
-
---- a/src/mlpack/tests/kmeans_test.cpp
-+++ b/src/mlpack/tests/kmeans_test.cpp
-@@ -207,7 +207,7 @@
-
- /**
- * Make sure sparse k-means works okay.
-- */
-+ *
- BOOST_AUTO_TEST_CASE(SparseKMeansTest)
- {
- // Huge dimensionality, few points.
-@@ -247,5 +247,6 @@
- BOOST_REQUIRE_EQUAL(assignments[10], clusterTwo);
- BOOST_REQUIRE_EQUAL(assignments[11], clusterTwo);
- }
-+*/
-
- BOOST_AUTO_TEST_SUITE_END();
---- a/src/mlpack/tests/tree_test.cpp
-+++ b/src/mlpack/tests/tree_test.cpp
-@@ -1359,7 +1359,7 @@
- * with any other bounds at that level.
- *
- * Then, we do that whole process a handful of times.
-- */
-+ *
- BOOST_AUTO_TEST_CASE(ExhaustiveSparseKDTreeTest)
- {
- typedef BinarySpaceTree<HRectBound<2>, EmptyStatistic, arma::SpMat<double> >
-@@ -1435,5 +1435,6 @@
- // Check the tree depth.
- BOOST_REQUIRE_EQUAL(root.TreeDepth(), 7);
- }
-+*/
-
- BOOST_AUTO_TEST_SUITE_END();
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-manpage-generation-for-less-errors.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-manpage-generation-for-less-errors.patch 2012-08-20 19:37:25 UTC (rev 13434)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/update-manpage-generation-for-less-errors.patch 2012-08-20 19:57:59 UTC (rev 13435)
@@ -1,28 +0,0 @@
-From: Sterling Lewis Peet <sterling.peet at gatech.edu>
-Description: The manpage generation was broken and generated poorly formatted
- mapages when version 1.0.1 was released. This was fixed upstream in revision
- 12210. No bug report was filed.
- .
- This patch will be removed upon the next release of mlpack.
-
-Origin: upstream, http://trac.research.cc.gatech.edu/fastlab/changeset?reponame=&new=12210%40trunk%2FCMake%2Fexec2man.sh&old=11633%40trunk%2FCMake%2Fexec2man.sh
-
---- a/CMake/exec2man.sh
-+++ b/CMake/exec2man.sh
-@@ -63,6 +63,8 @@
- # The awk script is a little ugly, but it is meant to format parameters
- # correctly so that the entire description of the parameter is on one line (this
- # helps avoid 'man' warnings).
-+# The sed line at the end removes accidental macros from the output, replacing
-+# 'word' with "word".
- ./$name -h | \
- sed 's/^For further information/Additional Information\n\n For further information/' | \
- sed 's/^consult the documentation/ consult the documentation/' | \
-@@ -73,5 +75,6 @@
- sed 's/ / /g' | \
- awk '/NAME/,/REQUIRED OPTIONS/ { print; } /ADDITIONAL INFORMATION/,0 { print; } /REQUIRED OPTIONS/,/ADDITIONAL INFORMATION/ { if (!/REQUIRED_OPTIONS/ && !/OPTIONS/ && !/ADDITIONAL INFORMATION/) { if (/ --/) { printf "\n" } sub(/^[ ]*/, ""); sub(/ [ ]*/, " "); printf "%s ", $0; } else { if (!/REQUIRED OPTIONS/ && !/ADDITIONAL INFORMATION/) { print "\n"$0; } } }' | \
- sed 's/ ADDITIONAL INFORMATION/\n\nADDITIONAL INFORMATION/' | \
-- txt2man -P mlpack -t $name -d 1 > $output
-+ txt2man -P mlpack -t $name -d 1 | \
-+ sed "s/^'\([A-Za-z0-9 ]*\)'/\"\1\"/" > $output
-
Deleted: mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/zero-memory-before-starting-test-r12476.patch
===================================================================
--- mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/zero-memory-before-starting-test-r12476.patch 2012-08-20 19:37:25 UTC (rev 13434)
+++ mlpack/conf/packages/mlpack/branches/1.0.X/debian/patches/zero-memory-before-starting-test-r12476.patch 2012-08-20 19:57:59 UTC (rev 13435)
@@ -1,19 +0,0 @@
-From: Sterling Lewis Peet <sterling.peet at gatech.edu>
-Description: A set of tests would fail approximately 50% of the
- time when building the package. This was fixed upstream in revision
- 12476. No bug report was filed.
- .
- This patch will be removed upon the next release of mlpack.
-
-Origin: upstream, http://trac.research.cc.gatech.edu/fastlab/changeset/12476
-
---- a/src/mlpack/tests/distribution_test.cpp
-+++ b/src/mlpack/tests/distribution_test.cpp
-@@ -54,6 +54,7 @@
- d.Probabilities() = "0.3 0.6 0.1";
-
- arma::vec actualProb(3);
-+ actualProb.zeros();
-
- for (size_t i = 0; i < 10000; i++)
- actualProb((size_t) (d.Random()[0] + 0.5))++;
More information about the mlpack-svn
mailing list