Permalink
Browse files

Merge branch 'python' of git://github.com/espressomd/espresso into sc…

…afacos_default
  • Loading branch information...
RudolfWeeber committed Jan 5, 2019
2 parents 18e9a4b + 71481b1 commit 195c19b8a66d3d28e49c85ac53909b9bec51789b
@@ -205,6 +205,16 @@ empty:
- linux
- cuda

ubuntu:wo-dependencies:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export myconfig=maxset make_check=false
- bash maintainer/CI/build_cmake.sh
tags:
- docker
- linux

### Builds with ROCm

rocm-maxset:
@@ -73,6 +73,7 @@ option(WITH_CUDA "Build with GPU support" ON)
option(WITH_HDF5 "Build with HDF5 support" ON)
option(WITH_TESTS "Enable tests" ON)
option(WITH_SCAFACOS "Build with Scafacos support" OFF)
option(WITH_BENCHMARKS "Enable benchmarks" OFF)
option(WITH_VALGRIND_INSTRUMENTATION "Build with valgrind instrumentation markers" OFF)
if( CMAKE_VERSION VERSION_GREATER 3.5.2 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
option(WITH_CLANG_TIDY "Run Clang-Tidy during compilation" OFF)
@@ -179,7 +180,8 @@ if (WITH_CUDA)
target_link_libraries(${target} ${CUFFT_LIBRARY})
endfunction()
else()
find_package(HIP QUIET MODULE)
list(APPEND CMAKE_MODULE_PATH "/opt/rocm/hip/cmake")
find_package(HIP 1.5.18494 QUIET MODULE)
if(HIP_FOUND)
set(HCC_PATH "${HIP_ROOT_DIR}")
find_package(HIP MODULE)
@@ -476,6 +478,11 @@ if(WITH_TESTS)
add_subdirectory(testsuite)
endif(WITH_TESTS)

if(WITH_BENCHMARKS)
add_custom_target(benchmark)
add_subdirectory(maintainer/benchmarks)
endif(WITH_BENCHMARKS)

#######################################################################
# Subdirectories
#######################################################################
Oops, something went wrong.

0 comments on commit 195c19b

Please sign in to comment.