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
8d9ef563
Commit
8d9ef563
authored
Jul 16, 2013
by
peastman
Browse files
Fixed compilation problems on Windows
parent
6c61ddfe
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
16 deletions
+18
-16
plugins/amoeba/platforms/cuda/src/AmoebaCudaKernelFactory.cpp
...ins/amoeba/platforms/cuda/src/AmoebaCudaKernelFactory.cpp
+1
-1
plugins/cpupme/src/CpuPmeKernelFactory.cpp
plugins/cpupme/src/CpuPmeKernelFactory.cpp
+2
-2
plugins/cpupme/src/CpuPmeKernels.cpp
plugins/cpupme/src/CpuPmeKernels.cpp
+6
-4
plugins/drude/platforms/cuda/src/CudaDrudeKernelFactory.cpp
plugins/drude/platforms/cuda/src/CudaDrudeKernelFactory.cpp
+2
-2
plugins/drude/platforms/opencl/src/OpenCLDrudeKernelFactory.cpp
...s/drude/platforms/opencl/src/OpenCLDrudeKernelFactory.cpp
+2
-2
plugins/rpmd/platforms/cuda/src/CudaRpmdKernelFactory.cpp
plugins/rpmd/platforms/cuda/src/CudaRpmdKernelFactory.cpp
+2
-2
plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernelFactory.cpp
...ins/rpmd/platforms/opencl/src/OpenCLRpmdKernelFactory.cpp
+3
-3
No files found.
plugins/amoeba/platforms/cuda/src/AmoebaCudaKernelFactory.cpp
View file @
8d9ef563
...
...
@@ -33,7 +33,7 @@
using
namespace
OpenMM
;
extern
"C"
void
registerPlatforms
()
{
extern
"C"
OPENMM_EXPORT
void
registerPlatforms
()
{
}
extern
"C"
OPENMM_EXPORT
void
registerKernelFactories
()
{
...
...
plugins/cpupme/src/CpuPmeKernelFactory.cpp
View file @
8d9ef563
...
...
@@ -32,10 +32,10 @@
using
namespace
OpenMM
;
extern
"C"
void
registerPlatforms
()
{
extern
"C"
OPENMM_EXPORT_PME
void
registerPlatforms
()
{
}
extern
"C"
void
registerKernelFactories
()
{
extern
"C"
OPENMM_EXPORT_PME
void
registerKernelFactories
()
{
if
(
CpuCalcPmeReciprocalForceKernel
::
isProcessorSupported
())
{
CpuPmeKernelFactory
*
factory
=
new
CpuPmeKernelFactory
();
for
(
int
i
=
0
;
i
<
Platform
::
getNumPlatforms
();
i
++
)
...
...
plugins/cpupme/src/CpuPmeKernels.cpp
View file @
8d9ef563
...
...
@@ -119,8 +119,9 @@ static void spreadCharge(int start, int end, float* posq, float* grid, int gridx
for
(
int
i
=
start
;
i
<
end
;
i
++
)
{
// Find the position relative to the nearest grid point.
__m128
pos
=
_mm_load_ps
(
&
posq
[
4
*
i
]);
__m128
posInBox
=
_mm_sub_ps
(
pos
,
_mm_mul_ps
(
boxSize
,
_mm_floor_ps
(
_mm_mul_ps
(
pos
,
invBoxSize
))));
__m128
pos
=
_mm_loadu_ps
(
&
posq
[
4
*
i
]);
__m128
posFloor
=
_mm_floor_ps
(
_mm_mul_ps
(
pos
,
invBoxSize
));
__m128
posInBox
=
_mm_sub_ps
(
pos
,
_mm_mul_ps
(
boxSize
,
posFloor
));
__m128
t
=
_mm_mul_ps
(
_mm_mul_ps
(
posInBox
,
invBoxSize
),
gridSize
);
__m128i
ti
=
_mm_cvttps_epi32
(
t
);
__m128
dr
=
_mm_sub_ps
(
t
,
_mm_cvtepi32_ps
(
ti
));
...
...
@@ -309,8 +310,9 @@ static void interpolateForces(int start, int end, float* posq, float* force, flo
for
(
int
i
=
start
;
i
<
end
;
i
++
)
{
// Find the position relative to the nearest grid point.
__m128
pos
=
_mm_load_ps
(
&
posq
[
4
*
i
]);
__m128
posInBox
=
_mm_sub_ps
(
pos
,
_mm_mul_ps
(
boxSize
,
_mm_floor_ps
(
_mm_mul_ps
(
pos
,
invBoxSize
))));
__m128
pos
=
_mm_loadu_ps
(
&
posq
[
4
*
i
]);
__m128
posFloor
=
_mm_floor_ps
(
_mm_mul_ps
(
pos
,
invBoxSize
));
__m128
posInBox
=
_mm_sub_ps
(
pos
,
_mm_mul_ps
(
boxSize
,
posFloor
));
__m128
t
=
_mm_mul_ps
(
_mm_mul_ps
(
posInBox
,
invBoxSize
),
gridSize
);
__m128i
ti
=
_mm_cvttps_epi32
(
t
);
__m128
dr
=
_mm_sub_ps
(
t
,
_mm_cvtepi32_ps
(
ti
));
...
...
plugins/drude/platforms/cuda/src/CudaDrudeKernelFactory.cpp
View file @
8d9ef563
...
...
@@ -34,10 +34,10 @@
using
namespace
OpenMM
;
extern
"C"
void
registerPlatforms
()
{
extern
"C"
OPENMM_EXPORT
void
registerPlatforms
()
{
}
extern
"C"
void
registerKernelFactories
()
{
extern
"C"
OPENMM_EXPORT
void
registerKernelFactories
()
{
try
{
Platform
&
platform
=
Platform
::
getPlatformByName
(
"CUDA"
);
CudaDrudeKernelFactory
*
factory
=
new
CudaDrudeKernelFactory
();
...
...
plugins/drude/platforms/opencl/src/OpenCLDrudeKernelFactory.cpp
View file @
8d9ef563
...
...
@@ -34,10 +34,10 @@
using
namespace
OpenMM
;
extern
"C"
void
registerPlatforms
()
{
extern
"C"
OPENMM_EXPORT
void
registerPlatforms
()
{
}
extern
"C"
void
registerKernelFactories
()
{
extern
"C"
OPENMM_EXPORT
void
registerKernelFactories
()
{
try
{
Platform
&
platform
=
Platform
::
getPlatformByName
(
"OpenCL"
);
OpenCLDrudeKernelFactory
*
factory
=
new
OpenCLDrudeKernelFactory
();
...
...
plugins/rpmd/platforms/cuda/src/CudaRpmdKernelFactory.cpp
View file @
8d9ef563
...
...
@@ -34,10 +34,10 @@
using
namespace
OpenMM
;
extern
"C"
void
registerPlatforms
()
{
extern
"C"
OPENMM_EXPORT
void
registerPlatforms
()
{
}
extern
"C"
void
registerKernelFactories
()
{
extern
"C"
OPENMM_EXPORT
void
registerKernelFactories
()
{
try
{
Platform
&
platform
=
Platform
::
getPlatformByName
(
"CUDA"
);
CudaRpmdKernelFactory
*
factory
=
new
CudaRpmdKernelFactory
();
...
...
plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernelFactory.cpp
View file @
8d9ef563
...
...
@@ -28,16 +28,16 @@
#include "OpenCLRpmdKernelFactory.h"
#include "OpenCLRpmdKernels.h"
#include "openmm/internal/windowsExport.h"
#include "openmm/internal/windowsExport
Rpmd
.h"
#include "openmm/internal/ContextImpl.h"
#include "openmm/OpenMMException.h"
using
namespace
OpenMM
;
extern
"C"
void
registerPlatforms
()
{
extern
"C"
OPENMM_EXPORT
void
registerPlatforms
()
{
}
extern
"C"
void
registerKernelFactories
()
{
extern
"C"
OPENMM_EXPORT
void
registerKernelFactories
()
{
try
{
Platform
&
platform
=
Platform
::
getPlatformByName
(
"OpenCL"
);
OpenCLRpmdKernelFactory
*
factory
=
new
OpenCLRpmdKernelFactory
();
...
...
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