Skip to content

GitLab

Commit bf03b073 authored by peastman's avatar peastman
Browse files

Merge pull request #822 from peastman/master 

Fixed some test cases that were failing
parents 7e4843fd 1ce17590
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
platforms/cuda/src/CudaContext.cpp
View file @ bf03b073
...@@ -77,6 +77,7 @@ CudaContext::CudaContext(const System& system, int deviceIndex, bool useBlocking ...@@ -77,6 +77,7 @@ CudaContext::CudaContext(const System& system, int deviceIndex, bool useBlocking
time(0.0), platformData(platformData), stepCount(0), computeForceCount(0), stepsSinceReorder(99999), contextIsValid(false), atomsWereReordered(false), hasCompilerKernel(false), time(0.0), platformData(platformData), stepCount(0), computeForceCount(0), stepsSinceReorder(99999), contextIsValid(false), atomsWereReordered(false), hasCompilerKernel(false),
pinnedBuffer(NULL), posq(NULL), posqCorrection(NULL), velm(NULL), force(NULL), energyBuffer(NULL), integration(NULL), expression(NULL), bonded(NULL), nonbonded(NULL), thread(NULL) { pinnedBuffer(NULL), posq(NULL), posqCorrection(NULL), velm(NULL), force(NULL), energyBuffer(NULL), integration(NULL), expression(NULL), bonded(NULL), nonbonded(NULL), thread(NULL) {
this->compiler = "\""+compiler+"\""; this->compiler = "\""+compiler+"\"";
if (platformData.context != NULL) {
try { try {
compilerKernel = platformData.context->getPlatform().createKernel(CudaCompilerKernel::Name(), *platformData.context); compilerKernel = platformData.context->getPlatform().createKernel(CudaCompilerKernel::Name(), *platformData.context);
hasCompilerKernel = true; hasCompilerKernel = true;
...@@ -84,6 +85,7 @@ CudaContext::CudaContext(const System& system, int deviceIndex, bool useBlocking ...@@ -84,6 +85,7 @@ CudaContext::CudaContext(const System& system, int deviceIndex, bool useBlocking
catch (...) { catch (...) {
// The runtime compiler plugin isn't available. // The runtime compiler plugin isn't available.
} }
}
if (hostCompiler.size() > 0) if (hostCompiler.size() > 0)
this->compiler = compiler+" --compiler-bindir "+hostCompiler; this->compiler = compiler+" --compiler-bindir "+hostCompiler;
if (!hasInitializedCuda) { if (!hasInitializedCuda) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment