Repository: mahout Updated Branches: refs/heads/master fa8975370 -> 22c5e8648
MAHOUT-1934: OpenMP jars aren't being picked up add in dependency-reduced.jar to put javacpp jars on executor classpath. Hack for now. closes apache/mahout#273 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/22c5e864 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/22c5e864 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/22c5e864 Branch: refs/heads/master Commit: 22c5e86480c124c95b2a4698e23a0d98cd7a474b Parents: fa89753 Author: Andrew Palumbo <[email protected]> Authored: Thu Feb 2 17:29:15 2017 -0800 Committer: Andrew Palumbo <[email protected]> Committed: Thu Feb 2 17:32:57 2017 -0800 ---------------------------------------------------------------------- .../scala/org/apache/mahout/sparkbindings/package.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/22c5e864/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala ---------------------------------------------------------------------- diff --git a/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala b/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala index 2e3f528..cf42676 100644 --- a/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala +++ b/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala @@ -262,8 +262,13 @@ package object sparkbindings { j.matches(".*mahout-spark_\\d.*\\.jar") || // vcl jars: mahout-native-viennacl_2.10.jar, // mahout-native-viennacl-omp_2.10.jar - j.matches(".*mahout-native-viennacl_\\d.*\\\\.jar") || - j.matches(".*mahout-native-viennacl-omp_\\d.*\\.jar") +// j.matches(".*mahout-native-viennacl_\\d.*\\\\.jar") || +// j.matches(".*mahout-native-viennacl-omp_\\d.*\\.jar")|| + j.matches(".*mahout-native-viennacl*.jar")|| + // while WIP on MAHOUT-1894, use single wildcard + // TODO: remove after 1894 is closed out + j.matches(".mahout-spark*-dependency-reduced.jar") + ) // Tune out "bad" classifiers .filter(n =>
