Skip to content

Commit 93e4560

Browse files
committed
Merge pull request #89 from mengxr/deprecate-1.3
Remove support in mllib-perf for Spark 1.0, 1.1, 1.2, and 1.3
2 parents 79f8cfa + 64168c0 commit 93e4560

35 files changed

+2
-7006
lines changed

mllib-tests/project/MLlibTestsBuild.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import AssemblyKeys._
66
/**
77
* Build settings for MLlib. To build against a specific Spark version (e.g., 1.1.0), use
88
* {{{
9-
* sbt -Dspark.version=1.1.0 clean ...
9+
* sbt -Dspark.version=1.4.1 clean ...
1010
* }}}
1111
*/
1212
object MLlibTestsBuild extends Build {
@@ -17,7 +17,7 @@ object MLlibTestsBuild extends Build {
1717
organization := "org.spark-project",
1818
version := "0.1",
1919
scalaVersion := "2.10.4",
20-
sparkVersion := sys.props.getOrElse("spark.version", default="1.3.1"),
20+
sparkVersion := sys.props.getOrElse("spark.version", default="1.5.2"),
2121
libraryDependencies ++= Seq(
2222
"net.sf.jopt-simple" % "jopt-simple" % "4.6",
2323
"org.scalatest" %% "scalatest" % "2.2.1" % "test",
@@ -33,10 +33,6 @@ object MLlibTestsBuild extends Build {
3333
settings = assemblySettings ++ commonSettings ++ Seq(
3434
scalaSource in Compile := {
3535
val targetFolder = sparkVersion.value match {
36-
case v if v.startsWith("1.0.") => "v1p0"
37-
case v if v.startsWith("1.1.") => "v1p1"
38-
case v if v.startsWith("1.2.") => "v1p2"
39-
case v if v.startsWith("1.3.") => "v1p3"
4036
case v if v.startsWith("1.4.") => "v1p4"
4137
case v if v.startsWith("1.5.") => "v1p5"
4238
case _ => throw new IllegalArgumentException(s"Do not support Spark ${sparkVersion.value}.")

mllib-tests/v1p0/src/main/scala/mllib/perf/LinearAlgebraTests.scala

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)