Skip to content

Minor changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 8, 2017
Merged

Minor changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8f846b
Restore position after toArray
RevySR Dec 8, 2017
046d0c6
Input points should not be marked as "restrict"
RevySR Dec 8, 2017
086e9f3
Add plugins to select devices
RevySR Dec 8, 2017
30c182c
Fix memory leaks when creating DeviceBuffers
RevySR Dec 8, 2017
aee6e9f
Add Kernel.functionName method
RevySR Dec 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Benchmark/src/test/scala/com/thoughtworks/compute/OpenCLBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,21 @@ object OpenCLBenchmark {

trait TestKernels extends OpenCL with OpenCL.CommandQueuePool {

private implicit def witnessSelf: Witness.Aux[this.type] = Witness.mkWitness(this)

@transient
private[OpenCLBenchmark] lazy val compiledProgram: Program = {

val program = createProgramWithSource(fastraw"""
float sample(global const float* restrict input, const size_t image_index, const ptrdiff_t x, const ptrdiff_t y, const ptrdiff_t width, const ptrdiff_t height) {
float sample(global const float* /*restrict*/ input, const size_t image_index, const ptrdiff_t x, const ptrdiff_t y, const ptrdiff_t width, const ptrdiff_t height) {
if (x >= 0 && x < width && y >= 0 && y < height) {
return input[image_index * width * height, y * width + x];
} else {
return 0.0f;
}
}

kernel void benchmark(global const float* restrict input, global float* restrict output, global const float* restrict weight) {
kernel void benchmark(global const float* /*restrict*/ input, global float* restrict output, global const float* /*restrict*/ weight) {
const size_t image_index = get_global_id(0);
const size_t batch_size = get_global_size(0);
const size_t x = get_global_id(1);
Expand Down
28 changes: 21 additions & 7 deletions Memory/src/main/scala/com/thoughtworks/compute/Memory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ object Memory extends LowPriorityMemory {
override def free(buffer: PointerBuffer): Unit = MemoryUtil.memFree(buffer)

override def toArray(buffer: PointerBuffer): Array[Pointer] = {
val bufferToArray = Array.ofDim[Long](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = Array.ofDim[Long](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray.map { long =>
new Pointer.Default(long) {}
}
Expand Down Expand Up @@ -120,8 +122,10 @@ object Memory extends LowPriorityMemory {
override def put(buffer: IntBuffer, index: Int, value: Int): Unit = buffer.put(index, value)

override def toArray(buffer: IntBuffer): Array[Int] = {
val bufferToArray = Array.ofDim[Int](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = Array.ofDim[Int](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray
}
}
Expand All @@ -144,8 +148,10 @@ object Memory extends LowPriorityMemory {
override def put(buffer: LongBuffer, index: Int, value: Long): Unit = buffer.put(index, value)

override def toArray(buffer: LongBuffer): Array[Long] = {
val bufferToArray = Array.ofDim[Long](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = Array.ofDim[Long](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray
}
}
Expand All @@ -168,8 +174,10 @@ object Memory extends LowPriorityMemory {
override def put(buffer: DoubleBuffer, index: Int, value: Double): Unit = buffer.put(index, value)

override def toArray(buffer: DoubleBuffer): Array[Double] = {
val bufferToArray = Array.ofDim[Double](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = Array.ofDim[Double](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray
}
}
Expand All @@ -192,8 +200,10 @@ object Memory extends LowPriorityMemory {
override def put(buffer: FloatBuffer, index: Int, value: Float): Unit = buffer.put(index, value)

override def toArray(buffer: FloatBuffer): Array[Float] = {
val bufferToArray = new Array[Float](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = new Array[Float](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray
}
}
Expand All @@ -216,8 +226,10 @@ object Memory extends LowPriorityMemory {
override def put(buffer: ByteBuffer, index: Int, value: Byte): Unit = buffer.put(index, value)

override def toArray(buffer: ByteBuffer): Array[Byte] = {
val bufferToArray = Array.ofDim[Byte](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = Array.ofDim[Byte](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray
}
}
Expand All @@ -240,8 +252,10 @@ object Memory extends LowPriorityMemory {
override def put(buffer: ShortBuffer, index: Int, value: Short): Unit = buffer.put(index, value)

override def toArray(buffer: ShortBuffer): Array[Short] = {
val bufferToArray = Array.ofDim[Short](buffer.limit())
val oldPosition = buffer.position()
val bufferToArray = Array.ofDim[Short](buffer.remaining())
buffer.get(bufferToArray, 0, bufferToArray.length)
buffer.position(oldPosition)
bufferToArray
}
}
Expand Down
66 changes: 47 additions & 19 deletions OpenCL/src/main/scala/com/thoughtworks/compute/OpenCL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ object OpenCL {

}

trait UseAllGPUDevice {
trait UseAllGpuDevice {

protected val platformId: Long

Expand All @@ -318,7 +318,7 @@ object OpenCL {
}
}

trait UseFirstGPUDevice {
trait UseFirstGpuDevice {

protected val platformId: Long

Expand All @@ -328,8 +328,18 @@ object OpenCL {
Seq(allDeviceIds.head)
}
}
trait UseFirstCpuDevice {

trait UseAllCPUDevice {
protected val platformId: Long

@transient
protected lazy val deviceIds: Seq[Long] = {
val allDeviceIds = deviceIdsByType(platformId, CL_DEVICE_TYPE_CPU)
Seq(allDeviceIds.head)
}
}

trait UseAllCpuDevice {

protected val platformId: Long

Expand Down Expand Up @@ -435,15 +445,6 @@ object OpenCL {
}

object DeviceBuffer {
private[OpenCL] def delay[Owner <: Singleton with OpenCL, Element](
handle: => Long): Do[DeviceBuffer[Owner, Element]] = {
val bufferContinuation = UnitContinuation.delay {
Resource(value = Success(DeviceBuffer[Owner, Element](handle)), release = UnitContinuation.delay {
checkErrorCode(clReleaseMemObject(handle))
})
}
Do(TryT(ResourceT(bufferContinuation)))
}

implicit def bufferBox[Owner <: Singleton with OpenCL, Element]: Box.Aux[DeviceBuffer[Owner, Element], Pointer] =
new Box[DeviceBuffer[Owner, Element]] {
Expand All @@ -462,11 +463,18 @@ object OpenCL {
* @param handle The underlying `cl_mem`.
* @note comment out extends AnyVal in case of https://github.com/scala/bug/issues/10647
*/
final case class DeviceBuffer[Owner <: OpenCL with Singleton, Element](handle: Long) /* extends AnyVal */ {
final case class DeviceBuffer[Owner <: OpenCL with Singleton, Element](handle: Long) /* extends AnyVal */
extends MonadicCloseable[UnitContinuation] {
deviceBuffer =>

override def monadicClose: UnitContinuation[Unit] = UnitContinuation.delay {
checkErrorCode(clReleaseMemObject(handle))
}

def slice(offset: Int, size: Int)(implicit
memory: Memory[Element]): Do[DeviceBuffer[Owner, Element]] = {
DeviceBuffer.delay {

Do.monadicCloseable {
val stack = stackPush()
try {
val errorCode = stack.ints(0)
Expand All @@ -478,7 +486,7 @@ object OpenCL {
region.address(),
memAddress(errorCode))
checkErrorCode(errorCode.get(0))
newHandle
DeviceBuffer[Owner, Element](newHandle)
} finally {
stack.close()
}
Expand Down Expand Up @@ -585,6 +593,26 @@ object OpenCL {

}

def functionName: String = {
val stack = stackPush()

try {

val functionNameSizePointer = stack.mallocPointer(1)

checkErrorCode(
clGetKernelInfo(this.handle, CL_KERNEL_FUNCTION_NAME, null: PointerBuffer, functionNameSizePointer))
val functionNameSize = functionNameSizePointer.get(0).toInt
val functionNameBuffer = stack.malloc(functionNameSize)

checkErrorCode(
clGetKernelInfo(this.handle, CL_KERNEL_FUNCTION_NAME, functionNameBuffer, functionNameSizePointer))
decodeString(functionNameBuffer)
} finally {
stack.close()
}
}

def enqueue(globalWorkSize: Long*)(implicit witnessOwner: Witness.Aux[Owner]): Do[Event[Owner]] = {
witnessOwner.value.acquireCommandQueue.flatMap { commandQueue =>
Do.monadicCloseable {
Expand Down Expand Up @@ -841,14 +869,14 @@ trait OpenCL extends MonadicCloseable[UnitContinuation] with ImplicitsSingleton
/** Returns an uninitialized buffer of `Element` on device.
*/
def allocateBuffer[Element](size: Long)(implicit memory: Memory[Element]): Do[DeviceBuffer[Element]] =
DeviceBuffer.delay[this.type, Element] {
Do.monadicCloseable {
val stack = stackPush()
try {
val errorCodeBuffer = stack.ints(CL_SUCCESS)
val buffer =
clCreateBuffer(context, CL_MEM_READ_WRITE, memory.numberOfBytesPerElement * size, errorCodeBuffer)
checkErrorCode(errorCodeBuffer.get(0))
buffer
DeviceBuffer[this.type, Element](buffer)
} finally {
stack.pop()
}
Expand All @@ -858,7 +886,7 @@ trait OpenCL extends MonadicCloseable[UnitContinuation] with ImplicitsSingleton
*/
def allocateBufferFrom[Element, HostBuffer](hostBuffer: HostBuffer)(
implicit memory: Memory.Aux[Element, HostBuffer]): Do[DeviceBuffer[Element]] =
DeviceBuffer.delay[this.type, Element] {
Do.monadicCloseable {
val stack = stackPush()
try {
val errorCodeBuffer = stack.ints(CL_SUCCESS)
Expand All @@ -868,7 +896,7 @@ trait OpenCL extends MonadicCloseable[UnitContinuation] with ImplicitsSingleton
memory.address(hostBuffer),
memAddress(errorCodeBuffer))
checkErrorCode(errorCodeBuffer.get(0))
buffer
DeviceBuffer[this.type, Element](buffer)
} finally {
stack.pop()
}
Expand Down