http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/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 deleted file mode 100644 index 8171b8c..0000000 --- a/viennacl-omp/scala-2.11/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.11</artifactId> - - <name>Mahout Native VienniaCL OpenMP Scala 2.11 Bindings</name> - <description>Native Structures and interfaces to be used from Mahout math-scala. - </description> - - - <properties> - <scala.compat.version>2.11</scala.compat.version> - <scala.version>2.11.8</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.11-${project.version}.jar" tofile="../../mahout-native-viennacl-omp_2.11-${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.11*.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.11/runs ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/runs b/viennacl-omp/scala-2.11/runs deleted file mode 100644 index a152244..0000000 --- a/viennacl-omp/scala-2.11/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.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java b/viennacl-omp/scala-2.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/Functions.java deleted file mode 100644 index c2bffe5..0000000 --- a/viennacl-omp/scala-2.11/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.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java b/viennacl-omp/scala-2.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/LinalgFunctions.java deleted file mode 100644 index c2a40d9..0000000 --- a/viennacl-omp/scala-2.11/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.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala b/viennacl-omp/scala-2.11/src/main/java/org/apache/mahout/viennacl/openmp/javacpp/MatrixTransExpression.scala deleted file mode 100644 index 82574b4..0000000 --- a/viennacl-omp/scala-2.11/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 { - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/OMPMMul.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/OMPMMul.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/OMPMMul.scala deleted file mode 100644 index 9a59999..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/OMPMMul.scala +++ /dev/null @@ -1,449 +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 - -import org.apache.mahout.logging._ -import org.apache.mahout.math -import org.apache.mahout.math._ -import org.apache.mahout.math.backend.incore.MMulSolver -import org.apache.mahout.math.flavor.{BackEnum, TraversingStructureEnum} -import org.apache.mahout.math.function.Functions -import org.apache.mahout.math.scalabindings.RLikeOps._ -import org.apache.mahout.math.scalabindings._ -import org.apache.mahout.viennacl.openmp.javacpp.Functions._ -import org.apache.mahout.viennacl.openmp.javacpp.LinalgFunctions._ -import org.apache.mahout.viennacl.openmp.javacpp.{CompressedMatrix, Context, DenseRowMatrix} - -import scala.collection.JavaConversions._ - -object OMPMMul extends MMBinaryFunc { - - private implicit val log = getLog(OMPMMul.getClass) - - override def apply(a: Matrix, b: Matrix, r: Option[Matrix]): Matrix = { - - require(a.ncol == b.nrow, "Incompatible matrix sizes in matrix multiplication.") - - val (af, bf) = (a.getFlavor, b.getFlavor) - val backs = (af.getBacking, bf.getBacking) - val sd = (af.getStructure, math.scalabindings.densityAnalysis(a), bf.getStructure, densityAnalysis(b)) - - - try { - - val alg: MMulAlg = backs match { - - // Both operands are jvm memory backs. - case (BackEnum.JVMMEM, BackEnum.JVMMEM) â - - sd match { - - // Multiplication cases by a diagonal matrix. - case (TraversingStructureEnum.VECTORBACKED, _, TraversingStructureEnum.COLWISE, _) - if a.isInstanceOf[DiagonalMatrix] â jvmDiagCW - case (TraversingStructureEnum.VECTORBACKED, _, TraversingStructureEnum.SPARSECOLWISE, _) - if a.isInstanceOf[DiagonalMatrix] â jvmDiagCW - case (TraversingStructureEnum.VECTORBACKED, _, TraversingStructureEnum.ROWWISE, _) - if a.isInstanceOf[DiagonalMatrix] â jvmDiagRW - case (TraversingStructureEnum.VECTORBACKED, _, TraversingStructureEnum.SPARSEROWWISE, _) - if a.isInstanceOf[DiagonalMatrix] â jvmDiagRW - - case (TraversingStructureEnum.COLWISE, _, TraversingStructureEnum.VECTORBACKED, _) - if b.isInstanceOf[DiagonalMatrix] â jvmCWDiag - case (TraversingStructureEnum.SPARSECOLWISE, _, TraversingStructureEnum.VECTORBACKED, _) - if b.isInstanceOf[DiagonalMatrix] â jvmCWDiag - case (TraversingStructureEnum.ROWWISE, _, TraversingStructureEnum.VECTORBACKED, _) - if b.isInstanceOf[DiagonalMatrix] â jvmRWDiag - case (TraversingStructureEnum.SPARSEROWWISE, _, TraversingStructureEnum.VECTORBACKED, _) - if b.isInstanceOf[DiagonalMatrix] â jvmRWDiag - - // Dense-dense cases - case (TraversingStructureEnum.ROWWISE, true, TraversingStructureEnum.COLWISE, true) if a eq b.t â ompDRWAAt - case (TraversingStructureEnum.ROWWISE, true, TraversingStructureEnum.COLWISE, true) if a.t eq b â ompDRWAAt - case (TraversingStructureEnum.ROWWISE, true, TraversingStructureEnum.COLWISE, true) â ompRWCW - case (TraversingStructureEnum.ROWWISE, true, TraversingStructureEnum.ROWWISE, true) â jvmRWRW - case (TraversingStructureEnum.COLWISE, true, TraversingStructureEnum.COLWISE, true) â jvmCWCW - case (TraversingStructureEnum.COLWISE, true, TraversingStructureEnum.ROWWISE, true) if a eq b.t â jvmDCWAAt - case (TraversingStructureEnum.COLWISE, true, TraversingStructureEnum.ROWWISE, true) if a.t eq b â jvmDCWAAt - case (TraversingStructureEnum.COLWISE, true, TraversingStructureEnum.ROWWISE, true) â jvmCWRW - - // Sparse row matrix x sparse row matrix (array of vectors) - case (TraversingStructureEnum.ROWWISE, false, TraversingStructureEnum.ROWWISE, false) â ompSparseRWRW - case (TraversingStructureEnum.ROWWISE, false, TraversingStructureEnum.COLWISE, false) â jvmSparseRWCW - case (TraversingStructureEnum.COLWISE, false, TraversingStructureEnum.ROWWISE, false) â jvmSparseCWRW - case (TraversingStructureEnum.COLWISE, false, TraversingStructureEnum.COLWISE, false) â jvmSparseCWCW - - // Sparse matrix x sparse matrix (hashtable of vectors) - case (TraversingStructureEnum.SPARSEROWWISE, false, TraversingStructureEnum.SPARSEROWWISE, false) â - ompSparseRowRWRW - case (TraversingStructureEnum.SPARSEROWWISE, false, TraversingStructureEnum.SPARSECOLWISE, false) â - jvmSparseRowRWCW - case (TraversingStructureEnum.SPARSECOLWISE, false, TraversingStructureEnum.SPARSEROWWISE, false) â - jvmSparseRowCWRW - case (TraversingStructureEnum.SPARSECOLWISE, false, TraversingStructureEnum.SPARSECOLWISE, false) â - jvmSparseRowCWCW - - // Sparse matrix x non-like - case (TraversingStructureEnum.SPARSEROWWISE, false, TraversingStructureEnum.ROWWISE, _) â ompSparseRowRWRW - case (TraversingStructureEnum.SPARSEROWWISE, false, TraversingStructureEnum.COLWISE, _) â jvmSparseRowRWCW - case (TraversingStructureEnum.SPARSECOLWISE, false, TraversingStructureEnum.ROWWISE, _) â jvmSparseRowCWRW - case (TraversingStructureEnum.SPARSECOLWISE, false, TraversingStructureEnum.COLWISE, _) â jvmSparseCWCW - case (TraversingStructureEnum.ROWWISE, _, TraversingStructureEnum.SPARSEROWWISE, false) â ompSparseRWRW - case (TraversingStructureEnum.ROWWISE, _, TraversingStructureEnum.SPARSECOLWISE, false) â jvmSparseRWCW - case (TraversingStructureEnum.COLWISE, _, TraversingStructureEnum.SPARSEROWWISE, false) â jvmSparseCWRW - case (TraversingStructureEnum.COLWISE, _, TraversingStructureEnum.SPARSECOLWISE, false) â jvmSparseRowCWCW - - // Everything else including at least one sparse LHS or RHS argument - case (TraversingStructureEnum.ROWWISE, false, TraversingStructureEnum.ROWWISE, _) â ompSparseRWRW - case (TraversingStructureEnum.ROWWISE, false, TraversingStructureEnum.COLWISE, _) â jvmSparseRWCW - case (TraversingStructureEnum.COLWISE, false, TraversingStructureEnum.ROWWISE, _) â jvmSparseCWRW - case (TraversingStructureEnum.COLWISE, false, TraversingStructureEnum.COLWISE, _) â jvmSparseCWCW2flips - - // Sparse methods are only effective if the first argument is sparse, so we need to do a swap. - case (_, _, _, false) â (a, b, r) â apply(b.t, a.t, r.map { - _.t - }).t - - // Default jvm-jvm case. - // for some reason a SrarseRowMatrix DRM %*% SrarseRowMatrix DRM was dumping off to here - case _ â ompRWCW - } - } - - alg(a, b, r) - } catch { - // TODO FASTHACK: just revert to JVM if there is an exception.. - // eg. java.lang.nullPointerException if more openCL contexts - // have been created than number of GPU cards. - // better option wuold be to fall back to OpenCl First. - case ex: Exception => - println(ex.getMessage + "falling back to JVM MMUL") - return MMul(a, b, r) - } - } - - type MMulAlg = MMBinaryFunc - - @inline - private def ompRWCW(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - println("ompRWCW") - // - // require(r.forall(mxR â mxR.nrow == a.nrow && mxR.ncol == b.ncol)) - // val (m, n) = (a.nrow, b.ncol) - // - // val mxR = r.getOrElse(if (densityAnalysis(a)) a.like(m, n) else b.like(m, n)) - // - // for (row â 0 until mxR.nrow; col â 0 until mxR.ncol) { - // // this vector-vector should be sort of optimized, right? - // mxR(row, col) = a(row, ::) dot b(::, col) - // } - // mxR - - val hasElementsA = a.zSum() > 0.0 - val hasElementsB = b.zSum() > 0.0 - - // A has a sparse matrix structure of unknown size. We do not want to - // simply convert it to a Dense Matrix which may result in an OOM error. - - // If it is empty use JVM MMul, since we can not convert it to a VCL CSR Matrix. - if (!hasElementsA) { - println("Matrix a has zero elements can not convert to CSR") - return MMul(a, b, r) - } - - // CSR matrices are efficient up to 50% non-zero - if (b.getFlavor.isDense) { - var ms = System.currentTimeMillis() - val oclCtx = new Context(Context.MAIN_MEMORY) - val oclA = toVclCmpMatrixAlt(a, oclCtx) - val oclB = toVclDenseRM(b, oclCtx) - val oclC = new DenseRowMatrix(prod(oclA, oclB)) - val mxC = fromVclDenseRM(oclC) - ms = System.currentTimeMillis() - ms - debug(s"ViennaCL/OpenMP multiplication time: $ms ms.") - - oclA.close() - oclB.close() - oclC.close() - - mxC - } else { - // Fall back to JVM based MMul if either matrix is sparse and empty - if (!hasElementsA || !hasElementsB) { - println("Matrix a or b has zero elements can not convert to CSR") - return MMul(a, b, r) - } - - var ms = System.currentTimeMillis() - val hostClCtx = new Context(Context.MAIN_MEMORY) - val oclA = toVclCmpMatrixAlt(a, hostClCtx) - val oclB = toVclCmpMatrixAlt(b, hostClCtx) - val oclC = new CompressedMatrix(prod(oclA, oclB)) - val mxC = fromVclCompressedMatrix(oclC) - ms = System.currentTimeMillis() - ms - debug(s"ViennaCL/OpenMP multiplication time: $ms ms.") - - oclA.close() - oclB.close() - oclC.close() - - mxC - } - } - - - @inline - private def jvmRWRW(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using jvmRWRW method") - // A bit hackish: currently, this relies a bit on the fact that like produces RW(?) - val bclone = b.like(b.ncol, b.nrow).t - for (brow â b) bclone(brow.index(), ::) := brow - - require(bclone.getFlavor.getStructure == TraversingStructureEnum.COLWISE || bclone.getFlavor.getStructure == - TraversingStructureEnum.SPARSECOLWISE, "COL wise conversion assumption of RHS is wrong, do over this code.") - - ompRWCW(a, bclone, r) - } - - private def jvmCWCW(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using jvmCWCW method") - jvmRWRW(b.t, a.t, r.map(_.t)).t - } - - private def jvmCWRW(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using jvmCWRW method") - // This is a primary contender with Outer Prod sum algo. - // Here, we force-reorient both matrices and run RWCW. - // A bit hackish: currently, this relies a bit on the fact that clone always produces RW(?) - val aclone = a.cloned - - require(aclone.getFlavor.getStructure == TraversingStructureEnum.ROWWISE || aclone.getFlavor.getStructure == - TraversingStructureEnum.SPARSEROWWISE, "Row wise conversion assumption of RHS is wrong, do over this code.") - - jvmRWRW(aclone, b, r) - } - - // left is Sparse right is any - private def ompSparseRWRW(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using ompSparseRWRW method") - val mxR = r.getOrElse(b.like(a.nrow, b.ncol)) - - /* Make sure that the matrix is not empty. VCL {{compressed_matrix}}s must - have nnz > 0 - N.B. This method is horribly inefficent. However there is a difference between - getNumNonDefaultElements() and getNumNonZeroElements() which we do not always - have access to. We created MAHOUT-1882 for this. - */ - - val hasElementsA = a.zSum() > 0.0 - val hasElementsB = b.zSum() > 0.0 - - // A has a sparse matrix structure of unknown size. We do not want to - // simply convert it to a Dense Matrix which may result in an OOM error. - // If it is empty use JVM MMul, since we can not convert it to a VCL CSR Matrix. - if (!hasElementsA) { - log.warn("Matrix a has zero elements can not convert to CSR") - return MMul(a, b, r) - } - - // CSR matrices are efficient up to 50% non-zero - if(b.getFlavor.isDense) { - var ms = System.currentTimeMillis() - val hostClCtx = new Context(Context.MAIN_MEMORY) - val oclA = toVclCmpMatrixAlt(a, hostClCtx) - val oclB = toVclDenseRM(b, hostClCtx) - val oclC = new DenseRowMatrix(prod(oclA, oclB)) - val mxC = fromVclDenseRM(oclC) - ms = System.currentTimeMillis() - ms - log.debug(s"ViennaCL/OpenMP multiplication time: $ms ms.") - - oclA.close() - oclB.close() - oclC.close() - - mxC - } else { - // Fall back to JVM based MMul if either matrix is sparse and empty - if (!hasElementsA || !hasElementsB) { - log.warn("Matrix a or b has zero elements can not convert to CSR") - return MMul(a, b, r) - } - - var ms = System.currentTimeMillis() - val hostClCtx = new Context(Context.MAIN_MEMORY) - val oclA = toVclCmpMatrixAlt(a, hostClCtx) - val oclB = toVclCmpMatrixAlt(b, hostClCtx) - val oclC = new CompressedMatrix(prod(oclA, oclB)) - val mxC = fromVclCompressedMatrix(oclC) - ms = System.currentTimeMillis() - ms - log.debug(s"ViennaCL/OpenMP multiplication time: $ms ms.") - - oclA.close() - oclB.close() - oclC.close() - - mxC - } - - } - - //sparse %*% dense - private def ompSparseRowRWRW(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using ompSparseRowRWRW method") - val hasElementsA = a.zSum() > 0 - - // A has a sparse matrix structure of unknown size. We do not want to - // simply convert it to a Dense Matrix which may result in an OOM error. - // If it is empty fall back to JVM MMul, since we can not convert it - // to a VCL CSR Matrix. - if (!hasElementsA) { - log.warn("Matrix a has zero elements can not convert to CSR") - return MMul(a, b, r) - } - - var ms = System.currentTimeMillis() - val hostClCtx = new Context(Context.MAIN_MEMORY) - val oclA = toVclCmpMatrixAlt(a, hostClCtx) - val oclB = toVclDenseRM(b, hostClCtx) - val oclC = new DenseRowMatrix(prod(oclA, oclB)) - val mxC = fromVclDenseRM(oclC) - ms = System.currentTimeMillis() - ms - log.debug(s"ViennaCL/OpenMP multiplication time: $ms ms.") - - oclA.close() - oclB.close() - oclC.close() - - mxC - } - - private def jvmSparseRowCWCW(a: Matrix, b: Matrix, r: Option[Matrix] = None) = - ompSparseRowRWRW(b.t, a.t, r.map(_.t)).t - - private def jvmSparseRowCWCW2flips(a: Matrix, b: Matrix, r: Option[Matrix] = None) = - ompSparseRowRWRW(a cloned, b cloned, r) - - private def jvmSparseRowRWCW(a: Matrix, b: Matrix, r: Option[Matrix]) = - ompSparseRowRWRW(a, b cloned, r) - - private def jvmSparseRowCWRW(a: Matrix, b: Matrix, r: Option[Matrix]) = - ompSparseRowRWRW(a cloned, b, r) - - private def jvmSparseRWCW(a: Matrix, b: Matrix, r: Option[Matrix] = None) = - ompSparseRWRW(a, b.cloned, r) - - private def jvmSparseCWRW(a: Matrix, b: Matrix, r: Option[Matrix] = None) = - ompSparseRWRW(a cloned, b, r) - - private def jvmSparseCWCW(a: Matrix, b: Matrix, r: Option[Matrix] = None) = - ompSparseRWRW(b.t, a.t, r.map(_.t)).t - - private def jvmSparseCWCW2flips(a: Matrix, b: Matrix, r: Option[Matrix] = None) = - ompSparseRWRW(a cloned, b cloned, r) - - private def jvmDiagRW(diagm:Matrix, b:Matrix, r:Option[Matrix] = None):Matrix = { - log.info("Using jvmDiagRW method") - val mxR = r.getOrElse(b.like(diagm.nrow, b.ncol)) - - for (del â diagm.diagv.nonZeroes()) - mxR(del.index, ::).assign(b(del.index, ::), Functions.plusMult(del)) - - mxR - } - - private def jvmDiagCW(diagm: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using jvmDiagCW method") - val mxR = r.getOrElse(b.like(diagm.nrow, b.ncol)) - for (bcol â b.t) mxR(::, bcol.index()) := bcol * diagm.diagv - mxR - } - - private def jvmCWDiag(a: Matrix, diagm: Matrix, r: Option[Matrix] = None) = - jvmDiagRW(diagm, a.t, r.map {_.t}).t - - private def jvmRWDiag(a: Matrix, diagm: Matrix, r: Option[Matrix] = None) = - jvmDiagCW(diagm, a.t, r.map {_.t}).t - - /** Dense column-wise AA' */ - private def jvmDCWAAt(a:Matrix, b:Matrix, r:Option[Matrix] = None) = { - // a.t must be equiv. to b. Cloning must rewrite to row-wise. - ompDRWAAt(a.cloned,null,r) - } - - /** Dense Row-wise AA' */ - // We probably will not want to use this for the actual release unless A is cached already - // but adding for testing purposes. - private def ompDRWAAt(a:Matrix, b:Matrix, r:Option[Matrix] = None) = { - // a.t must be equiv to b. - log.info("Executing on OMP") - log.debug("AAt computation detected; passing off to OMP") - - // Check dimensions if result is supplied. - require(r.forall(mxR â mxR.nrow == a.nrow && mxR.ncol == a.nrow)) - - val mxR = r.getOrElse(a.like(a.nrow, a.nrow)) - - var ms = System.currentTimeMillis() - val hostClCtx = new Context(Context.MAIN_MEMORY) - val oclA = toVclDenseRM(src = a, hostClCtx) - val oclAt = new DenseRowMatrix(trans(oclA)) - val oclC = new DenseRowMatrix(prod(oclA, oclAt)) - - val mxC = fromVclDenseRM(oclC) - ms = System.currentTimeMillis() - ms - log.debug(s"ViennaCL/OpenMP multiplication time: $ms ms.") - - oclA.close() - //oclApr.close() - oclAt.close() - oclC.close() - - mxC - - } - - private def jvmOuterProdSum(a: Matrix, b: Matrix, r: Option[Matrix] = None): Matrix = { - log.info("Using jvmOuterProdSum method") - // Need to check whether this is already laid out for outer product computation, which may be faster than - // reorienting both matrices. - val (m, n) = (a.nrow, b.ncol) - - // Prefer col-wise result iff a is dense and b is sparse. In all other cases default to row-wise. - val preferColWiseR = a.getFlavor.isDense && !b.getFlavor.isDense - - val mxR = r.getOrElse { - (a.getFlavor.isDense, preferColWiseR) match { - case (false, false) â b.like(m, n) - case (false, true) â b.like(n, m).t - case (true, false) â a.like(m, n) - case (true, true) â a.like(n, m).t - } - } - - // Loop outer products - if (preferColWiseR) { - // this means B is sparse and A is not, so we need to iterate over b values and update R columns with += - // one at a time. - for ((acol, brow) â a.t.zip(b); bel â brow.nonZeroes) mxR(::, bel.index()) += bel * acol - } else { - for ((acol, brow) â a.t.zip(b); ael â acol.nonZeroes()) mxR(ael.index(), ::) += ael * brow - } - - mxR - } -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala deleted file mode 100644 index 3c5a6eb..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala +++ /dev/null @@ -1,135 +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 java.nio._ - -import org.bytedeco.javacpp._ -import org.bytedeco.javacpp.annotation._ - -import scala.collection.mutable.ArrayBuffer - - -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - include = Array("compressed_matrix.hpp"), - library="jniViennaCL" - ))) -@Name(Array("viennacl::compressed_matrix<double>")) -final class CompressedMatrix(defaultCtr: Boolean = true) extends Pointer { - - protected val ptrs = new ArrayBuffer[Pointer]() - - // call this after set or better TODO: yet wrap set() in a public method that will call this - def registerPointersForDeallocation(p:Pointer): Unit = { - ptrs += p - } - - override def deallocate(deallocate: Boolean): Unit = { - super.deallocate(deallocate) - ptrs.foreach(_.close()) - } - - if (defaultCtr) allocate() - - def this(nrow: Int, ncol: Int) { - this(false) - allocate(nrow, ncol, new Context) - } - - def this(nrow: Int, ncol: Int, ctx: Context) { - this(false) - allocate(nrow, ncol, ctx) - } - - def this(nrow: Int, ncol: Int, nonzeros: Int) { - this(false) - allocate(nrow, ncol, nonzeros, new Context) - } - - def this(nrow: Int, ncol: Int, nonzeros: Int, ctx: Context) { - this(false) - allocate(nrow, ncol, nonzeros, ctx) - } - - def this(pe: ProdExpression) { - this(false) - allocate(pe) - } - - @native protected def allocate() - - @native protected def allocate(nrow: Int, ncol: Int, nonzeros: Int, @ByVal ctx: Context) - - @native protected def allocate(nrow: Int, ncol: Int, @ByVal ctx: Context) - - @native protected def allocate(@Const @ByRef pe: ProdExpression) - -// @native protected def allocate(db: DoubleBuffer) -// -// @native protected def allocate(ib: IntBuffer) - - // Warning: apparently there are differences in bit interpretation between OpenCL and everything - // else for unsigned int type. So, for OpenCL backend, rowJumper and colIndices have to be packed - // with reference to that cl_uint type that Vienna-CL defines. - @native def set(@Cast(Array("const void*")) rowJumper: IntBuffer, - @Cast(Array("const void*")) colIndices: IntBuffer, - @Const elements: DoubleBuffer, - nrow: Int, - ncol: Int, - nonzeros: Int - ) - - /** With javacpp pointers. */ - @native def set(@Cast(Array("const void*")) rowJumper: IntPointer, - @Cast(Array("const void*")) colIndices: IntPointer, - @Const elements: DoublePointer, - nrow: Int, - ncol: Int, - nonzeros: Int - ) - - @Name(Array("operator=")) - @native def :=(@Const @ByRef pe: ProdExpression) - - @native def generate_row_block_information() - - /** getters for the compressed_matrix size */ - //const vcl_size_t & size1() const { return rows_; } - @native def size1: Int - //const vcl_size_t & size2() const { return cols_; } - @native def size2: Int - //const vcl_size_t & nnz() const { return nonzeros_; } - @native def nnz: Int - //const vcl_size_t & blocks1() const { return row_block_num_; } - // @native def blocks1: Int - - /** getters for the compressed_matrix buffers */ - //const handle_type & handle1() const { return row_buffer_; } - @native @Const @ByRef def handle1: MemHandle - //const handle_type & handle2() const { return col_buffer_; } - @native @Const @ByRef def handle2: MemHandle - //const handle_type & handle3() const { return row_blocks_; } - @native @Const @ByRef def handle3: MemHandle - //const handle_type & handle() const { return elements_; } - @native @Const @ByRef def handle: MemHandle - -} - -object CompressedMatrix { - Context.loadLib() -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/Context.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/Context.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/Context.scala deleted file mode 100644 index ae1b782..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/Context.scala +++ /dev/null @@ -1,58 +0,0 @@ -package org.apache.mahout.viennacl.openmp.javacpp - - -import org.bytedeco.javacpp.annotation._ -import org.bytedeco.javacpp.{Loader, Pointer} - -/** - * This assumes viennacl 1.7.1 is installed, which in ubuntu Xenial defaults to - * /usr/include/viennacl, and is installed via - * {{{ - * sudo apt-get install libviennacl-dev - * }}} - * - * @param mtype - */ -@Properties(Array( - new Platform( - includepath = Array("/usr/include/viennacl"), - include = Array("matrix.hpp", "compressed_matrix.hpp"), - define = Array("VIENNACL_WITH_OPENMP"), - compiler = Array("fastfpu","viennacl"), - link = Array("OpenCL"), - library = "jniViennaCL" - ))) -@Namespace("viennacl") -@Name(Array("context")) -final class Context(mtype: Int = Context.MEMORY_NOT_INITIALIZED) extends Pointer { - - import Context._ - - if (mtype == MEMORY_NOT_INITIALIZED) - allocate() - else - allocate(mtype) - - @native protected def allocate() - - @native protected def allocate(@Cast(Array("viennacl::memory_types")) mtype: Int) - - @Name(Array("memory_type")) - @Cast(Array("int")) - @native def memoryType: Int - -} - -object Context { - - def loadLib() = Loader.load(classOf[Context]) - - loadLib() - - /* Memory types. Ported from VCL header files. */ - val MEMORY_NOT_INITIALIZED = 0 - val MAIN_MEMORY = 1 - val OPENCL_MEMORY = 2 - val CUDA_MEMORY = 3 - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala deleted file mode 100644 index 71bdab2..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala +++ /dev/null @@ -1,95 +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.DoublePointer -import org.bytedeco.javacpp.annotation._ - -/** - * ViennaCL dense matrix, column-major. This is an exact duplication of [[DenseRowMatrix]], and - * is only different in the materialized C++ template name. Unfortunately I so far have not figured - * out how to handle it with. - * - * Also, the [[Platform.library]] does not get inherited for some reason, and we really want to - * collect all class mappings in the same one libjni.so, so we have to repeat this `library` defi- - * nition in every mapped class in this package. (One .so per package convention). - */ -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform ( - include=Array("matrix.hpp"), - library="jniViennaCL" - ))) -@Name(Array("viennacl::matrix<double,viennacl::column_major>")) -final class DenseColumnMatrix(initDefault:Boolean = true) extends MatrixBase { - - def this(nrow: Int, ncol: Int) { - this(false) - allocate(nrow, ncol, new Context()) - } - - def this(nrow: Int, ncol: Int, ctx: Context) { - this(false) - allocate(nrow, ncol, ctx) - } - - def this(data: DoublePointer, nrow: Int, ncol: Int) { - this(false) - allocate(data, new Context(Context.MAIN_MEMORY).memoryType, nrow, ncol) - // We save it to deallocate it ad deallocation time. - ptrs += data - } - - def this(data: DoublePointer, nrow: Int, ncol: Int, ctx: Context) { - this(false) - allocate(data, ctx.memoryType, nrow, ncol) - // We save it to deallocate it ad deallocation time. - ptrs += data - } - - def this(me: MatMatProdExpression) { - this(false) - allocate(me) - } - - def this(me: MatrixTransExpression) { - this(false) - allocate(me) - } - - - if (initDefault) allocate() - - @native protected def allocate() - - @native protected def allocate(nrow: Int, ncol: Int, @ByVal ctx: Context) - - @native protected def allocate(data: DoublePointer, - @Cast(Array("viennacl::memory_types")) - memType: Int, - nrow: Int, - ncol: Int - ) - - @native protected def allocate(@Const @ByRef me: MatMatProdExpression) - - @native protected def allocate(@Const @ByRef me: MatrixTransExpression) - -} - -object DenseColumnMatrix { - Context.loadLib() -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala deleted file mode 100644 index 7bbd3a0..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala +++ /dev/null @@ -1,81 +0,0 @@ -package org.apache.mahout.viennacl.openmp.javacpp - -import org.bytedeco.javacpp.DoublePointer -import org.bytedeco.javacpp.annotation._ - -/** - * ViennaCL dense matrix, row-major. - */ -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - library = "jniViennaCL" - ))) -@Name(Array("viennacl::matrix<double,viennacl::row_major>")) -class DenseRowMatrix(initDefault: Boolean = true) extends MatrixBase { - - def this(nrow: Int, ncol: Int) { - this(false) - allocate(nrow, ncol, new Context()) - } - - def this(nrow: Int, ncol: Int, ctx: Context) { - this(false) - allocate(nrow, ncol, ctx) - } - - def this(data: DoublePointer, nrow: Int, ncol: Int) { - this(false) - allocate(data, new Context(Context.MAIN_MEMORY).memoryType, nrow, ncol) - // We save it to deallocate it ad deallocation time. - ptrs += data - } - - def this(data: DoublePointer, nrow: Int, ncol: Int, ctx: Context) { - this(false) - allocate(data, ctx.memoryType, nrow, ncol) - // We save it to deallocate it ad deallocation time. - ptrs += data - } - - def this(me: MatMatProdExpression) { - this(false) - allocate(me) - } - - def this(me: MatrixTransExpression) { - this(false) - allocate(me) - } - - // TODO: getting compilation errors here - def this(sd: SrMatDnMatProdExpression) { - this(false) - allocate(sd) - } - - if (initDefault) allocate() - - @native protected def allocate() - - @native protected def allocate(nrow: Int, ncol: Int, @ByVal ctx: Context) - - @native protected def allocate(data: DoublePointer, - @Cast(Array("viennacl::memory_types")) - memType: Int, - nrow: Int, - ncol: Int - ) - - @native protected def allocate(@Const @ByRef me: MatMatProdExpression) - - @native protected def allocate(@Const @ByRef me: MatrixTransExpression) - - // TODO: Compilation errors here - @native protected def allocate(@Const @ByRef me: SrMatDnMatProdExpression) - -} - - -object DenseRowMatrix { - Context.loadLib() -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatMatProdExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatMatProdExpression.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatMatProdExpression.scala deleted file mode 100644 index c15bbd9..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatMatProdExpression.scala +++ /dev/null @@ -1,33 +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( - library = "jniViennaCL") - )) -@Namespace("viennacl") -@Name(Array("matrix_expression<const viennacl::matrix_base<double>, " + - "const viennacl::matrix_base<double>, " + - "viennacl::op_mat_mat_prod>")) -class MatMatProdExpression extends Pointer { - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatVecProdExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatVecProdExpression.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatVecProdExpression.scala deleted file mode 100644 index 4435232..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatVecProdExpression.scala +++ /dev/null @@ -1,33 +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( - library = "jniViennaCL") - )) -@Namespace("viennacl") -@Name(Array("vector_expression<const viennacl::matrix_base<double>, " + - "const viennacl::vector_base<double>, " + - "viennacl::op_prod>")) -class MatVecProdExpression extends Pointer { - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatrixBase.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatrixBase.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatrixBase.scala deleted file mode 100644 index 00823b6..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MatrixBase.scala +++ /dev/null @@ -1,75 +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._ - -import scala.collection.mutable.ArrayBuffer - - -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - library = "jniViennaCL" - ))) -@Name(Array("viennacl::matrix_base<double>")) -class MatrixBase extends Pointer { - - protected val ptrs = new ArrayBuffer[Pointer]() - - override def deallocate(deallocate: Boolean): Unit = { - super.deallocate(deallocate) - ptrs.foreach(_.close()) - } - - @Name(Array("operator=")) - @native def :=(@Const @ByRef src: DenseRowMatrix) - - @Name(Array("operator=")) - @native def :=(@Const @ByRef src: DenseColumnMatrix) - - @Name(Array("size1")) - @native - def nrow: Int - - @Name(Array("size2")) - @native - def ncol: Int - - @Name(Array("row_major")) - @native - def isRowMajor: Boolean - - @Name(Array("internal_size1")) - @native - def internalnrow: Int - - @Name(Array("internal_size2")) - @native - def internalncol: Int - - @Name(Array("memory_domain")) - @native - def memoryDomain: Int - - @Name(Array("switch_memory_context")) - @native - def switchMemoryContext(@ByRef ctx: Context) - - - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MemHandle.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MemHandle.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MemHandle.scala deleted file mode 100644 index 938a262..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/MemHandle.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._ - - -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - library = "jniViennaCL") - )) -@Namespace("viennacl::backend") -@Name(Array("mem_handle")) -class MemHandle extends Pointer { - - allocate() - - @native def allocate() -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/ProdExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/ProdExpression.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/ProdExpression.scala deleted file mode 100644 index 315a03c..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/ProdExpression.scala +++ /dev/null @@ -1,33 +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( - library = "jniViennaCL") - )) -@Namespace("viennacl") -@Name(Array("matrix_expression<const viennacl::compressed_matrix<double>, " + - "const viennacl::compressed_matrix<double>, " + - "viennacl::op_prod>")) -class ProdExpression extends Pointer { - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/SrMatDnMatProdExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/SrMatDnMatProdExpression.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/SrMatDnMatProdExpression.scala deleted file mode 100644 index e9c7bac..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/SrMatDnMatProdExpression.scala +++ /dev/null @@ -1,33 +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( - library = "jniViennaCL") - )) -@Namespace("viennacl") -@Name(Array("matrix_expression<const viennacl::compressed_matrix<double>, " + - "const viennacl::matrix_base<double>, " + - "viennacl::op_prod>")) -class SrMatDnMatProdExpression extends Pointer { - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala deleted file mode 100644 index 33947ec..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala +++ /dev/null @@ -1,124 +0,0 @@ -package org.apache.mahout.viennacl.openmp.javacpp - -import org.bytedeco.javacpp._ -import org.bytedeco.javacpp.annotation._ - - -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - library="jniViennaCL" - ))) -@Name(Array("viennacl::vector<double>")) -final class VCLVector(defaultCtr: Boolean = true) extends VectorBase { - - if (defaultCtr) allocate() - - def this(){ - this(false) - allocate() - } - - def this(size: Int) { - this(false) - allocate(size, new Context(Context.MAIN_MEMORY)) - } - - def this(size: Int, ctx: Context ) { - this(false) - allocate(size, ctx) - } - - def this(@Const @ByRef ve: VecMultExpression) { - this(false) - allocate(ve) - } - - def this(@Const @ByRef vmp: MatVecProdExpression) { - this(false) - allocate(vmp) - } - -// conflicting with the next signature as MemHandle is a pointer and so is a DoublePointer.. -// leave out for now. -// -// def this(h: MemHandle , vec_size: Int, vec_start: Int = 0, vec_stride: Int = 1) { -// this(false) -// allocate(h, vec_size, vec_start, vec_stride) -// } - - def this(ptr_to_mem: DoublePointer, - @Cast(Array("viennacl::memory_types"))mem_type : Int, - vec_size: Int) { - - this(false) - allocate(ptr_to_mem, mem_type, vec_size, 0, 1) - ptrs += ptr_to_mem - } - - def this(ptr_to_mem: DoublePointer, - @Cast(Array("viennacl::memory_types"))mem_type : Int, - vec_size: Int, - start: Int, - stride: Int) { - - this(false) - allocate(ptr_to_mem, mem_type, vec_size, start, stride) - ptrs += ptr_to_mem - } - - def this(@Const @ByRef vc: VCLVector) { - this(false) - allocate(vc) - } - def this(@Const @ByRef vb: VectorBase) { - this(false) - allocate(vb) - } - - @native protected def allocate() - - @native protected def allocate(size: Int) - - @native protected def allocate(size: Int, @ByVal ctx: Context) - - @native protected def allocate(@Const @ByRef ve: VecMultExpression) - - @native protected def allocate(@Const @ByRef ve: MatVecProdExpression) - - @native protected def allocate(@Const @ByRef vb: VCLVector) - - @native protected def allocate(@Const @ByRef vb: VectorBase) - - -// @native protected def allocate(h: MemHandle , vec_size: Int, -// vec_start: Int, -// vec_stride: Int) - - @native protected def allocate(ptr_to_mem: DoublePointer, - @Cast(Array("viennacl::memory_types"))mem_type : Int, - vec_size: Int, - start: Int, - stride: Int) - - @Name(Array("viennacl::vector<double>::self_type")) - def selfType:VectorBase = this.asInstanceOf[VectorBase] - - - @native def switch_memory_context(@ByVal context: Context): Unit - -// Swaps the handles of two vectors by swapping the OpenCL handles only, no data copy. -// @native def fast_swap(@ByVal other: VCLVector): VectorBase - -// add this operator in for tests many more can be added -// @Name(Array("operator*")) -// @native @ByPtr def *(i: Int): VectorMultExpression - - - -} - -object VCLVector { - Context.loadLib() -} - - http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VecMultExpression.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VecMultExpression.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VecMultExpression.scala deleted file mode 100644 index 7562de5..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VecMultExpression.scala +++ /dev/null @@ -1,32 +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( - library = "jniViennaCL") - )) -@Namespace("viennacl") -@Name(Array("vector_expression<const viennacl::vector_base<double>," + - "const double, viennacl::op_mult >")) -class VecMultExpression extends Pointer { - -} http://git-wip-us.apache.org/repos/asf/mahout/blob/2f55adef/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VectorBase.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VectorBase.scala b/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VectorBase.scala deleted file mode 100644 index 8efd377..0000000 --- a/viennacl-omp/scala-2.11/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VectorBase.scala +++ /dev/null @@ -1,55 +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._ -import org.bytedeco.javacpp.annotation._ - -import scala.collection.mutable.ArrayBuffer - - -@Properties(inherit = Array(classOf[Context]), - value = Array(new Platform( - library="jniViennaCL" - ))) -@Name(Array("viennacl::vector_base<double>")) -class VectorBase extends Pointer { - - protected val ptrs = new ArrayBuffer[Pointer]() - - override def deallocate(deallocate: Boolean): Unit = { - super.deallocate(deallocate) - ptrs.foreach(_.close()) - } - - // size of the vec elements - @native @Const def size(): Int - - // size of the vec elements + padding - @native @Const def internal_size(): Int - - // handle to the vec element buffer - @native @Const @ByRef def handle: MemHandle - -// // add this operator in for tests many more can be added -// @Name(Array("operator* ")) -// @native def *(i: Int): VectorMultExpression - - -} - -
