Merge pull request #937 from peastman/cufft

Disabled PME stream on CUDA 7

Merge pull request #937 from peastman/cufft
Disabled PME stream on CUDA 7
50442b0a · peastman · c9fc6ed8 · 1b1ea94f · 50442b0a
Commit 50442b0a authored May 28, 2015 by peastman
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

platforms/cuda/src/CudaKernels.cpp platforms/cuda/src/CudaKernels.cpp +1 -1

No files found.
--- a/platforms/cuda/src/CudaKernels.cpp
+++ b/platforms/cuda/src/CudaKernels.cpp
@@ -1719,7 +1719,7 @@ void CudaCalcNonbondedForceKernel::initialize(const System& system, const Nonbon
                
                int cufftVersion;
                cufftGetVersion(&cufftVersion);
-                usePmeStream = (cu.getComputeCapability() < 5.0 && numParticles < 130000 && cufftVersion >= 6000); // Workarounds for various CUDA bugs
+                usePmeStream = (cu.getComputeCapability() < 5.0 && numParticles < 130000 && cufftVersion >= 6000 && cufftVersion != 7000); // Workarounds for various CUDA bugs
                if (usePmeStream) {
                    cuStreamCreate(&pmeStream, CU_STREAM_NON_BLOCKING);
                    cufftSetStream(fftForward, pmeStream);