[mlpack-git] master: - Fixed openmp declarations. - Copyright notes added. (24f6d8c)
gitdub at mlpack.org
gitdub at mlpack.org
Tue Oct 18 10:29:31 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/94d14187222231ca29e4f6419c5999c660db4f8a...981ffa2d67d8fe38df6c699589005835fef710ea
>---------------------------------------------------------------
commit 24f6d8c57914a382f536beb2dc3a8ef097aab52d
Author: theJonan <ivan at jonan.info>
Date: Tue Oct 18 17:29:31 2016 +0300
- Fixed openmp declarations.
- Copyright notes added.
>---------------------------------------------------------------
24f6d8c57914a382f536beb2dc3a8ef097aab52d
COPYRIGHT.txt | 1 +
src/mlpack/core.hpp | 1 +
src/mlpack/methods/det/dt_utils_impl.hpp | 4 ++--
src/mlpack/methods/det/dtree_impl.hpp | 6 ++----
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index fd38ca1..ed1925f 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -61,6 +61,7 @@ Copyright:
Copyright 2016, Nilay Jain <nilayjain13 at gmail.com>
Copyright 2016, Peter Lehner <peter.lehner at dlr.de>
Copyright 2016, Anuraj Kanodia <akanuraj200 at gmail.com>
+ Copyright 2016, Ivan Georgiev <ivan at jonan.info>
License: BSD-3-clause
All rights reserved.
.
diff --git a/src/mlpack/core.hpp b/src/mlpack/core.hpp
index a5bca73..3e056fd 100644
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@ -195,6 +195,7 @@
* - Nilay Jain <nilayjain13 at gmail.com>
* - Peter Lehner <peter.lehner at dlr.de>
* - Anuraj Kanodia <akanuraj200 at gmail.com>
+ * - Ivan Georgiev <ivan at jonan.info>
*/
// First, include all of the prerequisites.
diff --git a/src/mlpack/methods/det/dt_utils_impl.hpp b/src/mlpack/methods/det/dt_utils_impl.hpp
index fcb6b0c..6a798c4 100644
--- a/src/mlpack/methods/det/dt_utils_impl.hpp
+++ b/src/mlpack/methods/det/dt_utils_impl.hpp
@@ -181,11 +181,11 @@ DTree<MatType, TagType>* mlpack::det::Trainer(MatType& dataset,
// implementation.
#ifdef _WIN32
#pragma omp parallel for default(none) \
- shared(testSize, cvData, prunedSequence, regularizationConstants)
+ shared(cvData, prunedSequence, regularizationConstants)
for (intmax_t fold = 0; fold < (intmax_t) folds; fold++)
#else
#pragma omp parallel for default(none) \
- shared(testSize, cvData, prunedSequence, regularizationConstants)
+ shared(cvData, prunedSequence, regularizationConstants)
for (size_t fold = 0; fold < folds; fold++)
#endif
{
diff --git a/src/mlpack/methods/det/dtree_impl.hpp b/src/mlpack/methods/det/dtree_impl.hpp
index be64f5c..92f9078 100644
--- a/src/mlpack/methods/det/dtree_impl.hpp
+++ b/src/mlpack/methods/det/dtree_impl.hpp
@@ -264,12 +264,10 @@ bool DTree<MatType, TagType>::FindSplit(const MatType& data,
// Loop through each dimension.
#ifdef _WIN32
- #pragma omp parallel for default(none) \
- shared(splitValue, splitDim, data)
+ #pragma omp parallel for default(shared)
for (intmax_t dim = 0; dim < (intmax_t) maxVals.n_elem; ++dim)
#else
- #pragma omp parallel for default(none) \
- shared(splitValue, splitDim, data)
+ #pragma omp parallel for default(shared)
for (size_t dim = 0; dim < maxVals.n_elem; ++dim)
#endif
{
More information about the mlpack-git
mailing list