You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ak...@apache.org on 2017/03/02 05:16:45 UTC
mahout git commit: Rolling back RC, changing some logging
Repository: mahout
Updated Branches:
refs/heads/master 74d2f8861 -> 857c96d2c
Rolling back RC, changing some logging
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/857c96d2
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/857c96d2
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/857c96d2
Branch: refs/heads/master
Commit: 857c96d2cd5a120791f5303ad0fdf45f48d2d5dc
Parents: 74d2f88
Author: Andrew Musselman <ak...@apache.org>
Authored: Wed Mar 1 21:16:28 2017 -0800
Committer: Andrew Musselman <ak...@apache.org>
Committed: Wed Mar 1 21:16:28 2017 -0800
----------------------------------------------------------------------
buildtools/pom.xml | 2 +-
distribution/pom.xml | 4 +---
examples/pom.xml | 2 +-
h2o/pom.xml | 2 +-
hdfs/pom.xml | 2 +-
integration/pom.xml | 2 +-
math-scala/pom.xml | 2 +-
.../scala/org/apache/mahout/math/backend/RootSolverFactory.scala | 4 ++--
math/pom.xml | 2 +-
mr/pom.xml | 2 +-
pom.xml | 2 +-
spark/pom.xml | 2 +-
.../main/scala/org/apache/mahout/viennacl/opencl/GPUMMul.scala | 2 +-
13 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/buildtools/pom.xml
----------------------------------------------------------------------
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index a28dbf4..c96b3a5 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-buildtools</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<name>Mahout Build Tools</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index cabd67d..5b8927e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>apache-mahout-distribution</artifactId>
@@ -117,7 +117,6 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>
- <version>0.13.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
@@ -156,7 +155,6 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId>
- <version>0.13.0-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 3798117..b3bf827 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/h2o/pom.xml
----------------------------------------------------------------------
diff --git a/h2o/pom.xml b/h2o/pom.xml
index 828c3fd..f5095bb 100644
--- a/h2o/pom.xml
+++ b/h2o/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hdfs/pom.xml b/hdfs/pom.xml
index b43d908..50fe3b7 100644
--- a/hdfs/pom.xml
+++ b/hdfs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/pom.xml b/integration/pom.xml
index 5a873a6..d9945d9 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/math-scala/pom.xml
----------------------------------------------------------------------
diff --git a/math-scala/pom.xml b/math-scala/pom.xml
index a6efdb0..da1c05b 100644
--- a/math-scala/pom.xml
+++ b/math-scala/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/math-scala/src/main/scala/org/apache/mahout/math/backend/RootSolverFactory.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/math/backend/RootSolverFactory.scala b/math-scala/src/main/scala/org/apache/mahout/math/backend/RootSolverFactory.scala
index 382537f..0904ea5 100644
--- a/math-scala/src/main/scala/org/apache/mahout/math/backend/RootSolverFactory.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/math/backend/RootSolverFactory.scala
@@ -63,7 +63,7 @@ final object RootSolverFactory extends SolverFactory {
} catch {
case x: Exception =>
- logger.warn("Unable to create class GPUMMul: attempting OpenMP version")
+ logger.info("Unable to create class GPUMMul: attempting OpenMP version")
try {
// Attempt to instantiate the OpenMP version, assuming we\u2019ve
// created a separate OpenMP-only module (none exist yet)
@@ -73,7 +73,7 @@ final object RootSolverFactory extends SolverFactory {
} catch {
case xx: Exception =>
- logger.error(xx.getMessage)
+ logger.info(xx.getMessage)
// Fall back to JVM; don't need to dynamically assign since MMul is in the same package.
logger.info("Unable to create class OMPMMul: falling back to java version")
clazz = MMul
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/math/pom.xml
----------------------------------------------------------------------
diff --git a/math/pom.xml b/math/pom.xml
index 2294db7..2de5422 100644
--- a/math/pom.xml
+++ b/math/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/mr/pom.xml
----------------------------------------------------------------------
diff --git a/mr/pom.xml b/mr/pom.xml
index 94db6c0..d79c008 100644
--- a/mr/pom.xml
+++ b/mr/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8485c7c..6e249a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Mahout</name>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index c04f64a..4e75a62 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/mahout/blob/857c96d2/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/GPUMMul.scala
----------------------------------------------------------------------
diff --git a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/GPUMMul.scala b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/GPUMMul.scala
index a0b317d..8c6a3a9 100644
--- a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/GPUMMul.scala
+++ b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/GPUMMul.scala
@@ -131,7 +131,7 @@ object GPUMMul extends MMBinaryFunc {
// have been created than number of GPU cards.
// Better option wuold be to fall back to OpenCL first.
case ex: Exception =>
- log.warn(ex.getMessage + "falling back to JVM MMUL")
+ log.info(ex.getMessage + "falling back to JVM MMUL")
return MMul(a, b, r)
}
}