[mlpack] 40/40: forward port quilt patches

Barak A. Pearlmutter barak+git at pearlmutter.net
Mon Feb 15 19:34:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository mlpack.

commit 7fc993b02bf65793cb999bda5794cd2ceb2850e4
Author: Barak A. Pearlmutter <barak+git at pearlmutter.net>
Date:   Mon Feb 15 19:16:45 2016 +0000

    forward port quilt patches
---
 debian/patches/0001-build-Doxygen.patch     |   4 +-
 debian/patches/0002-spelling.patch          | 221 ----------------------------
 debian/patches/0003-Doxygen-timestamp.patch |   2 +-
 debian/patches/series                       |   1 -
 4 files changed, 3 insertions(+), 225 deletions(-)

diff --git a/debian/patches/0001-build-Doxygen.patch b/debian/patches/0001-build-Doxygen.patch
index 289719c..4cb7a8d 100644
--- a/debian/patches/0001-build-Doxygen.patch
+++ b/debian/patches/0001-build-Doxygen.patch
@@ -11,10 +11,10 @@ to the debian/rules override_dh_auto_build target.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cf2e32..91deb22 100644
+index 287ba97..4c72121 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -303,7 +303,7 @@ if (DOXYGEN_FOUND)
+@@ -307,7 +307,7 @@ if (DOXYGEN_FOUND)
    )
  
    # Generate documentation.
