Skip to content

Commit 848a1b6

Browse files
author
Raimondas Galvelis
committedMar 21, 2023
Use standard FindOpenCL
1 parent 52d4121 commit 848a1b6

File tree

4 files changed

+5
-102
lines changed

4 files changed

+5
-102
lines changed
 

‎.github/workflows/CI.yml

-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ jobs:
9393
9494
cmake .. \
9595
-DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
96-
-DOPENCL_LIBRARY=${CONDA_PREFIX}/lib/libOpenCL${SHLIB_EXT} \
97-
-DOPENCL_INCLUDE_DIR=${CONDA_PREFIX}/include \
9896
-DOPENMM_DIR=${CONDA_PREFIX} \
9997
-DPLUMED_INCLUDE_DIR=${CONDA_PREFIX}/include/plumed \
10098
-DPLUMED_LIBRARY_DIR=${CONDA_PREFIX}/lib \

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ ADD_SUBDIRECTORY(platforms/reference)
9191

9292
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}")
9393
FIND_PACKAGE(OpenCL QUIET)
94-
IF(OPENCL_FOUND)
94+
IF(OpenCL_FOUND)
9595
SET(PLUMED_BUILD_OPENCL_LIB ON CACHE BOOL "Build implementation for OpenCL")
96-
ELSE(OPENCL_FOUND)
96+
ELSE(OpenCL_FOUND)
9797
SET(PLUMED_BUILD_OPENCL_LIB OFF CACHE BOOL "Build implementation for OpenCL")
98-
ENDIF(OPENCL_FOUND)
98+
ENDIF(OpenCL_FOUND)
9999
IF(PLUMED_BUILD_OPENCL_LIB)
100100
ADD_SUBDIRECTORY(platforms/opencl)
101101
ENDIF(PLUMED_BUILD_OPENCL_LIB)

‎FindOpenCL.cmake

-95
This file was deleted.

‎platforms/opencl/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/src)
4747

4848
# Create the library
4949

50-
INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIR})
50+
INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIRS})
5151

5252
FILE(GLOB OPENCL_KERNELS ${CL_SOURCE_DIR}/kernels/*.cl)
5353
ADD_CUSTOM_COMMAND(OUTPUT ${CL_KERNELS_CPP} ${CL_KERNELS_H}
@@ -58,7 +58,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CL_KERNELS_CPP} ${CL_KERNELS_H}
5858
SET_SOURCE_FILES_PROPERTIES(${CL_KERNELS_CPP} ${CL_KERNELS_H} PROPERTIES GENERATED TRUE)
5959
ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_INCLUDE_FILES})
6060

61-
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${OPENCL_LIBRARIES})
61+
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${OpenCL_LIBRARIES})
6262
TARGET_LINK_LIBRARIES(${SHARED_TARGET} OpenMM)
6363
TARGET_LINK_LIBRARIES(${SHARED_TARGET} OpenMMOpenCL)
6464
TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${SHARED_PLUMED_TARGET})

0 commit comments

Comments
 (0)
Please sign in to comment.