8000 Allow null context in cuCtxSetCurrent by RicheyWorks · Pull Request #52 · jcuda/jcuda · GitHub
[go: up one dir, main page]
Skip to content

Allow null context in cuCtxSetCurrent #52

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

Draft
RicheyWorks wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Allow null context in cuCtxSetCurrent #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
8000 Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions JCudaDriverJNI/src/JCudaDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3011,13 +3011,9 @@ JNIEXPORT jint JNICALL Java_jcuda_driver_JCudaDriver_cuCtxPopCurrentNative
JNIEXPORT jint JNICALL Java_jcuda_driver_JCudaDriver_cuCtxSetCurrentNative
(JNIEnv *env, jclass cls, jobject ctx)
{
if (ctx == NULL)
{
ThrowByName(env, "java/lang/NullPointerException", "Parameter 'ctx' is null for cuCtxSetCurrent");
return JCUDA_INTERNAL_ERROR;
}
Logger::log(LOG_TRACE, "Executing cuCtxSetCurrent\n");

// A null context unbinds the calling thread's current context.
CUcontext nativeCtx = (CUcontext)getNativePointerValue(env, ctx);
int result = cuCtxSetCurrent(nativeCtx);
return result;
Expand Down
100 changes: 100 additions & 0 deletions JCudaJava/src/test/java/jcuda/test/JCudaDriverCurrentContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* JCuda - Java bindings for CUDA
*
* http://www.jcuda.org
*/
package jcuda.test;

import static jcuda.driver.JCudaDriver.cuCtxCreate;
import static jcuda.driver.JCudaDriver.cuCtxDestroy;
import static jcuda.driver.JCudaDriver.cuCtxGetCurrent;
import static jcuda.driver.JCudaDriver.cuCtxSetCurrent;
import static jcuda.driver.JCudaDriver.cuDeviceGet;
import static jcuda.driver.JCudaDriver.cuInit;
import static jcuda.driver.CUresult.CUDA_SUCCESS;
import static org.junit.Assert.assertEquals;

import java.util.concurrent.atomic.AtomicReference;

import org.junit.Test;

import jcuda.driver.CUcontext;
import jcuda.driver.CUdevice;

/** Tests null context handling on isolated CPU threads. No kernels are run. */
public class JCudaDriverCurrentContextTest
{
@Test
public void testNullContextWithEmptyStack() throws InterruptedException
{
onNewThread(new Runnable()
{
@Override
public void run()
{
assertEquals(CUDA_SUCCESS, cuInit(0));
assertEquals(CUDA_SUCCESS, cuCtxSetCurrent(null));
CUcontext current = new CUcontext();
assertEquals(CUDA_SUCCESS, cuCtxGetCurrent(current));
assertEquals(new CUcontext(), current);
}
});
}

@Test
public void testNullContextUnbindsCurrentContext() throws InterruptedException
{
onNewThread(new Runnable()
{
@Override
public void run()
{
assertEquals(CUDA_SUCCESS, cuInit(0));
CUdevice device = new CUdevice();
assertEquals(CUDA_SUCCESS, cuDeviceGet(device, 0));
CUcontext context = new CUcontext();
assertEquals(CUDA_SUCCESS, cuCtxCreate(context, 0, device));
try
{
CUcontext current = new CUcontext();
assertEquals(CUDA_SUCCESS, cuCtxGetCurrent(current));
assertEquals(context, current);
assertEquals(CUDA_SUCCESS, cuCtxSetCurrent(null));
assertEquals(CUDA_SUCCESS, cuCtxGetCurrent(current));
assertEquals(new CUcontext(), current);
}
finally
{
assertEquals(CUDA_SUCCESS, cuCtxDestroy(context));
}
}
});
}

private static void onNewThread(final Runnable action)
throws InterruptedException
{
final AtomicReference<Throwable> failure = new AtomicReference<Throwable>();
Thread thread = new Thread(new Runnable()
{
@Override
public void run()
{
try
{
action.run();
}
catch (Throwable t)
{
failure.set(t);
}
}
}, "JCuda-current-context-test");
thread.start();
thread.join();
if (failure.get() != null)
{
throw new AssertionError("CUDA context test failed", failure.get());
}
}
}
0