Merge pull request #2205 from peastman/setstream

Fixed potential uninitialized memory error setting up PME stream

Merge pull request #2205 from peastman/setstream
Fixed potential uninitialized memory error setting up PME stream
09537426 · peastman · GitHub · 689e2bc9 · 0e821614 · 09537426
Unverified Commit 09537426 authored Nov 11, 2018 by peastman Committed by GitHub Nov 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

platforms/cuda/src/CudaKernels.cpp platforms/cuda/src/CudaKernels.cpp +4 -2

No files found.
--- a/platforms/cuda/src/CudaKernels.cpp
+++ b/platforms/cuda/src/CudaKernels.cpp
@@ -1859,8 +1859,10 @@ void CudaCalcNonbondedForceKernel::initialize(const System& system, const Nonbon
                    if (useCudaFFT) {
                        cufftSetStream(fftForward, pmeStream);
                        cufftSetStream(fftBackward, pmeStream);
-                        cufftSetStream(dispersionFftForward, pmeStream);
-                        cufftSetStream(dispersionFftBackward, pmeStream);
+                        if (doLJPME) {
+                            cufftSetStream(dispersionFftForward, pmeStream);
+                            cufftSetStream(dispersionFftBackward, pmeStream);
+                        }
                    }
                    CHECK_RESULT(cuEventCreate(&pmeSyncEvent, CU_EVENT_DISABLE_TIMING), "Error creating event for NonbondedForce");
                    CHECK_RESULT(cuEventCreate(&paramsSyncEvent, CU_EVENT_DISABLE_TIMING), "Error creating event for NonbondedForce");