From 7e3c36fb2bfc61c64dc0632157973940b5528896 Mon Sep 17 00:00:00 2001 From: Meisam Fathi Salmi Date: Thu, 30 Oct 2014 14:02:06 -0400 Subject: [PATCH] #7: Clean up the println statements from the code Task-Url: http://github.com/meisam/spark/issues/issue/7 --- .../org/apache/spark/rdd/GpuFilteredPartition.scala | 10 ---------- .../main/scala/org/apache/spark/rdd/GpuPartition.scala | 8 -------- .../apache/spark/gpu/GpuFilteredPartitionSuit.scala | 2 -- 3 files changed, 20 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/rdd/GpuFilteredPartition.scala b/core/src/main/scala/org/apache/spark/rdd/GpuFilteredPartition.scala index 58d99a0e15dcb..d7bce8b7e2a98 100644 --- a/core/src/main/scala/org/apache/spark/rdd/GpuFilteredPartition.scala +++ b/core/src/main/scala/org/apache/spark/rdd/GpuFilteredPartition.scala @@ -11,10 +11,7 @@ class GpuFilteredPartition[T <: Product : ClassTag, U: ClassTag : TypeTag] extends GpuPartition[T](context, columnTypes, capacity) { override def fill(iter: Iterator[T]): Unit = { - val startTransformDataTime = System.nanoTime super.fill(iter) - val endTransformDataTime = System.nanoTime - val startSelectionTotalTime = System.nanoTime val resultSize = filter[U](colIndex, value, operation) intData.zipWithIndex.filter(_._1 != null).foreach({ @@ -67,13 +64,6 @@ class GpuFilteredPartition[T <: Product : ClassTag, U: ClassTag : TypeTag] } }) size = resultSize - val endSelectionTotalTime = System.nanoTime - - val totalTime = endSelectionTotalTime - startTransformDataTime - println("Test with size=%,12d".format(size)) - println("Total transform time (ns) to copy %,12d elements of data = %,12d".format(-1, endTransformDataTime - startTransformDataTime)) - println("Selection time (ns) = %,12d".format(endSelectionTotalTime - startSelectionTotalTime)) - println("Total selection time (ns) = %,12d".format(totalTime)) } } diff --git a/core/src/main/scala/org/apache/spark/rdd/GpuPartition.scala b/core/src/main/scala/org/apache/spark/rdd/GpuPartition.scala index d4d4b2747b224..41436884c3204 100644 --- a/core/src/main/scala/org/apache/spark/rdd/GpuPartition.scala +++ b/core/src/main/scala/org/apache/spark/rdd/GpuPartition.scala @@ -335,11 +335,7 @@ class GpuPartition[T <: Product : ClassTag] } def prescanArray(outArray: cl_mem, inArray: cl_mem, numElements: Int) { - val prefixsumStartTime = System.nanoTime prescanArrayRecursive(outArray, inArray, numElements, 0, 0) - val prefixsumEndTime = System.nanoTime - - println("Prefix Sum time = %,12d".format(prefixsumEndTime - prefixsumStartTime)) } def scanImpl(d_input: cl_mem, rLen: Int, d_output: cl_mem) { @@ -445,7 +441,6 @@ class GpuPartition[T <: Product : ClassTag] def filter[V: ClassTag : TypeTag](columnIndex: Int, value: V, operation: ComparisonOperation.Value): Int = { - val start: Long = System.nanoTime val tupleNum = this.size gpuCol = createReadWriteBuffer[V](tupleNum) @@ -477,9 +472,7 @@ class GpuPartition[T <: Product : ClassTag] clSetKernelArg(kernel, 2, Sizeof.cl_mem, Pointer.to(gpuCount)) clEnqueueNDRangeKernel(context.getOpenCLQueue, kernel, 1, null, global_work_size, local_work_size, 0, null, null) - val startPsum = System.nanoTime() scanImpl(gpuCount, globalSize, gpuPsum) - val endPsum = System.nanoTime() val tmp1 = Array[Int](0) val tmp2 = Array[Int](0) @@ -489,7 +482,6 @@ class GpuPartition[T <: Product : ClassTag] deviceToHostCopy[Int](gpuPsum, pointer(tmp2), 1, globalSize - 1) resCount = tmp1(0) + tmp2(0) - val end: Long = System.nanoTime resCount } diff --git a/core/src/test/scala/org/apache/spark/gpu/GpuFilteredPartitionSuit.scala b/core/src/test/scala/org/apache/spark/gpu/GpuFilteredPartitionSuit.scala index 214147ffc5dc5..8af3f299601b1 100644 --- a/core/src/test/scala/org/apache/spark/gpu/GpuFilteredPartitionSuit.scala +++ b/core/src/test/scala/org/apache/spark/gpu/GpuFilteredPartitionSuit.scala @@ -132,8 +132,6 @@ class GpuFilteredPartitionSuit extends FunSuite with SharedSparkContext { (v.toLong, ((i % 3) == 0)) }).toArray - println(testData.mkString(",")) - println("----------") val gpuPartition = new GpuFilteredPartition[(Long, Boolean), Long](openCLContext, Array("LONG", "BOOLEAN"), 0, ComparisonOperation.<=, START + 5L, DEFAULT_CAPACITY) gpuPartition.fill(testData.toIterator)