Repository: spark Updated Branches: refs/heads/master 4a346e242 -> 441cdcca6
[SPARK-2172] PySpark cannot import mllib modules in YARN-client mode Include pyspark/mllib python sources as resources in the mllib.jar. This way they will be included in the final assembly Author: Szul, Piotr <piotr.s...@csiro.au> Closes #1223 from piotrszul/branch-1.0 and squashes the following commits: 69d5174 [Szul, Piotr] Removed unsed resource directory src/main/resource from mllib pom f8c52a0 [Szul, Piotr] [SPARK-2172] PySpark cannot import mllib modules in YARN-client mode Include pyspark/mllib python sources as resources in the jar (cherry picked from commit fa167194ce1b5898e4d7232346c9f86b2897a722) Signed-off-by: Reynold Xin <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/441cdcca Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/441cdcca Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/441cdcca Branch: refs/heads/master Commit: 441cdcca64ba0b3cbaae4d4f25ebe4c4ebd46aae Parents: 4a346e2 Author: Szul, Piotr <piotr.s...@csiro.au> Authored: Wed Jun 25 21:55:49 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Wed Jun 25 23:07:16 2014 -0700 ---------------------------------------------------------------------- mllib/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/441cdcca/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index 878cb83..b622f96 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -84,5 +84,13 @@ <artifactId>scalatest-maven-plugin</artifactId> </plugin> </plugins> + <resources> + <resource> + <directory>../python</directory> + <includes> + <include>pyspark/mllib/*.py</include> + </includes> + </resource> + </resources> </build> </project>
