Fixed error using tabulated functions with a CustomGBForce

596be80f · Peter Eastman · 30592159 · 596be80f · 596be80f
Commit 596be80f authored Jan 23, 2019 by Peter Eastman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

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

No files found.
--- a/platforms/cuda/src/CudaKernels.cpp
+++ b/platforms/cuda/src/CudaKernels.cpp
@@ -4100,6 +4100,8 @@ double CudaCalcCustomGBForceKernel::execute(ContextImpl& context, bool includeFo
                    for (auto& buffer : d->getBuffers())
                        gradientChainRuleArgs.push_back(&buffer.getMemory());
            }
+            for (auto& function : tabulatedFunctions)
+                gradientChainRuleArgs.push_back(&function.getDevicePointer());
        }
    }
    if (globals.isInitialized()) {

--- a/platforms/opencl/src/OpenCLKernels.cpp
+++ b/platforms/opencl/src/OpenCLKernels.cpp
@@ -4365,6 +4365,8 @@ double OpenCLCalcCustomGBForceKernel::execute(ContextImpl& context, bool include
                    for (auto& buffer : d->getBuffers())
                        gradientChainRuleKernel.setArg<cl::Memory>(index++, buffer.getMemory());
            }
+            for (auto& function : tabulatedFunctions)
+                gradientChainRuleKernel.setArg<cl::Buffer>(index++, function.getDeviceBuffer());
        }
    }
    if (globals.isInitialized()) {