Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
f12cb008
Commit
f12cb008
authored
Apr 21, 2016
by
Peter Eastman
Browse files
Unified names of platform properties
parent
95584c96
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
15 additions
and
15 deletions
+15
-15
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaPiTorsionForce.cpp
...eba/platforms/cuda/tests/TestCudaAmoebaPiTorsionForce.cpp
+1
-1
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaStretchBendForce.cpp
...a/platforms/cuda/tests/TestCudaAmoebaStretchBendForce.cpp
+1
-1
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaTorsionTorsionForce.cpp
...latforms/cuda/tests/TestCudaAmoebaTorsionTorsionForce.cpp
+1
-1
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaVdwForce.cpp
...ns/amoeba/platforms/cuda/tests/TestCudaAmoebaVdwForce.cpp
+1
-1
plugins/amoeba/platforms/cuda/tests/TestCudaWcaDispersionForce.cpp
...moeba/platforms/cuda/tests/TestCudaWcaDispersionForce.cpp
+1
-1
plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
+1
-1
plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
.../platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
+1
-1
plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
...drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
+2
-2
plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
...ins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
+1
-1
plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
...tforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
+1
-1
plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
...e/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
+2
-2
plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
+1
-1
plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
+1
-1
No files found.
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaPiTorsionForce.cpp
View file @
f12cb008
...
@@ -328,7 +328,7 @@ int main(int argc, char* argv[]) {
...
@@ -328,7 +328,7 @@ int main(int argc, char* argv[]) {
std
::
cout
<<
"TestCudaAmoebaPiTorsionForce running test..."
<<
std
::
endl
;
std
::
cout
<<
"TestCudaAmoebaPiTorsionForce running test..."
<<
std
::
endl
;
registerAmoebaCudaKernelFactories
();
registerAmoebaCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
testOnePiTorsion
();
testOnePiTorsion
();
testPeriodic
();
testPeriodic
();
}
catch
(
const
std
::
exception
&
e
)
{
}
catch
(
const
std
::
exception
&
e
)
{
...
...
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaStretchBendForce.cpp
View file @
f12cb008
...
@@ -306,7 +306,7 @@ int main(int argc, char* argv[]) {
...
@@ -306,7 +306,7 @@ int main(int argc, char* argv[]) {
std
::
cout
<<
"TestCudaAmoebaStretchBendForce running test..."
<<
std
::
endl
;
std
::
cout
<<
"TestCudaAmoebaStretchBendForce running test..."
<<
std
::
endl
;
registerAmoebaCudaKernelFactories
();
registerAmoebaCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
testOneStretchBend
();
testOneStretchBend
();
testPeriodic
();
testPeriodic
();
}
catch
(
const
std
::
exception
&
e
)
{
}
catch
(
const
std
::
exception
&
e
)
{
...
...
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaTorsionTorsionForce.cpp
View file @
f12cb008
...
@@ -2711,7 +2711,7 @@ int main(int argc, char* argv[]) {
...
@@ -2711,7 +2711,7 @@ int main(int argc, char* argv[]) {
std
::
cout
<<
"TestCudaAmoebaTorsionTorsionForce running test..."
<<
std
::
endl
;
std
::
cout
<<
"TestCudaAmoebaTorsionTorsionForce running test..."
<<
std
::
endl
;
registerAmoebaCudaKernelFactories
();
registerAmoebaCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
testTorsionTorsion
(
1
);
testTorsionTorsion
(
1
);
testPeriodic
();
testPeriodic
();
}
catch
(
const
std
::
exception
&
e
)
{
}
catch
(
const
std
::
exception
&
e
)
{
...
...
plugins/amoeba/platforms/cuda/tests/TestCudaAmoebaVdwForce.cpp
View file @
f12cb008
...
@@ -2015,7 +2015,7 @@ int main(int argc, char* argv[]) {
...
@@ -2015,7 +2015,7 @@ int main(int argc, char* argv[]) {
std
::
cout
<<
"TestCudaAmoebaVdwForce running test..."
<<
std
::
endl
;
std
::
cout
<<
"TestCudaAmoebaVdwForce running test..."
<<
std
::
endl
;
registerAmoebaCudaKernelFactories
();
registerAmoebaCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
testVdw
();
testVdw
();
...
...
plugins/amoeba/platforms/cuda/tests/TestCudaWcaDispersionForce.cpp
View file @
f12cb008
...
@@ -172,7 +172,7 @@ int main(int argc, char* argv[]) {
...
@@ -172,7 +172,7 @@ int main(int argc, char* argv[]) {
std
::
cout
<<
"TestCudaAmoebaWcaDispersionForce running test..."
<<
std
::
endl
;
std
::
cout
<<
"TestCudaAmoebaWcaDispersionForce running test..."
<<
std
::
endl
;
registerAmoebaCudaKernelFactories
();
registerAmoebaCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
// test Wca dispersion force using two ammonia molecules
// test Wca dispersion force using two ammonia molecules
...
...
plugins/drude/platforms/cuda/tests/TestCudaDrudeForce.cpp
View file @
f12cb008
...
@@ -197,7 +197,7 @@ int main(int argc, char* argv[]) {
...
@@ -197,7 +197,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerDrudeCudaKernelFactories
();
registerDrudeCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
testSingleParticle
();
testSingleParticle
();
testAnisotropicParticle
();
testAnisotropicParticle
();
testThole
();
testThole
();
...
...
plugins/drude/platforms/cuda/tests/TestCudaDrudeLangevinIntegrator.cpp
View file @
f12cb008
...
@@ -183,7 +183,7 @@ int main(int argc, char* argv[]) {
...
@@ -183,7 +183,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerDrudeCudaKernelFactories
();
registerDrudeCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
string
(
argv
[
1
]));
testSinglePair
();
testSinglePair
();
testWater
();
testWater
();
}
}
...
...
plugins/drude/platforms/cuda/tests/TestCudaDrudeSCFIntegrator.cpp
View file @
f12cb008
...
@@ -110,7 +110,7 @@ void testWater() {
...
@@ -110,7 +110,7 @@ void testWater() {
State
state
=
context
.
getState
(
State
::
Energy
);
State
state
=
context
.
getState
(
State
::
Energy
);
double
initialEnergy
;
double
initialEnergy
;
int
numSteps
=
1000
;
int
numSteps
=
1000
;
double
maxNorm
=
(
platform
.
getPropertyValue
(
context
,
"
Cuda
Precision"
)
==
"double"
?
1.0
:
5.0
);
double
maxNorm
=
(
platform
.
getPropertyValue
(
context
,
"Precision"
)
==
"double"
?
1.0
:
5.0
);
for
(
int
i
=
0
;
i
<
numSteps
;
i
++
)
{
for
(
int
i
=
0
;
i
<
numSteps
;
i
++
)
{
integ
.
step
(
1
);
integ
.
step
(
1
);
state
=
context
.
getState
(
State
::
Energy
|
State
::
Forces
);
state
=
context
.
getState
(
State
::
Energy
|
State
::
Forces
);
...
@@ -131,7 +131,7 @@ int main(int argc, char* argv[]) {
...
@@ -131,7 +131,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerDrudeCudaKernelFactories
();
registerDrudeCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
string
(
argv
[
1
]));
testWater
();
testWater
();
}
}
catch
(
const
std
::
exception
&
e
)
{
catch
(
const
std
::
exception
&
e
)
{
...
...
plugins/drude/platforms/opencl/tests/TestOpenCLDrudeForce.cpp
View file @
f12cb008
...
@@ -197,7 +197,7 @@ int main(int argc, char* argv[]) {
...
@@ -197,7 +197,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerDrudeOpenCLKernelFactories
();
registerDrudeOpenCLKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"
OpenCL
Precision"
,
std
::
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"Precision"
,
std
::
string
(
argv
[
1
]));
testSingleParticle
();
testSingleParticle
();
testAnisotropicParticle
();
testAnisotropicParticle
();
testThole
();
testThole
();
...
...
plugins/drude/platforms/opencl/tests/TestOpenCLDrudeLangevinIntegrator.cpp
View file @
f12cb008
...
@@ -183,7 +183,7 @@ int main(int argc, char* argv[]) {
...
@@ -183,7 +183,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerDrudeOpenCLKernelFactories
();
registerDrudeOpenCLKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"
OpenCL
Precision"
,
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"Precision"
,
string
(
argv
[
1
]));
testSinglePair
();
testSinglePair
();
testWater
();
testWater
();
}
}
...
...
plugins/drude/platforms/opencl/tests/TestOpenCLDrudeSCFIntegrator.cpp
View file @
f12cb008
...
@@ -110,7 +110,7 @@ void testWater() {
...
@@ -110,7 +110,7 @@ void testWater() {
State
state
=
context
.
getState
(
State
::
Energy
);
State
state
=
context
.
getState
(
State
::
Energy
);
double
initialEnergy
;
double
initialEnergy
;
int
numSteps
=
1000
;
int
numSteps
=
1000
;
double
maxNorm
=
(
platform
.
getPropertyValue
(
context
,
"
OpenCL
Precision"
)
==
"double"
?
1.0
:
5.0
);
double
maxNorm
=
(
platform
.
getPropertyValue
(
context
,
"Precision"
)
==
"double"
?
1.0
:
5.0
);
for
(
int
i
=
0
;
i
<
numSteps
;
i
++
)
{
for
(
int
i
=
0
;
i
<
numSteps
;
i
++
)
{
integ
.
step
(
1
);
integ
.
step
(
1
);
state
=
context
.
getState
(
State
::
Energy
|
State
::
Forces
);
state
=
context
.
getState
(
State
::
Energy
|
State
::
Forces
);
...
@@ -131,7 +131,7 @@ int main(int argc, char* argv[]) {
...
@@ -131,7 +131,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerDrudeOpenCLKernelFactories
();
registerDrudeOpenCLKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"
OpenCL
Precision"
,
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"Precision"
,
string
(
argv
[
1
]));
testWater
();
testWater
();
}
}
catch
(
const
std
::
exception
&
e
)
{
catch
(
const
std
::
exception
&
e
)
{
...
...
plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp
View file @
f12cb008
...
@@ -554,7 +554,7 @@ int main(int argc, char* argv[]) {
...
@@ -554,7 +554,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerRPMDCudaKernelFactories
();
registerRPMDCudaKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"
Cuda
Precision"
,
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"CUDA"
).
setPropertyDefaultValue
(
"Precision"
,
string
(
argv
[
1
]));
testFreeParticles
();
testFreeParticles
();
testParaHydrogen
();
testParaHydrogen
();
testCMMotionRemoval
();
testCMMotionRemoval
();
...
...
plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp
View file @
f12cb008
...
@@ -555,7 +555,7 @@ int main(int argc, char* argv[]) {
...
@@ -555,7 +555,7 @@ int main(int argc, char* argv[]) {
try
{
try
{
registerRPMDOpenCLKernelFactories
();
registerRPMDOpenCLKernelFactories
();
if
(
argc
>
1
)
if
(
argc
>
1
)
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"
OpenCL
Precision"
,
string
(
argv
[
1
]));
Platform
::
getPlatformByName
(
"OpenCL"
).
setPropertyDefaultValue
(
"Precision"
,
string
(
argv
[
1
]));
testFreeParticles
();
testFreeParticles
();
testParaHydrogen
();
testParaHydrogen
();
testCMMotionRemoval
();
testCMMotionRemoval
();
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment