Repository: mahout Updated Branches: refs/heads/master e74c478d2 -> c17bee3c2
MAHOUT-1988 Make Native Solvers Scala 2.11 Complient closes apache/mahout#326 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/c17bee3c Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/c17bee3c Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/c17bee3c Branch: refs/heads/master Commit: c17bee3c2705495b638d81ae2ad374bf7494c3f3 Parents: e74c478 Author: rawkintrevo <[email protected]> Authored: Mon Jun 26 16:39:14 2017 -0500 Committer: rawkintrevo <[email protected]> Committed: Mon Jun 26 16:39:14 2017 -0500 ---------------------------------------------------------------------- .travis.yml | 38 ++++++++++---------- .../openmp/javacpp/CompressedMatrix.scala | 14 ++++++-- .../openmp/javacpp/DenseColumnMatrix.scala | 16 +++++++-- .../openmp/javacpp/DenseRowMatrix.scala | 16 +++++++-- .../viennacl/openmp/javacpp/VCLVector.scala | 19 +++++++--- .../opencl/javacpp/CompressedMatrix.scala | 14 ++++++-- .../opencl/javacpp/DenseColumnMatrix.scala | 16 +++++++-- .../opencl/javacpp/DenseRowMatrix.scala | 16 +++++++-- .../viennacl/opencl/javacpp/VCLVector.scala | 19 +++++++--- 9 files changed, 127 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 9caca6e..fdcb2ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,40 +43,40 @@ env: matrix: include: # Build Spark 1.6.3 , Scala 2.10 - - jdk: "oraclejdk7" + - jdk: "openjdk7" env: PROFILES="${PROFILES}" SPARK_BIN=$SPARK_1_6 # Build Spark 2.0.2 , Scala 2.11 - replace -D... with profiles when available - - jdk: "oraclejdk7" + - jdk: "openjdk7" env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11" SPARK_BIN=$SPARK_2_0 # Build Spark 2.1.0 , Scala 2.11 - replace -D... with profiles when available - - jdk: "oraclejdk7" + - jdk: "openjdk7" env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11" SPARK_BIN=$SPARK_2_1 # Build Spark 1.6.3 , Scala 2.10, ViennaCL - - jdk: "oraclejdk7" + - jdk: "openjdk7" env: PROFILES="${PROFILES} -Pviennacl" SPARK_BIN=$SPARK_1_6 -# # Build Spark 2.0.2 , Scala 2.11, ViennaCL - replace -D... with profiles when available -# - jdk: "oraclejdk7" -# env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl" -# -# # Build Spark 2.1.0 , Scala 2.11, ViennaCL - replace -D... with profiles when available -# - jdk: "oraclejdk7" -# env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl" + # Build Spark 2.0.2 , Scala 2.11, ViennaCL - replace -D... with profiles when available + - jdk: "openjdk7" + env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl" SPARK_BIN=$SPARK_2_0 + + # Build Spark 2.1.0 , Scala 2.11, ViennaCL - replace -D... with profiles when available + - jdk: "openjdk7" + env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl" SPARK_BIN=$SPARK_2_1 # Build Spark 1.6.3 , Scala 2.10, ViennaCL-OMP - - jdk: "oraclejdk7" + - jdk: "openjdk7" env: PROFILES="${PROFILES} -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_1_6 -# # Build Spark 2.0.2 , Scala 2.11, ViennaCL-OMP - replace -D... with profiles when available -# - jdk: "oraclejdk7" -# env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" -# -# # Build Spark 2.1.0 , Scala 2.11, ViennaCL-OMP - replace -D... with profiles when available -# - jdk: "oraclejdk7" -# env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" + # Build Spark 2.0.2 , Scala 2.11, ViennaCL-OMP - replace -D... with profiles when available + - jdk: "openjdk7" + env: PROFILES="${PROFILES} -Dspark.version=2.0.2 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_0 + + # Build Spark 2.1.0 , Scala 2.11, ViennaCL-OMP - replace -D... with profiles when available + - jdk: "openjdk7" + env: PROFILES="${PROFILES} -Dspark.version=2.1.0 -Dscala.version=2.11.8 -Dscala.compat.version=2.11 -Pviennacl-omp" TEST_MODULES="${TEST_MODULES},viennacl-omp" SPARK_BIN=$SPARK_2_1 git: depth: 10 http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala index 72f9fad..3c5a6eb 100644 --- a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala +++ b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/CompressedMatrix.scala @@ -46,12 +46,22 @@ final class CompressedMatrix(defaultCtr: Boolean = true) extends Pointer { if (defaultCtr) allocate() - def this(nrow: Int, ncol: Int, ctx: Context = new Context) { + 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, ctx: Context = new Context) { + 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) } http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala index eeab17b..71bdab2 100644 --- a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala +++ b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseColumnMatrix.scala @@ -36,12 +36,24 @@ import org.bytedeco.javacpp.annotation._ @Name(Array("viennacl::matrix<double,viennacl::column_major>")) final class DenseColumnMatrix(initDefault:Boolean = true) extends MatrixBase { - def this(nrow: Int, ncol: Int, ctx: Context = new Context()) { + 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, ctx: Context = new Context(Context.MAIN_MEMORY)) { + 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. http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala index 3281465..7bbd3a0 100644 --- a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala +++ b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/DenseRowMatrix.scala @@ -13,12 +13,24 @@ import org.bytedeco.javacpp.annotation._ @Name(Array("viennacl::matrix<double,viennacl::row_major>")) class DenseRowMatrix(initDefault: Boolean = true) extends MatrixBase { - def this(nrow: Int, ncol: Int, ctx: Context = new Context()) { + 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, ctx: Context = new Context(Context.MAIN_MEMORY)) { + 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. http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala ---------------------------------------------------------------------- diff --git a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala index 987c947..33947ec 100644 --- a/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala +++ b/viennacl-omp/src/main/scala/org/apache/mahout/viennacl/openmp/javacpp/VCLVector.scala @@ -18,12 +18,12 @@ final class VCLVector(defaultCtr: Boolean = true) extends VectorBase { allocate() } - def this(i: Int){ + def this(size: Int) { this(false) - allocate(i) + allocate(size, new Context(Context.MAIN_MEMORY)) } - def this(size: Int, ctx: Context = new Context(Context.MAIN_MEMORY)) { + def this(size: Int, ctx: Context ) { this(false) allocate(size, ctx) } @@ -48,9 +48,18 @@ final class VCLVector(defaultCtr: Boolean = true) extends VectorBase { 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 = 0, - stride: Int = 1) { + start: Int, + stride: Int) { this(false) allocate(ptr_to_mem, mem_type, vec_size, start, stride) http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/CompressedMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/CompressedMatrix.scala b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/CompressedMatrix.scala index 5a84ac5..3fcf9ee 100644 --- a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/CompressedMatrix.scala +++ b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/CompressedMatrix.scala @@ -46,12 +46,22 @@ final class CompressedMatrix(defaultCtr: Boolean = true) extends Pointer { if (defaultCtr) allocate() - def this(nrow: Int, ncol: Int, ctx: Context = new Context) { + 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, ctx: Context = new Context) { + 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) } http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseColumnMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseColumnMatrix.scala b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseColumnMatrix.scala index 7b268e3..f12b5c7 100644 --- a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseColumnMatrix.scala +++ b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseColumnMatrix.scala @@ -36,12 +36,24 @@ import org.bytedeco.javacpp.annotation._ @Name(Array("viennacl::matrix<double,viennacl::column_major>")) final class DenseColumnMatrix(initDefault:Boolean = true) extends MatrixBase { - def this(nrow: Int, ncol: Int, ctx: Context = new Context()) { + 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, ctx: Context = new Context(Context.MAIN_MEMORY)) { + 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. http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseRowMatrix.scala ---------------------------------------------------------------------- diff --git a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseRowMatrix.scala b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseRowMatrix.scala index b353924..7014cb2 100644 --- a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseRowMatrix.scala +++ b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/DenseRowMatrix.scala @@ -31,12 +31,24 @@ import scala.collection.mutable.ArrayBuffer @Name(Array("viennacl::matrix<double,viennacl::row_major>")) class DenseRowMatrix(initDefault: Boolean = true) extends MatrixBase { - def this(nrow: Int, ncol: Int, ctx: Context = new Context()) { + 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, ctx: Context = new Context(Context.MAIN_MEMORY)) { + 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. http://git-wip-us.apache.org/repos/asf/mahout/blob/c17bee3c/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/VCLVector.scala ---------------------------------------------------------------------- diff --git a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/VCLVector.scala b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/VCLVector.scala index 3926980..4d69a10 100644 --- a/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/VCLVector.scala +++ b/viennacl/src/main/scala/org/apache/mahout/viennacl/opencl/javacpp/VCLVector.scala @@ -36,12 +36,12 @@ final class VCLVector(defaultCtr: Boolean = true) extends VectorBase { allocate() } - def this(i: Int){ + def this(size: Int) { this(false) - allocate(i) + allocate(size, new Context(Context.MAIN_MEMORY)) } - def this(size: Int, ctx: Context = new Context(Context.MAIN_MEMORY)) { + def this(size: Int, ctx: Context ) { this(false) allocate(size, ctx) } @@ -66,9 +66,18 @@ final class VCLVector(defaultCtr: Boolean = true) extends VectorBase { 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 = 0, - stride: Int = 1) { + start: Int, + stride: Int) { this(false) allocate(ptr_to_mem, mem_type, vec_size, start, stride)
