Skip to content

GitLab

Commit 45b0302d authored by Peter Eastman's avatar Peter Eastman
Browse files

Hopefully fixed compilation errors on Windows

parent 35c974f6
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 14 deletions
platforms/cuda/sharedTarget/CMakeLists.txt
View file @ 45b0302d
...@@ -14,7 +14,12 @@ CUDA_INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/jama/include) ...@@ -14,7 +14,12 @@ CUDA_INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/jama/include)
CUDA_ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES}) CUDA_ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_LIBRARY_NAME}_d optimized ${OPENMM_LIBRARY_NAME} ${CUFFT_TARGET_LINK}) IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME}_d)
ELSE (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME})
ENDIF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${MAIN_OPENMM_LIB} ${CUFFT_TARGET_LINK})
SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMMCUDA_BUILDING_SHARED_LIBRARY") SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMMCUDA_BUILDING_SHARED_LIBRARY")
INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_TARGET}) INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_TARGET})
platforms/cuda/src/kernels/cudaKernels.h
View file @ 45b0302d
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
#include "gputypes.h" #include "gputypes.h"
// Initialization // Initialization
extern void kClearForces(gpuContext gpu); extern void OPENMMCUDA_EXPORT kClearForces(gpuContext gpu);
extern void kClearEnergy(gpuContext gpu); extern void kClearEnergy(gpuContext gpu);
extern void kClearBornSumAndForces(gpuContext gpu); extern void kClearBornSumAndForces(gpuContext gpu);
extern void kClearObcGbsaBornSum(gpuContext gpu); extern void kClearObcGbsaBornSum(gpuContext gpu);
extern void kCalculateObcGbsaBornSum(gpuContext gpu); extern void OPENMMCUDA_EXPORT kCalculateObcGbsaBornSum(gpuContext gpu);
extern void kReduceObcGbsaBornSum(gpuContext gpu); extern void OPENMMCUDA_EXPORT kReduceObcGbsaBornSum(gpuContext gpu);
extern void kCalculateGBVIBornSum(gpuContext gpu); extern void kCalculateGBVIBornSum(gpuContext gpu);
extern void kReduceGBVIBornSum(gpuContext gpu); extern void kReduceGBVIBornSum(gpuContext gpu);
extern void kClearGBVIBornSum( gpuContext gpu ); extern void kClearGBVIBornSum( gpuContext gpu );
...@@ -73,7 +73,7 @@ extern void kScaleAtomCoordinates(gpuContext gpu, float scale, CUDAStream<int>& ...@@ -73,7 +73,7 @@ extern void kScaleAtomCoordinates(gpuContext gpu, float scale, CUDAStream<int>&
extern void kApplyConstraints(gpuContext gpu); extern void kApplyConstraints(gpuContext gpu);
// Extras // Extras
extern void kReduceForces(gpuContext gpu); extern void OPENMMCUDA_EXPORT kReduceForces(gpuContext gpu);
extern double kReduceEnergy(gpuContext gpu); extern double kReduceEnergy(gpuContext gpu);
// Initializers // Initializers
...@@ -105,7 +105,7 @@ extern void SetCalculateAndersenThermostatSim(gpuContext gpu); ...@@ -105,7 +105,7 @@ extern void SetCalculateAndersenThermostatSim(gpuContext gpu);
extern void GetCalculateAndersenThermostatSim(gpuContext gpu); extern void GetCalculateAndersenThermostatSim(gpuContext gpu);
extern void SetCalculatePMESim(gpuContext gpu); extern void SetCalculatePMESim(gpuContext gpu);
extern void GetCalculatePMESim(gpuContext gpu); extern void GetCalculatePMESim(gpuContext gpu);
extern void SetForcesSim(gpuContext gpu); extern void OPENMMCUDA_EXPORT SetForcesSim(gpuContext gpu);
extern void GetForcesSim(gpuContext gpu); extern void GetForcesSim(gpuContext gpu);
extern void SetShakeHSim(gpuContext gpu); extern void SetShakeHSim(gpuContext gpu);
extern void GetShakeHSim(gpuContext gpu); extern void GetShakeHSim(gpuContext gpu);
......
platforms/cuda/src/kernels/kCalculateObcGbsaBornSum.cu
View file @ 45b0302d
...@@ -133,7 +133,7 @@ void kReduceObcGbsaBornSum_kernel() ...@@ -133,7 +133,7 @@ void kReduceObcGbsaBornSum_kernel()
} }
} }
void OPENMMCUDA_EXPORT kReduceObcGbsaBornSum(gpuContext gpu) void kReduceObcGbsaBornSum(gpuContext gpu)
{ {
// printf("kReduceObcGbsaBornSum\n"); // printf("kReduceObcGbsaBornSum\n");
kReduceObcGbsaBornSum_kernel<<<gpu->sim.blocks, 384>>>(); kReduceObcGbsaBornSum_kernel<<<gpu->sim.blocks, 384>>>();
...@@ -141,7 +141,7 @@ void OPENMMCUDA_EXPORT kReduceObcGbsaBornSum(gpuContext gpu) ...@@ -141,7 +141,7 @@ void OPENMMCUDA_EXPORT kReduceObcGbsaBornSum(gpuContext gpu)
LAUNCHERROR("kReduceObcGbsaBornSum"); LAUNCHERROR("kReduceObcGbsaBornSum");
} }
void OPENMMCUDA_EXPORT kCalculateObcGbsaBornSum(gpuContext gpu) void kCalculateObcGbsaBornSum(gpuContext gpu)
{ {
// printf("kCalculateObcgbsaBornSum\n"); // printf("kCalculateObcgbsaBornSum\n");
switch (gpu->sim.nonbondedMethod) switch (gpu->sim.nonbondedMethod)
......
platforms/cuda/src/kernels/kCalculateObcGbsaForces2.cu
View file @ 45b0302d
...@@ -99,7 +99,7 @@ void GetCalculateObcGbsaForces2Sim(gpuContext gpu) ...@@ -99,7 +99,7 @@ void GetCalculateObcGbsaForces2Sim(gpuContext gpu)
#define METHOD_NAME(a, b) a##PeriodicByWarp##b #define METHOD_NAME(a, b) a##PeriodicByWarp##b
#include "kCalculateObcGbsaForces2.h" #include "kCalculateObcGbsaForces2.h"
void OPENMMCUDA_EXPORT kCalculateObcGbsaForces2(gpuContext gpu) void kCalculateObcGbsaForces2(gpuContext gpu)
{ {
//printf("kCalculateObcGbsaForces2\n"); //printf("kCalculateObcGbsaForces2\n");
switch (gpu->sim.nonbondedMethod) switch (gpu->sim.nonbondedMethod)
......
platforms/cuda/src/kernels/kForces.cu
View file @ 45b0302d
...@@ -39,7 +39,7 @@ using namespace std; ...@@ -39,7 +39,7 @@ using namespace std;
static __constant__ cudaGmxSimulation cSim; static __constant__ cudaGmxSimulation cSim;
void OPENMMCUDA_EXPORT SetForcesSim(gpuContext gpu) void SetForcesSim(gpuContext gpu)
{ {
cudaError_t status; cudaError_t status;
status = cudaMemcpyToSymbol(cSim, &gpu->sim, sizeof(cudaGmxSimulation)); status = cudaMemcpyToSymbol(cSim, &gpu->sim, sizeof(cudaGmxSimulation));
...@@ -65,7 +65,7 @@ void kClearForces_kernel() ...@@ -65,7 +65,7 @@ void kClearForces_kernel()
} }
} }
void OPENMMCUDA_EXPORT kClearForces(gpuContext gpu) void kClearForces(gpuContext gpu)
{ {
// printf("kClearForces\n"); // printf("kClearForces\n");
kClearForces_kernel<<<gpu->sim.blocks, 384>>>(); kClearForces_kernel<<<gpu->sim.blocks, 384>>>();
...@@ -279,7 +279,7 @@ void kReduceForces_kernel() ...@@ -279,7 +279,7 @@ void kReduceForces_kernel()
} }
} }
void OPENMMCUDA_EXPORT kReduceForces(gpuContext gpu) void kReduceForces(gpuContext gpu)
{ {
// printf("kReduceForces\n"); // printf("kReduceForces\n");
kReduceForces_kernel<<<gpu->sim.blocks, gpu->sim.bsf_reduce_threads_per_block>>>(); kReduceForces_kernel<<<gpu->sim.blocks, gpu->sim.bsf_reduce_threads_per_block>>>();
......
platforms/opencl/sharedTarget/CMakeLists.txt
View file @ 45b0302d
...@@ -13,7 +13,12 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CL_KERNELS_CPP} ${CL_KERNELS_H} ...@@ -13,7 +13,12 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CL_KERNELS_CPP} ${CL_KERNELS_H}
SET_SOURCE_FILES_PROPERTIES(${CL_KERNELS_CPP} ${CL_KERNELS_H} PROPERTIES GENERATED TRUE) SET_SOURCE_FILES_PROPERTIES(${CL_KERNELS_CPP} ${CL_KERNELS_H} PROPERTIES GENERATED TRUE)
ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES}) ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${OPENMM_LIBRARY_NAME}_d optimized ${OPENMM_LIBRARY_NAME} ${OPENCL_LIBRARIES}) IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME}_d)
ELSE (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME})
ENDIF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${MAIN_OPENMM_LIB} ${OPENCL_LIBRARIES})
SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY") SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY")
INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_TARGET}) INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_TARGET})
serialization/CMakeLists.txt
View file @ 45b0302d
...@@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src) ...@@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
# Create the library # Create the library
ADD_LIBRARY(${OPENMM_SERIALIZATION_LIBRARY_NAME} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES}) ADD_LIBRARY(${OPENMM_SERIALIZATION_LIBRARY_NAME} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
TARGET_LINK_LIBRARIES(${OPENMM_SERIALIZATION_LIBRARY_NAME} debug ${OPENMM_LIBRARY_NAME}_d optimized ${OPENMM_LIBRARY_NAME}) TARGET_LINK_LIBRARIES(${OPENMM_SERIALIZATION_LIBRARY_NAME} ${SHARED_TARGET})
SET_TARGET_PROPERTIES(${OPENMM_SERIALIZATION_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL -DIEEE_8087") SET_TARGET_PROPERTIES(${OPENMM_SERIALIZATION_LIBRARY_NAME} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL -DIEEE_8087")
INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${OPENMM_SERIALIZATION_LIBRARY_NAME}) INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib ${OPENMM_SERIALIZATION_LIBRARY_NAME})
INSTALL_FILES(/include/openmm/serialization FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/openmm/serialization/SerializationNode.h) INSTALL_FILES(/include/openmm/serialization FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/openmm/serialization/SerializationNode.h)
......
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