diff --git a/debian/patches/0002-spelling.patch b/debian/patches/0002-spelling.patch
deleted file mode 100644
index 81ddbad..0000000
--- a/debian/patches/0002-spelling.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
-Date: Sun, 17 Aug 2014 09:03:13 +0200
-Subject: spelling
-
----
- doc/tutorials/amf/amf.txt                                         | 8 ++++----
- src/mlpack/core/tree/ballbound_impl.hpp                           | 2 +-
- src/mlpack/core/tree/cosine_tree/cosine_tree.cpp                  | 2 +-
- src/mlpack/methods/amf/init_rules/average_init.hpp                | 4 ++--
- src/mlpack/methods/amf/init_rules/random_acol_init.hpp            | 2 +-
- src/mlpack/methods/amf/init_rules/random_init.hpp                 | 4 ++--
- .../amf/termination_policies/simple_tolerance_termination.hpp     | 2 +-
- .../amf/termination_policies/validation_RMSE_termination.hpp      | 2 +-
- src/mlpack/methods/lsh/lsh_search.hpp                             | 4 ++--
- .../methods/softmax_regression/softmax_regression_function.cpp    | 2 +-
- .../methods/sparse_autoencoder/sparse_autoencoder_function.hpp    | 2 +-
- src/mlpack/tests/cosine_tree_test.cpp                             | 2 +-
- 12 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/doc/tutorials/amf/amf.txt b/doc/tutorials/amf/amf.txt
-index abb4c03..bc4f8ed 100644
---- a/doc/tutorials/amf/amf.txt
-+++ b/doc/tutorials/amf/amf.txt
-@@ -72,14 +72,14 @@ the threshold or the number of iterations goes beyond the threshold, positive
- termination signal is passed to AMF.
- 
- In SimpleToleranceTermination, termination criterion is met when increase in
--residue value drops below the given tolerance. To accomodate spikes, certain
-+residue value drops below the given tolerance. To accommodate spikes, certain
- number of successive residue drops are accepted. Secondary termination criterion
- terminates algorithm when iteration count goes beyond the threshold.
- 
- ValidationRMSETermination divids the data into 2 sets, training set and
- validation set. Entries of validation set are nullifed in the input matrix.
- Termination criterion is met when increase in validation set RMSe value drops
--below the given tolerance. To accomodate spikes certain number of successive
-+below the given tolerance. To accommodate spikes certain number of successive
- validation RMSE drops are accepted. This upper imit on successive drops can be
- adjusted with reverseStepCount. Secondary termination criterion terminates
- algorithm when iteration count goes above the threshold. Though this termination
-@@ -101,7 +101,7 @@ The AMF class comes with 2 initialization policies
- 
- RandomInitialization initializes matrices W and H with random uniform distribution
- while RandomAcolInitialization initializes the W matrix by averaging p randomly
--chosen columns of V.  In case of RandomAcolIntialization, p is a template parameter.
-+chosen columns of V.  In case of RandomAcolInitialization, p is a template parameter.
- 
- To implement their own initialization policy, users need to define the following
- function in their class.
-@@ -160,7 +160,7 @@ int main()
- }
- @endcode
- 
--NMFALSFactorizer uses SimpleResidueTermination which is most prefered with
-+NMFALSFactorizer uses SimpleResidueTermination which is most preferred with
- Non-Negative Matrix factorizers. Initialization of W and H in NMFALSFactorizer
- is random. The Apply function returns the residue obtained by comparing the
- constructed matrix W * H with the original matrix V.
-diff --git a/src/mlpack/core/tree/ballbound_impl.hpp b/src/mlpack/core/tree/ballbound_impl.hpp
-index 78bf2f1..97226e1 100644
---- a/src/mlpack/core/tree/ballbound_impl.hpp
-+++ b/src/mlpack/core/tree/ballbound_impl.hpp
-@@ -271,7 +271,7 @@ BallBound<VecType, TMetricType>::operator|=(const MatType& data)
-     if (dist > radius)
-     {
-       // Move towards the new point and increase the radius just enough to
--      // accomodate the new point.
-+      // accommodate the new point.
-       arma::vec diff = data.col(i) - center;
-       center += ((dist - radius) / (2 * dist)) * diff;
-       radius = 0.5 * (dist + radius);
-diff --git a/src/mlpack/core/tree/cosine_tree/cosine_tree.cpp b/src/mlpack/core/tree/cosine_tree/cosine_tree.cpp
-index 7343c4b..3b23226 100644
---- a/src/mlpack/core/tree/cosine_tree/cosine_tree.cpp
-+++ b/src/mlpack/core/tree/cosine_tree/cosine_tree.cpp
-@@ -340,7 +340,7 @@ void CosineTree::ColumnSamplesLS(std::vector<size_t>& sampledIndices,
-     cDistribution(i+1) = cDistribution(i) + l2NormsSquared(i) / frobNormSquared;
-   }
- 
--  // Intialize sizes of the 'sampledIndices' and 'probabilities' vectors.
-+  // Initialize sizes of the 'sampledIndices' and 'probabilities' vectors.
-   sampledIndices.resize(numSamples);
-   probabilities.zeros(numSamples);
- 
-diff --git a/src/mlpack/methods/amf/init_rules/average_init.hpp b/src/mlpack/methods/amf/init_rules/average_init.hpp
-index 49fbe07..15d08c6 100644
---- a/src/mlpack/methods/amf/init_rules/average_init.hpp
-+++ b/src/mlpack/methods/amf/init_rules/average_init.hpp
-@@ -2,7 +2,7 @@
-  * @file averge_init.hpp
-  * @author Sumedh Ghaisas
-  *
-- * Intialization rule for Alternating Matrix Factorization.
-+ * Initialization rule for Alternating Matrix Factorization.
-  *
-  * This file is part of mlpack 2.0.0.
-  *
-@@ -76,7 +76,7 @@ class AverageInitialization
- 
-     avgV = sqrt(((avgV / (n * m)) - min) / r);
- 
--    // Intialize to random values.
-+    // Initialize to random values.
-     W.randu(n, r);
-     H.randu(r, m);
- 
-diff --git a/src/mlpack/methods/amf/init_rules/random_acol_init.hpp b/src/mlpack/methods/amf/init_rules/random_acol_init.hpp
-index 5362481..5b87dbf 100644
---- a/src/mlpack/methods/amf/init_rules/random_acol_init.hpp
-+++ b/src/mlpack/methods/amf/init_rules/random_acol_init.hpp
-@@ -2,7 +2,7 @@
-  * @file random_acol_init.hpp
-  * @author Mohan Rajendran
-  *
-- * Intialization rule for Alternating Matrix Factorization.
-+ * Initialization rule for Alternating Matrix Factorization.
-  *
-  * This file is part of mlpack 2.0.0.
-  *
-diff --git a/src/mlpack/methods/amf/init_rules/random_init.hpp b/src/mlpack/methods/amf/init_rules/random_init.hpp
-index a0a64db..f6655eb 100644
---- a/src/mlpack/methods/amf/init_rules/random_init.hpp
-+++ b/src/mlpack/methods/amf/init_rules/random_init.hpp
-@@ -2,7 +2,7 @@
-  * @file random_init.hpp
-  * @author Mohan Rajendran
-  *
-- * Intialization rule for alternating matrix forization (AMF). This simple
-+ * Initialization rule for alternating matrix forization (AMF). This simple
-  * initialization is performed by assigning a random matrix to W and H.
-  *
-  * This file is part of mlpack 2.0.0.
-@@ -56,7 +56,7 @@ class RandomInitialization
-     const size_t n = V.n_rows;
-     const size_t m = V.n_cols;
- 
--    // Intialize to random values.
-+    // Initialize to random values.
-     W.randu(n, r);
-     H.randu(r, m);
-   }
-diff --git a/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp b/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp
-index 509d06d..0920e9b 100644
---- a/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp
-+++ b/src/mlpack/methods/amf/termination_policies/simple_tolerance_termination.hpp
-@@ -30,7 +30,7 @@ namespace amf {
- /**
-  * This class implements residue tolerance termination policy. Termination
-  * criterion is met when increase in residue value drops below the given tolerance.
-- * To accomodate spikes certain number of successive residue drops are accepted.
-+ * To accommodate spikes certain number of successive residue drops are accepted.
-  * This upper imit on successive drops can be adjusted with reverseStepCount.
-  * Secondary termination criterion terminates algorithm when iteration count
-  * goes above the threshold.
-diff --git a/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp b/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp
-index 80c5bf9..1ad1853 100644
---- a/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp
-+++ b/src/mlpack/methods/amf/termination_policies/validation_RMSE_termination.hpp
-@@ -34,7 +34,7 @@ namespace amf
-  * The input data matrix is divided into 2 sets, training set and validation set.
-  * Entries of validation set are nullifed in the input matrix. Termination
-  * criterion is met when increase in validation set RMSe value drops below the
-- * given tolerance. To accomodate spikes certain number of successive validation
-+ * given tolerance. To accommodate spikes certain number of successive validation
-  * RMSE drops are accepted. This upper imit on successive drops can be adjusted
-  * with reverseStepCount. Secondary termination criterion terminates algorithm
-  * when iteration count goes above the threshold.
-diff --git a/src/mlpack/methods/lsh/lsh_search.hpp b/src/mlpack/methods/lsh/lsh_search.hpp
-index 0a7b550..ea5728b 100644
---- a/src/mlpack/methods/lsh/lsh_search.hpp
-+++ b/src/mlpack/methods/lsh/lsh_search.hpp
-@@ -200,8 +200,8 @@ class LSHSearch
-    * standard hash.
-    *
-    * This function does not have any parameters and relies on parameters which
--   * are private members of this class, intialized during the class
--   * intialization.
-+   * are private members of this class, initialized during the class
-+   * initialization.
-    */
-   void BuildHash();
- 
-diff --git a/src/mlpack/methods/softmax_regression/softmax_regression_function.cpp b/src/mlpack/methods/softmax_regression/softmax_regression_function.cpp
-index 005dd2a..fe473c6 100644
---- a/src/mlpack/methods/softmax_regression/softmax_regression_function.cpp
-+++ b/src/mlpack/methods/softmax_regression/softmax_regression_function.cpp
-@@ -35,7 +35,7 @@ SoftmaxRegressionFunction::SoftmaxRegressionFunction(
-     lambda(lambda),
-     fitIntercept(fitIntercept)
- {
--  // Intialize the parameters to suitable values.
-+  // Initialize the parameters to suitable values.
-   initialPoint = InitializeWeights();
- 
-   // Calculate the label matrix.
-diff --git a/src/mlpack/methods/sparse_autoencoder/sparse_autoencoder_function.hpp b/src/mlpack/methods/sparse_autoencoder/sparse_autoencoder_function.hpp
-index f3fe967..8dae8f5 100644
---- a/src/mlpack/methods/sparse_autoencoder/sparse_autoencoder_function.hpp
-+++ b/src/mlpack/methods/sparse_autoencoder/sparse_autoencoder_function.hpp
-@@ -157,7 +157,7 @@ class SparseAutoencoderFunction
-  private:
-   //! The matrix of data points.
-   const arma::mat& data;
--  //! Intial parameter vector.
-+  //! Initial parameter vector.
-   arma::mat initialPoint;
-   //! Size of the visible layer.
-   size_t visibleSize;
-diff --git a/src/mlpack/tests/cosine_tree_test.cpp b/src/mlpack/tests/cosine_tree_test.cpp
-index 2da2465..1e5eda9 100644
---- a/src/mlpack/tests/cosine_tree_test.cpp
-+++ b/src/mlpack/tests/cosine_tree_test.cpp
-@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(CosineTreeNoSplit)
-  */
- BOOST_AUTO_TEST_CASE(CosineNodeCosineSplit)
- {
--  // Intialize constants required for the test.
-+  // Initialize constants required for the test.
-   const size_t numRows = 500;
-   const size_t numCols = 1000;
- 
diff --git a/debian/patches/0003-Doxygen-timestamp.patch b/debian/patches/0003-Doxygen-timestamp.patch
index ea8712f..04a1d16 100644
--- a/debian/patches/0003-Doxygen-timestamp.patch
+++ b/debian/patches/0003-Doxygen-timestamp.patch
@@ -10,7 +10,7 @@ https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByD
  1 file changed, 5 insertions(+)
 
 diff --git a/Doxyfile b/Doxyfile
-index 9b96e99..6a7b79b 100644
+index f9baa7d..2169ac1 100644
 --- a/Doxyfile
 +++ b/Doxyfile
 @@ -71,6 +71,11 @@ SHOW_USED_FILES        = YES
diff --git a/debian/patches/series b/debian/patches/series
index 4f98b53..92f4663 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-build-Doxygen.patch
-0002-spelling.patch
 0003-Doxygen-timestamp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git



More information about the debian-science-commits mailing list