Repository: mahout Updated Branches: refs/heads/master ca8b4935c -> df08a37c4
rebased off of master fresh Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/72dfcee8 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/72dfcee8 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/72dfcee8 Branch: refs/heads/master Commit: 72dfcee8c15594c7d3cc9daee13de0752451a48b Parents: e3530b2 Author: rawkintrevo <[email protected]> Authored: Tue Jul 25 16:57:06 2017 -0500 Committer: rawkintrevo <[email protected]> Committed: Tue Jul 25 16:57:06 2017 -0500 ---------------------------------------------------------------------- buildtools/build-all-release-jars.sh | 30 ------ .../src/main/assembly/scala-2.10_spark-1.6.xml | 6 +- .../src/main/assembly/scala-2.11_spark-2.0.xml | 6 +- .../src/main/assembly/scala-2.11_spark-2.1.xml | 4 +- math-scala/pom.xml | 26 ++++- math-scala/scala-2.10/pom.xml | 55 ++++++++++ math-scala/scala-2.11/pom.xml | 55 ++++++++++ spark/pom.xml | 100 ++++++++++++++----- spark/spark-1.6/pom.xml | 69 +++++++++++++ spark/spark-2.0/pom.xml | 69 +++++++++++++ spark/spark-2.1/pom.xml | 69 +++++++++++++ viennacl-omp/pom.xml | 6 +- viennacl-omp/scala-2.10/pom.xml | 68 +++++++++++++ viennacl-omp/scala-2.11/pom.xml | 67 +++++++++++++ viennacl/pom.xml | 25 +++-- viennacl/scala-2.10/pom.xml | 68 +++++++++++++ viennacl/scala-2.11/pom.xml | 67 +++++++++++++ 17 files changed, 710 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/buildtools/build-all-release-jars.sh ---------------------------------------------------------------------- diff --git a/buildtools/build-all-release-jars.sh b/buildtools/build-all-release-jars.sh deleted file mode 100755 index cdb87b6..0000000 --- a/buildtools/build-all-release-jars.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# -# 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. -# - -# -# This file compiles all varients of scala and spark required for -# release assemblies -# - -cd ../ -mvn clean -mvn -Pscala-2.10,spark-1.6,viennacl,viennacl-omp -DskipTests -mvn -Pscala-2.11,spark-2.0,viennacl,viennacl-omp -DskipTests -cd spark -mvn -Pscala-2.11,spark-2.1 -DskipTests \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/distribution/src/main/assembly/scala-2.10_spark-1.6.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/scala-2.10_spark-1.6.xml b/distribution/src/main/assembly/scala-2.10_spark-1.6.xml index 2cc2095..5ae0834 100644 --- a/distribution/src/main/assembly/scala-2.10_spark-1.6.xml +++ b/distribution/src/main/assembly/scala-2.10_spark-1.6.xml @@ -128,10 +128,10 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../spark/target</directory> + <directory>${project.basedir}/../spark/spark-1.6/target</directory> <includes> - <include>mahout-*2.10*.jar</include> - <include>mahout-*2.10*dependency-reduced.jar</include> + <include>mahout-*1.6-2.10*.jar</include> + <include>mahout-*1.6-2.10*dependency-reduced.jar</include> </includes> <excludes> <exclude>*sources.jar</exclude> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/distribution/src/main/assembly/scala-2.11_spark-2.0.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/scala-2.11_spark-2.0.xml b/distribution/src/main/assembly/scala-2.11_spark-2.0.xml index 5c6b646..cab595b 100644 --- a/distribution/src/main/assembly/scala-2.11_spark-2.0.xml +++ b/distribution/src/main/assembly/scala-2.11_spark-2.0.xml @@ -128,10 +128,10 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../spark/target</directory> + <directory>${project.basedir}/../spark/spark-2.0/target</directory> <includes> - <include>mahout-*2.11*spark_2.0.jar</include> - <include>mahout-*2.11*dependency-reduced.jar</include> + <include>mahout-*2.0-2.11*spark.jar</include> + <include>mahout-*2.0-2.11*dependency-reduced.jar</include> </includes> <excludes> <exclude>*sources.jar</exclude> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/distribution/src/main/assembly/scala-2.11_spark-2.1.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/scala-2.11_spark-2.1.xml b/distribution/src/main/assembly/scala-2.11_spark-2.1.xml index 7c614ec..40a3566 100644 --- a/distribution/src/main/assembly/scala-2.11_spark-2.1.xml +++ b/distribution/src/main/assembly/scala-2.11_spark-2.1.xml @@ -130,8 +130,8 @@ <fileSet> <directory>${project.basedir}/../spark/target</directory> <includes> - <include>mahout-*2.11*spark_2.1.jar</include> - <include>mahout-*2.11*dependency-reduced.jar</include> + <include>mahout-*2.1-2.11*spark.jar</include> + <include>mahout-*2.1-2.11*dependency-reduced.jar</include> </includes> <excludes> <exclude>*sources.jar</exclude> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 1b382d9..694daba 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -27,14 +27,14 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-math-scala_${scala.compat.version}</artifactId> + <artifactId>mahout-math-scala</artifactId> <name>Mahout Math Scala bindings</name> <description>High performance scientific and technical computing data structures and methods, mostly based on CERN's Colt Java API </description> - <packaging>jar</packaging> + <packaging>pom</packaging> <build> @@ -95,10 +95,9 @@ <executions> <execution> <id>copy</id> - <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-math-scala_${scala.compat.version}-${version}.jar" tofile="../mahout-math-scala_${scala.compat.version}-${version}.jar" /> + <copy file="target/mahout-math-scala_${scala.compat.version}-${project.version}.jar" tofile="../mahout-math-scala_${scala.compat.version}-${project.version}.jar" /> </tasks> </configuration> <goals> @@ -240,5 +239,24 @@ </plugins> </build> </profile> + <profile> + <id>all-scala</id> + <modules> + <module>scala-2.10</module> + <module>scala-2.11</module> + </modules> + </profile> + <profile> + <id>scala-2.10</id> + <modules> + <module>scala-2.10</module> + </modules> + </profile> + <profile> + <id>scala-2.11</id> + <modules> + <module>scala-2.11</module> + </modules> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/math-scala/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/scala-2.10/pom.xml b/math-scala/scala-2.10/pom.xml new file mode 100644 index 0000000..8a46eed --- /dev/null +++ b/math-scala/scala-2.10/pom.xml @@ -0,0 +1,55 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-math-scala</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-math-scala_2.10</artifactId> + <name>Mahout Math Scala 2.10 bindings</name> + + + <properties> + <scala.compat.version>2.10</scala.compat.version> + <scala.version>2.10.4</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main/scala</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/math-scala/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/scala-2.11/pom.xml b/math-scala/scala-2.11/pom.xml new file mode 100644 index 0000000..8d4840d --- /dev/null +++ b/math-scala/scala-2.11/pom.xml @@ -0,0 +1,55 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-math-scala</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-math-scala_2.11</artifactId> + <name>Mahout Math Scala 2.11 bindings</name> + + + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main/scala</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 03a104e..0ba87cd 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -23,22 +23,21 @@ <parent> <groupId>org.apache.mahout</groupId> <artifactId>mahout</artifactId> - <version>0.13.2-SNAPSHOT</version> + <version>0.13.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <artifactId>mahout-spark</artifactId> <name>Mahout Spark bindings</name> <description> Mahout Bindings for Apache Spark </description> - <packaging>jar</packaging> + <packaging>pom</packaging> <build> <plugins> - <plugin> <artifactId>maven-javadoc-plugin</artifactId> </plugin> @@ -107,39 +106,20 @@ <executions> <execution> <id>dependency-reduced</id> - <phase>package</phase> + <!--<phase>package</phase>--> <goals> <goal>single</goal> </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/dependency-reduced.xml</descriptor> + <descriptor>../src/main/assembly/dependency-reduced.xml</descriptor> </descriptors> </configuration> </execution> </executions> </plugin> - <!-- copy jars to top directory, which is MAHOUT_HOME --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <configuration> - <tasks> - <copy file="target/mahout-spark_${scala.compat.version}-${version}-spark_${spark.compat.version}.jar" tofile="../mahout-spark_${scala.compat.version}-${version}spark_${spark.compat.version}.jar" /> - <copy file="target/mahout-spark_${scala.compat.version}-${version}-dependency-reduced.jar" tofile="../mahout-spark_${scala.compat.version}-${version}-dependency-reduced.jar" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> + <!-- create test jar so other modules can reuse the math test utility classes. DO NOT REMOVE! Testing framework is useful in subordinate/contrib projects! Please contact @dlyubimov. @@ -161,7 +141,7 @@ <goal>jar</goal> </goals> <configuration> - <classifier>spark_${spark.compat.version}</classifier> + <!--<classifier>spark_${spark.compat.version}</classifier>--> </configuration> </execution> </executions> @@ -182,6 +162,30 @@ </filesets> </configuration> </plugin> + <!-- copy jars to top directory, which is MAHOUT_HOME --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <id>copy</id> + <!--<phase>package</phase>--> + <configuration> + <tasks> + <copy todir="../../"> + <fileset dir="target"> + <include name="*.jar"/> + <exclude name="*tests.jar"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -264,8 +268,50 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + <phase>package</phase> + </execution> + <execution> + <id>default-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>spark_${spark.compat.version}</classifier> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> + <profile> + <id>all-spark</id> + <modules> + <module>spark-1.6</module> + <module>spark-2.0</module> + <module>spark-2.1</module> + </modules> + </profile> + <profile> + <id>spark-1.6</id> + <modules><module>spark-1.6</module></modules> + </profile> + <profile> + <id>spark-2.0</id> + <modules><module>spark-2.0</module></modules> + </profile> + <profile> + <id>spark-2.1</id> + <modules><module>spark-2.1</module></modules> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/spark/spark-1.6/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-1.6/pom.xml b/spark/spark-1.6/pom.xml new file mode 100644 index 0000000..4dc7fcb --- /dev/null +++ b/spark/spark-1.6/pom.xml @@ -0,0 +1,69 @@ +<?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/maven-v4_0_0.xsd";> +<modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-spark</artifactId> + <version>0.13.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-spark_1.6_${scala.compat.version}</artifactId> + <name>Mahout Spark-1.6 Bindings</name> + <description> + Mahout Bindings for Apache Spark version 1.6 + </description> + + <packaging>jar</packaging> + + <properties> + <scala.compat.version>2.10</scala.compat.version> + <scala.version>2.10.4</scala.version> + <spark.compat.version>1.6</spark.compat.version> + <spark.version>1.6.3</spark.version> + </properties> + + <build> + <sourceDirectory>../src/main/scala</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>dependency-reduced</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/spark/spark-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.0/pom.xml b/spark/spark-2.0/pom.xml new file mode 100644 index 0000000..1e10426 --- /dev/null +++ b/spark/spark-2.0/pom.xml @@ -0,0 +1,69 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-spark</artifactId> + <version>0.13.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-spark_2.0_${scala.compat.version}</artifactId> + <name>Mahout Spark-2.0 Bindings</name> + <description> + Mahout Bindings for Apache Spark + </description> + + <packaging>jar</packaging> + + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + <spark.compat.version>2.0</spark.compat.version> + <spark.version>2.0.2</spark.version> + </properties> + + <build> + <sourceDirectory>../src/main/scala</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>dependency-reduced</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/spark/spark-2.1/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.1/pom.xml b/spark/spark-2.1/pom.xml new file mode 100644 index 0000000..1de20ca --- /dev/null +++ b/spark/spark-2.1/pom.xml @@ -0,0 +1,69 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-spark</artifactId> + <version>0.13.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-spark_2.1_${scala.compat.version}</artifactId> + <name>Mahout Spark-2.1 Bindings</name> + <description> + Mahout Bindings for Apache Spark + </description> + + <packaging>jar</packaging> + + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + <spark.compat.version>2.1</spark.compat.version> + <spark.version>2.1.1</spark.version> + </properties> + + <build> + <sourceDirectory>../src/main/scala</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>dependency-reduced</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/viennacl-omp/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/pom.xml b/viennacl-omp/pom.xml index 3b6113f..756dab6 100644 --- a/viennacl-omp/pom.xml +++ b/viennacl-omp/pom.xml @@ -27,13 +27,13 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-native-viennacl-omp_${scala.compat.version}</artifactId> + <artifactId>mahout-native-viennacl-omp</artifactId> <name>Mahout Native VienniaCL OpenMP Bindings</name> <description>Native Structures and interfaces to be used from Mahout math-scala. </description> - <packaging>jar</packaging> + <packaging>pom</packaging> <build> <plugins> @@ -189,7 +189,7 @@ <executions> <execution> <id>copy</id> - <phase>package</phase> + <!--<phase>package</phase>--> <configuration> <tasks> <copy file="target/mahout-native-viennacl-omp_${scala.compat.version}-${version}.jar" tofile="../mahout-native-viennacl-omp_${scala.compat.version}-${version}.jar" /> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/viennacl-omp/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/pom.xml b/viennacl-omp/scala-2.10/pom.xml new file mode 100644 index 0000000..f78cfc1 --- /dev/null +++ b/viennacl-omp/scala-2.10/pom.xml @@ -0,0 +1,68 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-native-viennacl-omp</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-native-viennacl-omp_2.10</artifactId> + <name>Mahout Native VienniaCL OpenCL OpenMP Bindings for Scala 2.10</name> + + + <properties> + <scala.compat.version>2.10</scala.compat.version> + <scala.version>2.10.4</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main</sourceDirectory> + + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <!-- disable javacpp recompile, its wasteful and causes issues --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>javacpp</id> + <phase/> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/viennacl-omp/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/pom.xml b/viennacl-omp/scala-2.11/pom.xml new file mode 100644 index 0000000..739132e --- /dev/null +++ b/viennacl-omp/scala-2.11/pom.xml @@ -0,0 +1,67 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-native-viennacl-omp</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-native-viennacl-omp_2.11</artifactId> + <name>Mahout Native VienniaCL OpenCL OpenMP Bindings for Scala 2.11</name> + + + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main</sourceDirectory> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <!-- disable javacpp recompile, its wasteful and causes issues --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>javacpp</id> + <phase/> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/viennacl/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl/pom.xml b/viennacl/pom.xml index 2adb8e6..d099365 100644 --- a/viennacl/pom.xml +++ b/viennacl/pom.xml @@ -27,13 +27,15 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>mahout-native-viennacl_${scala.compat.version}</artifactId> + + <artifactId>mahout-native-viennacl</artifactId> <name>Mahout Native VienniaCL OpenCL Bindings</name> <description>Native Structures and interfaces to be used from Mahout math-scala. </description> - <packaging>jar</packaging> + + <packaging>pom</packaging> <build> <plugins> @@ -177,11 +179,11 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - </plugin> + <!--<plugin>--> + <!--<groupId>org.codehaus.mojo</groupId>--> + <!--<artifactId>exec-maven-plugin</artifactId>--> + <!--<version>1.2.1</version>--> + <!--</plugin>--> <!-- copy jars to top directory, which is MAHOUT_HOME --> <plugin> @@ -193,7 +195,7 @@ <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-native-viennacl_${scala.compat.version}-${version}.jar" tofile="../mahout-native-viennacl_${scala.compat.version}-${version}.jar" /> + <copy file="target/mahout-native-viennacl_${scala.compat.version}-${project.version}.jar" tofile="../mahout-native-viennacl_${scala.compat.version}-${project.version}.jar" /> </tasks> </configuration> <goals> @@ -301,5 +303,12 @@ </plugins> </build> </profile> + <profile> + <id>all-scala</id> + <modules> + <module>scala-2.10</module> + <module>scala-2.11</module> + </modules> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/viennacl/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl/scala-2.10/pom.xml b/viennacl/scala-2.10/pom.xml new file mode 100644 index 0000000..61a9ffb --- /dev/null +++ b/viennacl/scala-2.10/pom.xml @@ -0,0 +1,68 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-native-viennacl</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-native-viennacl_2.10</artifactId> + <name>Mahout Native VienniaCL OpenCL Bindings for Scala 2.10 bindings</name> + + + <properties> + <scala.compat.version>2.10</scala.compat.version> + <scala.version>2.10.4</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/</sourceDirectory> + + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <!-- disable javacpp recompile, its wasteful and causes issues --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>javacpp</id> + <phase/> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/72dfcee8/viennacl/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl/scala-2.11/pom.xml b/viennacl/scala-2.11/pom.xml new file mode 100644 index 0000000..b874e22 --- /dev/null +++ b/viennacl/scala-2.11/pom.xml @@ -0,0 +1,67 @@ +<?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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-native-viennacl</artifactId> + <version>0.13.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>mahout-native-viennacl_2.11</artifactId> + <name>Mahout Native VienniaCL OpenCL Bindings for Scala 2.11 bindings</name> + + + <properties> + <scala.compat.version>2.11</scala.compat.version> + <scala.version>2.11.8</scala.version> + </properties> + + <packaging>jar</packaging> + + <build> + <sourceDirectory>../src/main</sourceDirectory> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + <!-- disable javacpp recompile, its wasteful and causes issues --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>javacpp</id> + <phase/> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file
