Revert "Fixing conflicts'" This reverts commit df08a37c4112cbe1161f5c20f985e9c1c9abff42, reversing changes made to ca8b4935c4014397ee4ffc7cd7964dce0979cdf6.
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/2f55adef Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/2f55adef Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/2f55adef Branch: refs/heads/master Commit: 2f55adeffebef2fdd1295deb1c44489d33b0b495 Parents: df08a37 Author: Andrew Musselman <[email protected]> Authored: Sun Dec 17 21:16:46 2017 -0800 Committer: Andrew Musselman <[email protected]> Committed: Sun Dec 17 21:16:46 2017 -0800 ---------------------------------------------------------------------- distribution/pom.xml | 9 +- .../src/main/assembly/scala-2.10_spark-1.6.xml | 8 +- .../src/main/assembly/scala-2.11_spark-2.0.xml | 8 +- .../src/main/assembly/scala-2.11_spark-2.1.xml | 8 +- h2o/pom.xml | 29 +- h2o/scala-2.10/pom.xml | 66 --- h2o/scala-2.11/pom.xml | 66 --- math-scala/pom.xml | 48 +- math-scala/scala-2.10/pom.xml | 69 --- math-scala/scala-2.11/pom.xml | 88 ---- pom.xml | 8 +- spark/pom.xml | 76 +--- spark/spark-1.6/pom.xml | 70 --- spark/spark-2.0/pom.xml | 70 --- spark/spark-2.1/pom.xml | 70 --- viennacl-omp/linux-haswell.properties | 28 ++ viennacl-omp/linux-x86_64-viennacl.properties | 24 + viennacl-omp/pom.xml | 245 +++++++++- .../scala-2.10/linux-haswell.properties | 28 -- .../scala-2.10/linux-x86_64-viennacl.properties | 24 - viennacl-omp/scala-2.10/pom.xml | 320 ------------- viennacl-omp/scala-2.10/runs | 32 -- .../viennacl/openmp/javacpp/Functions.java | 103 ----- .../openmp/javacpp/LinalgFunctions.java | 86 ---- .../openmp/javacpp/MatrixTransExpression.scala | 34 -- .../apache/mahout/viennacl/openmp/OMPMMul.scala | 449 ------------------- .../openmp/javacpp/CompressedMatrix.scala | 135 ------ .../viennacl/openmp/javacpp/Context.scala | 58 --- .../openmp/javacpp/DenseColumnMatrix.scala | 95 ---- .../openmp/javacpp/DenseRowMatrix.scala | 81 ---- .../openmp/javacpp/MatMatProdExpression.scala | 33 -- .../openmp/javacpp/MatVecProdExpression.scala | 33 -- .../viennacl/openmp/javacpp/MatrixBase.scala | 75 ---- .../viennacl/openmp/javacpp/MemHandle.scala | 34 -- .../openmp/javacpp/ProdExpression.scala | 33 -- .../javacpp/SrMatDnMatProdExpression.scala | 33 -- .../viennacl/openmp/javacpp/VCLVector.scala | 124 ----- .../openmp/javacpp/VecMultExpression.scala | 32 -- .../viennacl/openmp/javacpp/VectorBase.scala | 55 --- .../apache/mahout/viennacl/openmp/package.scala | 434 ------------------ .../mahout/viennacl/omp/ViennaCLSuiteOMP.scala | 249 ---------- .../scala-2.11/linux-haswell.properties | 28 -- .../scala-2.11/linux-x86_64-viennacl.properties | 24 - viennacl-omp/scala-2.11/pom.xml | 320 ------------- viennacl-omp/scala-2.11/runs | 32 -- .../viennacl/openmp/javacpp/Functions.java | 103 ----- .../openmp/javacpp/LinalgFunctions.java | 86 ---- .../openmp/javacpp/MatrixTransExpression.scala | 34 -- .../apache/mahout/viennacl/openmp/OMPMMul.scala | 449 ------------------- .../openmp/javacpp/CompressedMatrix.scala | 135 ------ .../viennacl/openmp/javacpp/Context.scala | 58 --- .../openmp/javacpp/DenseColumnMatrix.scala | 95 ---- .../openmp/javacpp/DenseRowMatrix.scala | 81 ---- .../openmp/javacpp/MatMatProdExpression.scala | 33 -- .../openmp/javacpp/MatVecProdExpression.scala | 33 -- .../viennacl/openmp/javacpp/MatrixBase.scala | 75 ---- .../viennacl/openmp/javacpp/MemHandle.scala | 34 -- .../openmp/javacpp/ProdExpression.scala | 33 -- .../javacpp/SrMatDnMatProdExpression.scala | 33 -- .../viennacl/openmp/javacpp/VCLVector.scala | 124 ----- .../openmp/javacpp/VecMultExpression.scala | 32 -- .../viennacl/openmp/javacpp/VectorBase.scala | 55 --- .../apache/mahout/viennacl/openmp/package.scala | 434 ------------------ .../mahout/viennacl/omp/ViennaCLSuiteOMP.scala | 249 ---------- .../viennacl/openmp/javacpp/Functions.java | 103 +++++ .../openmp/javacpp/LinalgFunctions.java | 86 ++++ .../openmp/javacpp/MatrixTransExpression.scala | 34 ++ .../apache/mahout/viennacl/openmp/OMPMMul.scala | 449 +++++++++++++++++++ .../openmp/javacpp/CompressedMatrix.scala | 135 ++++++ .../viennacl/openmp/javacpp/Context.scala | 58 +++ .../openmp/javacpp/DenseColumnMatrix.scala | 95 ++++ .../openmp/javacpp/DenseRowMatrix.scala | 81 ++++ .../openmp/javacpp/MatMatProdExpression.scala | 33 ++ .../openmp/javacpp/MatVecProdExpression.scala | 33 ++ .../viennacl/openmp/javacpp/MatrixBase.scala | 75 ++++ .../viennacl/openmp/javacpp/MemHandle.scala | 34 ++ .../openmp/javacpp/ProdExpression.scala | 33 ++ .../javacpp/SrMatDnMatProdExpression.scala | 33 ++ .../viennacl/openmp/javacpp/VCLVector.scala | 124 +++++ .../openmp/javacpp/VecMultExpression.scala | 32 ++ .../viennacl/openmp/javacpp/VectorBase.scala | 55 +++ .../apache/mahout/viennacl/openmp/package.scala | 434 ++++++++++++++++++ .../mahout/viennacl/omp/ViennaCLSuiteOMP.scala | 249 ++++++++++ viennacl/linux-haswell.properties | 28 ++ viennacl/linux-x86_64-viennacl.properties | 24 + viennacl/pom.xml | 237 +++++++++- viennacl/scala-2.10/linux-haswell.properties | 28 -- .../scala-2.10/linux-x86_64-viennacl.properties | 24 - viennacl/scala-2.10/pom.xml | 310 ------------- .../viennacl/opencl/javacpp/Functions.java | 104 ----- .../opencl/javacpp/LinalgFunctions.java | 86 ---- .../opencl/javacpp/MatrixTransExpression.scala | 34 -- .../apache/mahout/viennacl/opencl/GPUMMul.scala | 444 ------------------ .../opencl/javacpp/CompressedMatrix.scala | 135 ------ .../viennacl/opencl/javacpp/Context.scala | 73 --- .../opencl/javacpp/DenseColumnMatrix.scala | 95 ---- .../opencl/javacpp/DenseRowMatrix.scala | 98 ---- .../opencl/javacpp/MatMatProdExpression.scala | 33 -- .../opencl/javacpp/MatVecProdExpression.scala | 33 -- .../viennacl/opencl/javacpp/MatrixBase.scala | 75 ---- .../viennacl/opencl/javacpp/MemHandle.scala | 48 -- .../opencl/javacpp/ProdExpression.scala | 33 -- .../javacpp/SrMatDnMatProdExpression.scala | 33 -- .../viennacl/opencl/javacpp/VCLVector.scala | 144 ------ .../opencl/javacpp/VecMultExpression.scala | 32 -- .../viennacl/opencl/javacpp/VectorBase.scala | 58 --- .../apache/mahout/viennacl/opencl/package.scala | 434 ------------------ .../viennacl/opencl/ViennaCLSuiteVCL.scala | 441 ------------------ viennacl/scala-2.11/linux-haswell.properties | 28 -- .../scala-2.11/linux-x86_64-viennacl.properties | 24 - viennacl/scala-2.11/pom.xml | 311 ------------- .../viennacl/opencl/javacpp/Functions.java | 104 ----- .../opencl/javacpp/LinalgFunctions.java | 86 ---- .../opencl/javacpp/MatrixTransExpression.scala | 34 -- .../apache/mahout/viennacl/opencl/GPUMMul.scala | 444 ------------------ .../opencl/javacpp/CompressedMatrix.scala | 135 ------ .../viennacl/opencl/javacpp/Context.scala | 73 --- .../opencl/javacpp/DenseColumnMatrix.scala | 95 ---- .../opencl/javacpp/DenseRowMatrix.scala | 98 ---- .../opencl/javacpp/MatMatProdExpression.scala | 33 -- .../opencl/javacpp/MatVecProdExpression.scala | 33 -- .../viennacl/opencl/javacpp/MatrixBase.scala | 75 ---- .../viennacl/opencl/javacpp/MemHandle.scala | 48 -- .../opencl/javacpp/ProdExpression.scala | 33 -- .../javacpp/SrMatDnMatProdExpression.scala | 33 -- .../viennacl/opencl/javacpp/VCLVector.scala | 144 ------ .../opencl/javacpp/VecMultExpression.scala | 32 -- .../viennacl/opencl/javacpp/VectorBase.scala | 58 --- .../apache/mahout/viennacl/opencl/package.scala | 434 ------------------ .../viennacl/opencl/ViennaCLSuiteVCL.scala | 441 ------------------ .../viennacl/opencl/javacpp/Functions.java | 104 +++++ .../opencl/javacpp/LinalgFunctions.java | 86 ++++ .../opencl/javacpp/MatrixTransExpression.scala | 34 ++ .../apache/mahout/viennacl/opencl/GPUMMul.scala | 444 ++++++++++++++++++ .../opencl/javacpp/CompressedMatrix.scala | 135 ++++++ .../viennacl/opencl/javacpp/Context.scala | 73 +++ .../opencl/javacpp/DenseColumnMatrix.scala | 95 ++++ .../opencl/javacpp/DenseRowMatrix.scala | 98 ++++ .../opencl/javacpp/MatMatProdExpression.scala | 33 ++ .../opencl/javacpp/MatVecProdExpression.scala | 33 ++ .../viennacl/opencl/javacpp/MatrixBase.scala | 75 ++++ .../viennacl/opencl/javacpp/MemHandle.scala | 48 ++ .../opencl/javacpp/ProdExpression.scala | 33 ++ .../javacpp/SrMatDnMatProdExpression.scala | 33 ++ .../viennacl/opencl/javacpp/VCLVector.scala | 144 ++++++ .../opencl/javacpp/VecMultExpression.scala | 32 ++ .../viennacl/opencl/javacpp/VectorBase.scala | 58 +++ .../apache/mahout/viennacl/opencl/package.scala | 434 ++++++++++++++++++ .../viennacl/opencl/ViennaCLSuiteVCL.scala | 441 ++++++++++++++++++ 149 files changed, 5190 insertions(+), 11449 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 9291583..c7a3fc5 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -253,7 +253,8 @@ </dependency> <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-spark_${spark.compat.version}_${scala.compat.version}</artifactId> + <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <classifier>spark_${spark.compat.version}</classifier> <version>${project.version}</version> </dependency> <dependency> @@ -325,7 +326,8 @@ </dependency> <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-spark_${spark.compat.version}_${scala.compat.version}</artifactId> + <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <classifier>spark_${spark.compat.version}</classifier> <version>${project.version}</version> </dependency> <dependency> @@ -393,7 +395,8 @@ </dependency> <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-spark_${spark.compat.version}_${scala.compat.version}</artifactId> + <artifactId>mahout-spark_${scala.compat.version}</artifactId> + <classifier>spark_${spark.compat.version}</classifier> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/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 02fb0cf..2cc2095 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 @@ -116,7 +116,7 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../math-scala/scala-2.10/target</directory> + <directory>${project.basedir}/../math-scala/target</directory> <includes> <include>mahout-*2.10*.jar</include> </includes> @@ -128,10 +128,10 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../spark/spark-1.6/target</directory> + <directory>${project.basedir}/../spark/target</directory> <includes> - <include>mahout-*1.6-2.10*.jar</include> - <include>mahout-*1.6-2.10*dependency-reduced.jar</include> + <include>mahout-*2.10*.jar</include> + <include>mahout-*2.10*dependency-reduced.jar</include> </includes> <excludes> <exclude>*sources.jar</exclude> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/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 2a7cc68..5c6b646 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 @@ -116,7 +116,7 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../math-scala/scala-2.11/target</directory> + <directory>${project.basedir}/../math-scala/target</directory> <includes> <include>mahout-*2.11*.jar</include> </includes> @@ -128,10 +128,10 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../spark/spark-2.0/target</directory> + <directory>${project.basedir}/../spark/target</directory> <includes> - <include>mahout-*2.0-2.11*spark.jar</include> - <include>mahout-*2.0-2.11*dependency-reduced.jar</include> + <include>mahout-*2.11*spark_2.0.jar</include> + <include>mahout-*2.11*dependency-reduced.jar</include> </includes> <excludes> <exclude>*sources.jar</exclude> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/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 a791763..7c614ec 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 @@ -116,7 +116,7 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../math-scala/scala-2.11/target</directory> + <directory>${project.basedir}/../math-scala/target</directory> <includes> <include>mahout-*2.11*.jar</include> </includes> @@ -128,10 +128,10 @@ <outputDirectory/> </fileSet> <fileSet> - <directory>${project.basedir}/../spark/spark-2.1/target</directory> + <directory>${project.basedir}/../spark/target</directory> <includes> - <include>mahout-*2.1-2.11*spark.jar</include> - <include>mahout-*2.1-2.11*dependency-reduced.jar</include> + <include>mahout-*2.11*spark_2.1.jar</include> + <include>mahout-*2.11*dependency-reduced.jar</include> </includes> <excludes> <exclude>*sources.jar</exclude> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/h2o/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/pom.xml b/h2o/pom.xml index f47e91d..d911f5b 100644 --- a/h2o/pom.xml +++ b/h2o/pom.xml @@ -33,7 +33,7 @@ H2O Backend for Mahout DSL </description> - <packaging>pom</packaging> + <packaging>jar</packaging> @@ -47,10 +47,10 @@ <executions> <execution> <id>copy</id> - <!--<phase>package</phase>--> + <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-h2o_${scala.compat.version}-${project.version}.jar" tofile="../mahout-h2o_${scala.compat.version}-${project.version}.jar" /> + <copy file="target/mahout-h2o_${scala.compat.version}-${version}.jar" tofile="../mahout-h2o_${scala.compat.version}-${version}.jar" /> </tasks> </configuration> <goals> @@ -65,13 +65,13 @@ <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> @@ -239,24 +239,5 @@ </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/2f55adef/h2o/scala-2.10/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/scala-2.10/pom.xml b/h2o/scala-2.10/pom.xml deleted file mode 100644 index 24d79f1..0000000 --- a/h2o/scala-2.10/pom.xml +++ /dev/null @@ -1,66 +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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mahout</groupId> - <artifactId>mahout-h2o</artifactId> - <version>0.13.1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>mahout-h2o_2.10</artifactId> - <name>Mahout H2O Scala 2.10 backend</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> - <testSourceDirectory>../src/test</testSourceDirectory> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>dependency-reduced</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/2f55adef/h2o/scala-2.11/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/scala-2.11/pom.xml b/h2o/scala-2.11/pom.xml deleted file mode 100644 index 4bf1fe5..0000000 --- a/h2o/scala-2.11/pom.xml +++ /dev/null @@ -1,66 +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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mahout</groupId> - <artifactId>mahout-h2o</artifactId> - <version>0.13.1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>mahout-h2o_2.11</artifactId> - <name>Mahout H2O Scala 2.10 backend</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> - <testSourceDirectory>../src/test</testSourceDirectory> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>dependency-reduced</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/2f55adef/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 42a264c..0d74e32 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -34,7 +34,7 @@ Colt Java API </description> - <packaging>pom</packaging> + <packaging>jar</packaging> <build> @@ -45,11 +45,10 @@ <artifactId>maven-jar-plugin</artifactId> <executions> <execution> - <id>test-jar</id> <goals> <goal>test-jar</goal> </goals> - <!--<phase>package</phase>--> + <phase>package</phase> </execution> </executions> </plugin> @@ -68,21 +67,21 @@ <executions> <execution> <id>add-scala-sources</id> - <!--<phase>initialize</phase>--> + <phase>initialize</phase> <goals> <goal>add-source</goal> </goals> </execution> <execution> <id>scala-compile</id> - <!--<phase>process-resources</phase>--> + <phase>process-resources</phase> <goals> <goal>compile</goal> </goals> </execution> <execution> <id>scala-test-compile</id> - <!--<phase>process-test-resources</phase>--> + <phase>process-test-resources</phase> <goals> <goal>testCompile</goal> </goals> @@ -96,9 +95,10 @@ <executions> <execution> <id>copy</id> + <phase>package</phase> <configuration> <tasks> - <copy file="target/mahout-math-scala_${scala.compat.version}-${project.version}.jar" tofile="../../mahout-math-scala_${scala.compat.version}-${project.version}.jar" /> + <copy file="target/mahout-math-scala_${scala.compat.version}-${version}.jar" tofile="../mahout-math-scala_${scala.compat.version}-${version}.jar" /> </tasks> </configuration> <goals> @@ -133,7 +133,6 @@ </execution> </executions> </plugin> - <!-- remove jars from top directory on clean --> <plugin> <artifactId>maven-clean-plugin</artifactId> @@ -183,8 +182,6 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.compat.version}</artifactId> - <version>3.0.3</version> - <scope>test</scope> </dependency> <dependency> @@ -243,36 +240,5 @@ </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> - <activation> - <property> - <name>scala.compat.version</name> - <value>2.10</value> - </property> - </activation> - <modules> - <module>scala-2.10</module> - </modules> - </profile> - <profile> - <id>scala-2.11</id> - <activation> - <property> - <name>scala.compat.version</name> - <value>2.11</value> - </property> - </activation> - <modules> - <module>scala-2.11</module> - </modules> - </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/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 deleted file mode 100644 index 15a02c6..0000000 --- a/math-scala/scala-2.10/pom.xml +++ /dev/null @@ -1,69 +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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala</artifactId> - <version>0.13.1-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</sourceDirectory> - <testSourceDirectory>../src/test</testSourceDirectory> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>test-jar</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/2f55adef/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 deleted file mode 100644 index 0b605de..0000000 --- a/math-scala/scala-2.11/pom.xml +++ /dev/null @@ -1,88 +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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala</artifactId> - <version>0.13.1-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</sourceDirectory> - <testSourceDirectory>../src/test</testSourceDirectory> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>add-scala-sources</id> - <phase>initialize</phase> - </execution> - <execution> - <id>scala-compile</id> - <phase>process-resources</phase> - </execution> - <execution> - <id>scala-test-compile</id> - <phase>process-test-resources</phase> - </execution> - </executions> - </plugin> - - </plugins> - </build> - - - -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 585b96b..a8a29ff 100644 --- a/pom.xml +++ b/pom.xml @@ -840,12 +840,12 @@ <module>math</module> <module>hdfs</module> <module>mr</module> + <module>integration</module> <module>examples</module> + <module>math-scala</module> <module>spark</module> <module>h2o</module> - <module>integration</module> - <module>distribution</module> </modules> <profiles> @@ -968,8 +968,6 @@ <properties> <spark.version>2.0.2</spark.version> <spark.compat.version>2.0</spark.compat.version> - <scala.compat.version>2.11</scala.compat.version> - <scala.version>2.11.8</scala.version> </properties> </profile> <profile> @@ -980,8 +978,6 @@ <properties> <spark.version>2.1.0</spark.version> <spark.compat.version>2.1</spark.compat.version> - <scala.compat.version>2.11</scala.compat.version> - <scala.version>2.11.8</scala.version> </properties> </profile> <profile> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index d4aa9cd..eba7ee8 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -33,11 +33,12 @@ Mahout Bindings for Apache Spark </description> - <packaging>pom</packaging> + <packaging>jar</packaging> <build> <plugins> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> </plugin> @@ -106,13 +107,13 @@ <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> @@ -160,7 +161,7 @@ <goal>jar</goal> </goals> <configuration> - <!--<classifier>spark_${spark.compat.version}</classifier>--> + <classifier>spark_${spark.compat.version}</classifier> </configuration> </execution> </executions> @@ -181,30 +182,6 @@ </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> @@ -260,7 +237,6 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.compat.version}</artifactId> - <version>3.0.3</version> </dependency> </dependencies> @@ -288,50 +264,8 @@ </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/2f55adef/spark/spark-1.6/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-1.6/pom.xml b/spark/spark-1.6/pom.xml deleted file mode 100644 index 084e456..0000000 --- a/spark/spark-1.6/pom.xml +++ /dev/null @@ -1,70 +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/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</sourceDirectory> - <testSourceDirectory>../src/test</testSourceDirectory> - <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/2f55adef/spark/spark-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.0/pom.xml b/spark/spark-2.0/pom.xml deleted file mode 100644 index 2be45a1..0000000 --- a/spark/spark-2.0/pom.xml +++ /dev/null @@ -1,70 +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/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</sourceDirectory> - <testSourceDirectory>../src/test</testSourceDirectory> - <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/2f55adef/spark/spark-2.1/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.1/pom.xml b/spark/spark-2.1/pom.xml deleted file mode 100644 index 382cb03..0000000 --- a/spark/spark-2.1/pom.xml +++ /dev/null @@ -1,70 +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/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</sourceDirectory> - <testSourceDirectory>../src/test</testSourceDirectory> - <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/2f55adef/viennacl-omp/linux-haswell.properties ---------------------------------------------------------------------- diff --git a/viennacl-omp/linux-haswell.properties b/viennacl-omp/linux-haswell.properties new file mode 100644 index 0000000..3ee4494 --- /dev/null +++ b/viennacl-omp/linux-haswell.properties @@ -0,0 +1,28 @@ +platform=linux-x86_64 +platform.path.separator=: +platform.source.suffix=.cpp +platform.includepath.prefix=-I +platform.includepath= +platform.compiler=g++ +platform.compiler.cpp11=-std=c++11 +platform.compiler.default= +platform.compiler.fastfpu=-msse3 -ffast-math +platform.compiler.viennacl=-fopenmp -fpermissive +platform.compiler.nodeprecated=-Wno-deprecated-declarations +#build for haswell arch with for GCC >= 4.9.0 +platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=haswell -m64 -Wall -O3 -fPIC -shared -s -o\u0020 +#for GCC < 4.9.0 use -march=core-avx2 for haswell arch +#platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=core-avx2 -m64 -Wall -Ofast -fPIC -shared -s -o\u0020 +#build for native: +#platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=native -m64 -Wall -Ofast -fPIC -shared -s -o\u0020 +platform.linkpath.prefix=-L +platform.linkpath.prefix2=-Wl,-rpath, +platform.linkpath= +platform.link.prefix=-l +platform.link.suffix= +platform.link= +platform.framework.prefix=-F +platform.framework.suffix= +platform.framework= +platform.library.prefix=lib +platform.library.suffix=.so http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/linux-x86_64-viennacl.properties ---------------------------------------------------------------------- diff --git a/viennacl-omp/linux-x86_64-viennacl.properties b/viennacl-omp/linux-x86_64-viennacl.properties new file mode 100644 index 0000000..e5de1fa --- /dev/null +++ b/viennacl-omp/linux-x86_64-viennacl.properties @@ -0,0 +1,24 @@ +platform=linux-x86_64 +platform.path.separator=: +platform.source.suffix=.cpp +platform.includepath.prefix=-I +platform.includepath= +platform.compiler=g++ +platform.compiler.cpp11=-std=c++11 +platform.compiler.default= +platform.compiler.fastfpu=-msse3 -ffast-math +platform.compiler.viennacl=-fopenmp -fpermissive +platform.compiler.nodeprecated=-Wno-deprecated-declarations +# platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=x86-64 -m64 -Wall -O3 -fPIC -shared -s -o\u0020 +platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=native -m64 -Wall -Ofast -fPIC -shared -s -o\u0020 +platform.linkpath.prefix=-L +platform.linkpath.prefix2=-Wl,-rpath, +platform.linkpath= +platform.link.prefix=-l +platform.link.suffix= +platform.link= +platform.framework.prefix=-F +platform.framework.suffix= +platform.framework= +platform.library.prefix=lib +platform.library.suffix=.so http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/pom.xml ---------------------------------------------------------------------- diff --git a/viennacl-omp/pom.xml b/viennacl-omp/pom.xml index a8ea98f..4f66cb9 100644 --- a/viennacl-omp/pom.xml +++ b/viennacl-omp/pom.xml @@ -33,7 +33,230 @@ <description>Native Structures and interfaces to be used from Mahout math-scala. </description> - <packaging>pom</packaging> + <packaging>jar</packaging> + + <build> + <plugins> + <!-- create test jar so other modules can reuse the native test utility classes. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + <plugin> + <artifactId>maven-source-plugin</artifactId> + </plugin> + + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <executions> + <execution> + <id>add-scala-sources</id> + <phase>initialize</phase> + <goals> + <goal>add-source</goal> + </goals> + </execution> + <execution> + <id>scala-compile</id> + <phase>process-resources</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + <execution> + <id>scala-test-compile</id> + <phase>process-test-resources</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + + <!--this is what scalatest recommends to do to enable scala tests --> + + <!-- disable surefire --> + <!-- disable surefire --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + <!-- enable scalatest --> + <plugin> + <groupId>org.scalatest</groupId> + <artifactId>scalatest-maven-plugin</artifactId> + <executions> + <execution> + <id>test</id> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + <configuration> + <argLine>-Xmx4g</argLine> + </configuration> + </plugin> + + + <!--JavaCPP native build plugin--> + <!-- old-style way to get it to compile. --> + <!--based on https://github.com/bytedeco/javacpp/wiki/Maven--> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + <executions> + <execution> + <id>javacpp</id> + <phase>process-classes</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <environmentVariables> + <LD_LIBRARY_PATH>{project.basedir}/target/classes/org/apache/mahout/javacpp/linalg/linux-x86_64/ + </LD_LIBRARY_PATH> + </environmentVariables> + <executable>java</executable> + <arguments> + <argument>-jar</argument> + <argument>${org.bytedeco:javacpp:jar}</argument> + <argument>-propertyfile</argument> + <argument>linux-x86_64-viennacl.properties</argument> + <argument>-classpath</argument> + <argument>${project.build.outputDirectory}:${org.scala-lang:scala-library:jar}</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.CompressedMatrix</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.Context</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.MatrixBase</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.DenseRowMatrix</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.DenseColumnMatrix</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.MatMatProdExpression</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.ProdExpression</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.MatrixTransExpression</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.LinalgFunctions</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.Functions</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.VectorBase</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.VCLVector</argument> + <argument>org.apache.mahout.viennacl.openmp.javacpp.VecMultExpression</argument> + <argument>org.apache.mahout.viennacl.openmp.OMPMMul</argument> + <argument>org.apache.mahout.viennacl.openmp.OMPMMul$</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.3</version> + <executions> + <execution> + <goals> + <goal>properties</goal> + </goals> + </execution> + </executions> + </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> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <id>copy</id> + <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" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- delete jars on claen in top directory, which is MAHOUT_HOME --> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <filesets> + <fileset> + <directory>../</directory> + <includes> + <include>mahout-native-viennacl-omp*.jar</include> + </includes> + <followSymlinks>false</followSymlinks> + </fileset> + </filesets> + </configuration> + </plugin> + </plugins> + + + + </build> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>mahout-math-scala_${scala.compat.version}</artifactId> + </dependency> + + <!-- 3rd-party --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <!-- scala stuff --> + <dependency> + <groupId>org.scalatest</groupId> + <artifactId>scalatest_${scala.compat.version}</artifactId> + </dependency> + + <!-- scala-library for annotations at compile time--> + <!--<dependency>--> + <!--<groupId>org.scala-lang</groupId>--> + <!--<artifactId>scala-library</artifactId>--> + <!--<version>${scala.version}</version>--> + <!--</dependency>--> + + + <dependency> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + <version>1.2.4</version> + </dependency> + + </dependencies> <profiles> @@ -87,25 +310,5 @@ </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/2f55adef/viennacl-omp/scala-2.10/linux-haswell.properties ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/linux-haswell.properties b/viennacl-omp/scala-2.10/linux-haswell.properties deleted file mode 100644 index 3ee4494..0000000 --- a/viennacl-omp/scala-2.10/linux-haswell.properties +++ /dev/null @@ -1,28 +0,0 @@ -platform=linux-x86_64 -platform.path.separator=: -platform.source.suffix=.cpp -platform.includepath.prefix=-I -platform.includepath= -platform.compiler=g++ -platform.compiler.cpp11=-std=c++11 -platform.compiler.default= -platform.compiler.fastfpu=-msse3 -ffast-math -platform.compiler.viennacl=-fopenmp -fpermissive -platform.compiler.nodeprecated=-Wno-deprecated-declarations -#build for haswell arch with for GCC >= 4.9.0 -platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=haswell -m64 -Wall -O3 -fPIC -shared -s -o\u0020 -#for GCC < 4.9.0 use -march=core-avx2 for haswell arch -#platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=core-avx2 -m64 -Wall -Ofast -fPIC -shared -s -o\u0020 -#build for native: -#platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=native -m64 -Wall -Ofast -fPIC -shared -s -o\u0020 -platform.linkpath.prefix=-L -platform.linkpath.prefix2=-Wl,-rpath, -platform.linkpath= -platform.link.prefix=-l -platform.link.suffix= -platform.link= -platform.framework.prefix=-F -platform.framework.suffix= -platform.framework= -platform.library.prefix=lib -platform.library.suffix=.so http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.10/linux-x86_64-viennacl.properties ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/linux-x86_64-viennacl.properties b/viennacl-omp/scala-2.10/linux-x86_64-viennacl.properties deleted file mode 100644 index e5de1fa..0000000 --- a/viennacl-omp/scala-2.10/linux-x86_64-viennacl.properties +++ /dev/null @@ -1,24 +0,0 @@ -platform=linux-x86_64 -platform.path.separator=: -platform.source.suffix=.cpp -platform.includepath.prefix=-I -platform.includepath= -platform.compiler=g++ -platform.compiler.cpp11=-std=c++11 -platform.compiler.default= -platform.compiler.fastfpu=-msse3 -ffast-math -platform.compiler.viennacl=-fopenmp -fpermissive -platform.compiler.nodeprecated=-Wno-deprecated-declarations -# platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=x86-64 -m64 -Wall -O3 -fPIC -shared -s -o\u0020 -platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -march=native -m64 -Wall -Ofast -fPIC -shared -s -o\u0020 -platform.linkpath.prefix=-L -platform.linkpath.prefix2=-Wl,-rpath, -platform.linkpath= -platform.link.prefix=-l -platform.link.suffix= -platform.link= -platform.framework.prefix=-F -platform.framework.suffix= -platform.framework= -platform.library.prefix=lib -platform.library.suffix=.so http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/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 deleted file mode 100644 index 7e80c78..0000000 --- a/viennacl-omp/scala-2.10/pom.xml +++ /dev/null @@ -1,320 +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/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.1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>mahout-native-viennacl-omp_2.10</artifactId> - - <name>Mahout Native VienniaCL OpenMP Scala 2.10 Bindings</name> - <description>Native Structures and interfaces to be used from Mahout math-scala. - </description> - - - <properties> - <scala.compat.version>2.10</scala.compat.version> - <scala.version>2.10.4</scala.version> - </properties> - - <packaging>jar</packaging> - - <build> - <plugins> - <!-- create test jar so other modules can reuse the native test utility classes. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>add-scala-sources</id> - <phase>initialize</phase> - <goals> - <goal>add-source</goal> - </goals> - </execution> - <execution> - <id>scala-compile</id> - <phase>process-resources</phase> - <goals> - <goal>compile</goal> - </goals> - </execution> - <execution> - <id>scala-test-compile</id> - <phase>process-test-resources</phase> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - - <!--this is what scalatest recommends to do to enable scala tests --> - - <!-- disable surefire --> - <!-- disable surefire --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <!-- enable scalatest --> - <plugin> - <groupId>org.scalatest</groupId> - <artifactId>scalatest-maven-plugin</artifactId> - <executions> - <execution> - <id>test</id> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> - <configuration> - <argLine>-Xmx4g</argLine> - </configuration> - </plugin> - - - <!--JavaCPP native build plugin--> - <!-- old-style way to get it to compile. --> - <!--based on https://github.com/bytedeco/javacpp/wiki/Maven--> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <executions> - <execution> - <id>javacpp</id> - <phase>process-classes</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <environmentVariables> - <LD_LIBRARY_PATH>{project.basedir}/target/classes/org/apache/mahout/javacpp/linalg/linux-x86_64/ - </LD_LIBRARY_PATH> - </environmentVariables> - <executable>java</executable> - <arguments> - <argument>-jar</argument> - <argument>${org.bytedeco:javacpp:jar}</argument> - <argument>-propertyfile</argument> - <argument>linux-x86_64-viennacl.properties</argument> - <argument>-classpath</argument> - <argument>${project.build.outputDirectory}:${org.scala-lang:scala-library:jar}</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.CompressedMatrix</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.Context</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.MatrixBase</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.DenseRowMatrix</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.DenseColumnMatrix</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.MatMatProdExpression</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.ProdExpression</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.MatrixTransExpression</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.LinalgFunctions</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.Functions</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.VectorBase</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.VCLVector</argument> - <argument>org.apache.mahout.viennacl.openmp.javacpp.VecMultExpression</argument> - <argument>org.apache.mahout.viennacl.openmp.OMPMMul</argument> - <argument>org.apache.mahout.viennacl.openmp.OMPMMul$</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.3</version> - <executions> - <execution> - <goals> - <goal>properties</goal> - </goals> - </execution> - </executions> - </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> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <configuration> - <tasks> - <copy file="target/mahout-native-viennacl-omp_2.10-${project.version}.jar" tofile="../../mahout-native-viennacl-omp_2.10-${project.version}.jar" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- delete jars on claen in top directory, which is MAHOUT_HOME --> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> - <configuration> - <filesets> - <fileset> - <directory>../../</directory> - <includes> - <include>mahout-native-viennacl-omp_2.10*.jar</include> - </includes> - <followSymlinks>false</followSymlinks> - </fileset> - </filesets> - </configuration> - </plugin> - </plugins> - - - - </build> - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>mahout-math-scala_${scala.compat.version}</artifactId> - </dependency> - - <!-- 3rd-party --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <!-- scala stuff --> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.compat.version}</artifactId> - </dependency> - - <!-- scala-library for annotations at compile time--> - <!--<dependency>--> - <!--<groupId>org.scala-lang</groupId>--> - <!--<artifactId>scala-library</artifactId>--> - <!--<version>${scala.version}</version>--> - <!--</dependency>--> - - - <dependency> - <groupId>org.bytedeco</groupId> - <artifactId>javacpp</artifactId> - <version>1.2.4</version> - </dependency> - - </dependencies> - - - <profiles> - <profile> - <id>mahout-release</id> - <build> - <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-scaladoc</id> - <goals> - <goal>doc</goal> - </goals> - </execution> - <execution> - <id>attach-scaladoc-jar</id> - <goals> - <goal>doc-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>travis</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- Limit memory for unit tests in Travis --> - <argLine>-Xmx3g</argLine> - <!--<argLine>-Djava.library.path=${project.build.directory}/libs/natives/linux-x86_64:${project.build.directory}/libs/natives/linux:${project.build.directory}/libs/natives/maxosx</argLine>--> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <!-- Limit memory for integration tests in Travis --> - <argLine>-Xmx3g</argLine> - <!--<argLine>-Djava.library.path=${project.build.directory}/libs/natives/linux-x86_64:${project.build.directory}/libs/natives/linux:${project.build.directory}/libs/natives/maxosx</argLine>--> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.10/runs ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/runs b/viennacl-omp/scala-2.10/runs deleted file mode 100644 index a152244..0000000 --- a/viennacl-omp/scala-2.10/runs +++ /dev/null @@ -1,32 +0,0 @@ -original -row-major viennacl::matrix - + OCL matrix memory domain after assgn=2 -- dense vcl mmul with fast_copy -- mmul microbenchmark - + Mahout multiplication time: 15699 ms. - + ViennaCL/OpenCL multiplication time: 3625 ms. - + ompA mem domain:1 - + ompB mem domain:1 - + ViennaCL/cpu/OpenMP multiplication time: 2838 ms. - -with sys.ArrayCopy, all dense. -ViennaCLSuite: -- row-major viennacl::matrix - + OCL matrix memory domain after assgn=2 -- dense vcl mmul with fast_copy -- mmul microbenchmark - + Mahout multiplication time: 15407 ms. - + ViennaCL/OpenCL multiplication time: 3499 ms. - + ompA mem domain:1 - + ompB mem domain:1 - + ViennaCL/cpu/OpenMP multiplication time: 2714 ms. - -DL latest -ViennaCLSuite: -- row-major viennacl::matrix - + OCL matrix memory domain after assgn=2 -- dense vcl mmul with fast_copy -- mmul microbenchmark - + Mahout multiplication time: 16076 ms. - + ViennaCL/OpenCL multiplication time: 3360 ms. - + ViennaCL/cpu/OpenMP multiplication time: 2666 ms. http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java b/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java deleted file mode 100644 index c2bffe5..0000000 --- a/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java +++ /dev/null @@ -1,103 +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.mahout.viennacl.openmp.javacpp; - -import org.bytedeco.javacpp.BytePointer; -import org.bytedeco.javacpp.DoublePointer; -import org.bytedeco.javacpp.IntPointer; -import org.bytedeco.javacpp.annotation.*; - -import java.nio.DoubleBuffer; -import java.nio.IntBuffer; - - -@Properties(inherit = Context.class, - value = @Platform( - library = "jniViennaCL" - ) -) -@Namespace("viennacl") -public final class Functions { - - private Functions() { - } - - // This is (imo) an inconsistency in Vienna cl: almost all operations require MatrixBase, and - // fast_copy require type `matrix`, i.e., one of DenseRowMatrix or DenseColumnMatrix. - @Name("fast_copy") - public static native void fastCopy(DoublePointer srcBegin, DoublePointer srcEnd, @ByRef DenseRowMatrix dst); - - @Name("fast_copy") - public static native void fastCopy(DoublePointer srcBegin, DoublePointer srcEnd, @ByRef DenseColumnMatrix dst); - - @Name("fast_copy") - public static native void fastCopy(@ByRef DenseRowMatrix src, DoublePointer dst); - - @Name("fast_copy") - public static native void fastCopy(@ByRef DenseColumnMatrix src, DoublePointer dst); - - @Name("fast_copy") - public static native void fastCopy(@Const @ByRef VectorBase dst, @Const @ByRef VCLVector src); - - @Name("fast_copy") - public static native void fastCopy(@Const @ByRef VCLVector src, @Const @ByRef VectorBase dst); - - - @ByVal - public static native MatrixTransExpression trans(@ByRef MatrixBase src); - - @Name("backend::memory_read") - public static native void memoryReadInt(@Const @ByRef MemHandle src_buffer, - int bytes_to_read, - int offset, - IntPointer ptr, - boolean async); - - @Name("backend::memory_read") - public static native void memoryReadDouble(@Const @ByRef MemHandle src_buffer, - int bytes_to_read, - int offset, - DoublePointer ptr, - boolean async); - - @Name("backend::memory_read") - public static native void memoryReadInt(@Const @ByRef MemHandle src_buffer, - int bytes_to_read, - int offset, - IntBuffer ptr, - boolean async); - - @Name("backend::memory_read") - public static native void memoryReadDouble(@Const @ByRef MemHandle src_buffer, - int bytes_to_read, - int offset, - DoubleBuffer ptr, - boolean async); - - @Name("backend::memory_read") - public static native void memoryReadBytes(@Const @ByRef MemHandle src_buffer, - int bytes_to_read, - int offset, - BytePointer ptr, - boolean async); - - - static { - Context.loadLib(); - } - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java b/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java deleted file mode 100644 index c2a40d9..0000000 --- a/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java +++ /dev/null @@ -1,86 +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.mahout.viennacl.openmp.javacpp; - -import org.apache.mahout.viennacl.openmp.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - - -@Properties(inherit = Context.class, - value = @Platform( - library = "jniViennaCL" - ) -) -@Namespace("viennacl::linalg") -public final class LinalgFunctions { - - private LinalgFunctions() { - } - - static { - Context.loadLib(); - } - - - @ByVal - public static native MatMatProdExpression prod(@Const @ByRef MatrixBase a, - @Const @ByRef MatrixBase b); - - @ByVal - public static native ProdExpression prod(@Const @ByRef CompressedMatrix a, - @Const @ByRef CompressedMatrix b); - - @ByVal - public static native MatVecProdExpression prod(@Const @ByRef MatrixBase a, - @Const @ByRef VectorBase b); - - @ByVal - public static native SrMatDnMatProdExpression prod(@Const @ByRef CompressedMatrix spMx, - @Const @ByRef MatrixBase dMx); - @ByVal - @Name("prod") - public static native DenseColumnMatrix prodCm(@Const @ByRef MatrixBase a, - @Const @ByRef MatrixBase b); - @ByVal - @Name("prod") - public static native DenseRowMatrix prodRm(@Const @ByRef MatrixBase a, - @Const @ByRef MatrixBase b); - - @ByVal - @Name("prod") - public static native DenseRowMatrix prodRm(@Const @ByRef CompressedMatrix spMx, - @Const @ByRef MatrixBase dMx); - - -// @ByVal -// public static native MatrixProdExpression prod(@Const @ByRef DenseRowMatrix a, -// @Const @ByRef DenseRowMatrix b); -// -// @ByVal -// public static native MatrixProdExpression prod(@Const @ByRef DenseRowMatrix a, -// @Const @ByRef DenseColumnMatrix b); -// -// @ByVal -// public static native MatrixProdExpression prod(@Const @ByRef DenseColumnMatrix a, -// @Const @ByRef DenseRowMatrix b); -// -// @ByVal -// public static native MatrixProdExpression prod(@Const @ByRef DenseColumnMatrix a, -// @Const @ByRef DenseColumnMatrix b); - - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala b/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala deleted file mode 100644 index 82574b4..0000000 --- a/viennacl-omp/scala-2.10/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala +++ /dev/null @@ -1,34 +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.mahout.viennacl.openmp.javacpp; - -import org.bytedeco.javacpp.Pointer -import org.bytedeco.javacpp.annotation.{Name, Namespace, Platform, Properties} - - -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - include = Array("matrix.hpp"), - library = "jniViennaCL") - )) -@Namespace("viennacl") -@Name(Array("matrix_expression<const viennacl::matrix_base<double>, " + - "const viennacl::matrix_base<double>, " + - "viennacl::op_trans>")) -class MatrixTransExpression extends Pointer { - -}
