Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "e4e94dbcb467a22b9643edbb8abeafe6e050f62f"
Commit 8a762772 authored by peastman's avatar peastman
Browse files

Merge pull request #1091 from rmcgibbo/osx-opencl 

Fix OpenCL platform on low-end devices
parents 14bd3629 8ae2eba5
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
platforms/opencl/src/kernels/nonbonded.cl
View file @ 8a762772
...@@ -126,7 +126,7 @@ __kernel void computeNonbonded( ...@@ -126,7 +126,7 @@ __kernel void computeNonbonded(
#endif #endif
real r2 = delta.x*delta.x + delta.y*delta.y + delta.z*delta.z; real r2 = delta.x*delta.x + delta.y*delta.y + delta.z*delta.z;
#ifdef PRUNE_BY_CUTOFF #ifdef PRUNE_BY_CUTOFF
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
#endif #endif
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
...@@ -300,7 +300,7 @@ __kernel void computeNonbonded( ...@@ -300,7 +300,7 @@ __kernel void computeNonbonded(
real4 delta = (real4) (posq2.xyz - posq1.xyz, 0); real4 delta = (real4) (posq2.xyz - posq1.xyz, 0);
real r2 = delta.x*delta.x + delta.y*delta.y + delta.z*delta.z; real r2 = delta.x*delta.x + delta.y*delta.y + delta.z*delta.z;
#ifdef PRUNE_BY_CUTOFF #ifdef PRUNE_BY_CUTOFF
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
#endif #endif
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
...@@ -352,7 +352,7 @@ __kernel void computeNonbonded( ...@@ -352,7 +352,7 @@ __kernel void computeNonbonded(
#endif #endif
real r2 = delta.x*delta.x + delta.y*delta.y + delta.z*delta.z; real r2 = delta.x*delta.x + delta.y*delta.y + delta.z*delta.z;
#ifdef PRUNE_BY_CUTOFF #ifdef PRUNE_BY_CUTOFF
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
#endif #endif
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
......
platforms/opencl/src/kernels/nonbonded_cpu.cl
View file @ 8a762772
...@@ -70,7 +70,7 @@ __kernel void computeNonbonded( ...@@ -70,7 +70,7 @@ __kernel void computeNonbonded(
#endif #endif
real r2 = dot(delta.xyz, delta.xyz); real r2 = dot(delta.xyz, delta.xyz);
#ifdef USE_CUTOFF #ifdef USE_CUTOFF
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
#endif #endif
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
...@@ -138,7 +138,7 @@ __kernel void computeNonbonded( ...@@ -138,7 +138,7 @@ __kernel void computeNonbonded(
#endif #endif
real r2 = dot(delta.xyz, delta.xyz); real r2 = dot(delta.xyz, delta.xyz);
#ifdef USE_CUTOFF #ifdef USE_CUTOFF
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
#endif #endif
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
...@@ -304,7 +304,7 @@ __kernel void computeNonbonded( ...@@ -304,7 +304,7 @@ __kernel void computeNonbonded(
real4 posq2 = (real4) (localData[j].x, localData[j].y, localData[j].z, localData[j].q); real4 posq2 = (real4) (localData[j].x, localData[j].y, localData[j].z, localData[j].q);
real4 delta = (real4) (posq2.xyz - posq1.xyz, 0); real4 delta = (real4) (posq2.xyz - posq1.xyz, 0);
real r2 = dot(delta.xyz, delta.xyz); real r2 = dot(delta.xyz, delta.xyz);
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
unsigned int atom2 = j; unsigned int atom2 = j;
...@@ -367,7 +367,7 @@ __kernel void computeNonbonded( ...@@ -367,7 +367,7 @@ __kernel void computeNonbonded(
#endif #endif
real r2 = dot(delta.xyz, delta.xyz); real r2 = dot(delta.xyz, delta.xyz);
#ifdef USE_CUTOFF #ifdef USE_CUTOFF
if (r2 < CUTOFF_SQUARED) { if (r2 < MAX_CUTOFF*MAX_CUTOFF) {
#endif #endif
real invR = RSQRT(r2); real invR = RSQRT(r2);
real r = r2*invR; real r = r2*invR;
......
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