diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py index c844bcff7e4f0f4634388655487c89a413d89754..bb04ec6ee67d23cd2f7e165b0176bff10aa33e71 100644 --- a/dev/sparktestsupport/modules.py +++ b/dev/sparktestsupport/modules.py @@ -256,21 +256,9 @@ streaming_flume_assembly = Module( ) -mllib_local = Module( - name="mllib-local", - dependencies=[], - source_file_regexes=[ - "mllib-local", - ], - sbt_test_goals=[ - "mllib-local/test", - ] -) - - mllib = Module( name="mllib", - dependencies=[mllib_local, streaming, sql], + dependencies=[streaming, sql], source_file_regexes=[ "data/mllib/", "mllib/", diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml deleted file mode 100644 index 69917eb0fb5fe4878673865fa5923bdeeb55808b..0000000000000000000000000000000000000000 --- a/mllib-local/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.spark</groupId> - <artifactId>spark-parent_2.11</artifactId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib-local_2.11</artifactId> - <properties> - <sbt.project.name>mllib-local</sbt.project.name> - </properties> - <packaging>jar</packaging> - <name>Spark Project ML Local Library</name> - <url>http://spark.apache.org/</url> - - <dependencies> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.scalanlp</groupId> - <artifactId>breeze_${scala.binary.version}</artifactId> - <version>0.11.2</version> - <exclusions> - <!-- This is included as a compile-scoped dependency by jtransforms, which is - a dependency of breeze. --> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </dependency> - <dependency> - <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_${scala.binary.version}</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <profiles> - <profile> - <id>netlib-lgpl</id> - <dependencies> - <dependency> - <groupId>com.github.fommil.netlib</groupId> - <artifactId>all</artifactId> - <version>${netlib.java.version}</version> - <type>pom</type> - </dependency> - </dependencies> - </profile> - </profiles> - <build> - <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> - <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> - </build> -</project> diff --git a/mllib-local/src/main/scala/org/apache/spark/ml/DummyTesting.scala b/mllib-local/src/main/scala/org/apache/spark/ml/DummyTesting.scala deleted file mode 100644 index 6b3268cdfa25c533a8b58650f6e191960f99cd8f..0000000000000000000000000000000000000000 --- a/mllib-local/src/main/scala/org/apache/spark/ml/DummyTesting.scala +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.ml - -// This is a private class testing if the new build works. To be removed soon. -private[ml] object DummyTesting { - private[ml] def add10(input: Double): Double = input + 10 -} diff --git a/mllib-local/src/test/scala/org/apache/spark/ml/DummyTestingSuite.scala b/mllib-local/src/test/scala/org/apache/spark/ml/DummyTestingSuite.scala deleted file mode 100644 index 6c76dbfbfa9e093bb5a73ce6d54366a6a23d9b8b..0000000000000000000000000000000000000000 --- a/mllib-local/src/test/scala/org/apache/spark/ml/DummyTestingSuite.scala +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.ml - -import org.apache.spark.SparkFunSuite - -// This is testing if the new build works. To be removed soon. -class DummyTestingSuite extends SparkFunSuite { - - test("This is testing if the new build works.") { - assert(DummyTesting.add10(15) === 25) - } -} diff --git a/mllib/pom.xml b/mllib/pom.xml index e56eafc3006bd092394879bcf39481e5ec4b34bb..428176dcbfadf4bdc7a27daec726931ceb7ebfea 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -62,18 +62,6 @@ <artifactId>spark-graphx_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib-local_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib-local_${scala.binary.version}</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.scalanlp</groupId> <artifactId>breeze_${scala.binary.version}</artifactId> diff --git a/pom.xml b/pom.xml index 58c85b1d3699ba11265c262ce862f072ca750984..3f9e4abc3224e9a199ad9255cca4671c21fd8c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,6 @@ <module>core</module> <module>graphx</module> <module>mllib</module> - <module>mllib-local</module> <module>tools</module> <module>streaming</module> <module>sql/catalyst</module> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c5688ecec65d463e3e98d02ea406f5971d6b7d5f..60124ef0a13bc7a21485fdb3d3761afae76c0f95 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -47,9 +47,9 @@ object BuildCommons { ).map(ProjectRef(buildLocation, _)) val allProjects@Seq( - core, graphx, mllib, mllibLocal, repl, networkCommon, networkShuffle, launcher, unsafe, testTags, sketch, _* + core, graphx, mllib, repl, networkCommon, networkShuffle, launcher, unsafe, testTags, sketch, _* ) = Seq( - "core", "graphx", "mllib", "mllib-local", "repl", "network-common", "network-shuffle", "launcher", "unsafe", + "core", "graphx", "mllib", "repl", "network-common", "network-shuffle", "launcher", "unsafe", "test-tags", "sketch" ).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects @@ -254,7 +254,7 @@ object SparkBuild extends PomBuild { val mimaProjects = allProjects.filterNot { x => Seq( spark, hive, hiveThriftServer, catalyst, repl, networkCommon, networkShuffle, networkYarn, - unsafe, testTags, sketch, mllibLocal + unsafe, testTags, sketch ).contains(x) }