Merge pull request #2144 from peastman/globals

Avoid unnecessary uploads of global parameters

Merge pull request #2144 from peastman/globals
Avoid unnecessary uploads of global parameters
24552e48 · peastman · GitHub · 24add559 · 595059ce · 24552e48
Unverified Commit 24552e48 authored Aug 10, 2018 by peastman Committed by GitHub Aug 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

platforms/opencl/src/OpenCLKernels.cpp platforms/opencl/src/OpenCLKernels.cpp +1 -0

No files found.
--- a/platforms/cuda/src/CudaKernels.cpp
+++ b/platforms/cuda/src/CudaKernels.cpp
@@ -7913,6 +7913,7 @@ void CudaIntegrateCustomStepKernel::execute(ContextImpl& context, CustomIntegrat
            // Upload the global values to the device.
            globalValues.upload(localGlobalValues, true);
+            deviceGlobalsAreCurrent = true;
        }
        bool stepInvalidatesForces = invalidatesForces[step];
        if (stepType[step] == CustomIntegrator::ComputePerDof && !merged[step]) {

--- a/platforms/opencl/src/OpenCLKernels.cpp
+++ b/platforms/opencl/src/OpenCLKernels.cpp
@@ -8300,6 +8300,7 @@ void OpenCLIntegrateCustomStepKernel::execute(ContextImpl& context, CustomIntegr
            // Upload the global values to the device.
            globalValues.upload(localGlobalValues, true, true);
+            deviceGlobalsAreCurrent = true;
        }
        bool stepInvalidatesForces = invalidatesForces[step];
        if (stepType[step] == CustomIntegrator::ComputePerDof && !merged[step]) {