diff --git a/CMakeLists.txt b/CMakeLists.txt index 809d0566..0ac5a274 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED True) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 561e87b2..9864df7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_subdirectory(common) add_subdirectory(cuda) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 6902963e..093d14ba 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) set(altis_common_source_files ResultDatabase.cpp diff --git a/src/cuda/CMakeLists.txt b/src/cuda/CMakeLists.txt index d5a1ffaf..c98ca370 100644 --- a/src/cuda/CMakeLists.txt +++ b/src/cuda/CMakeLists.txt @@ -1,11 +1,4 @@ -cmake_minimum_required (VERSION 3.8) - -find_package(CUDA) -set(CUDA_ARCH_LIST Auto CACHE STRING - "List of CUDA architectures (e.g. Pascal, Amphere, Volta, etc.) or \ - compute capability version (6.1, 7.0, etc.) to generate code for. \ - Set to Auto for automatic detection (default).") -cuda_select_nvcc_arch_flags(ARCH_FLAGS Auto) +cmake_minimum_required (VERSION 3.18) include_directories(common ../common) diff --git a/src/cuda/level0/CMakeLists.txt b/src/cuda/level0/CMakeLists.txt index 2dcc6ed9..6c449afd 100644 --- a/src/cuda/level0/CMakeLists.txt +++ b/src/cuda/level0/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_subdirectory(busspeeddownload) add_subdirectory(busspeedreadback) diff --git a/src/cuda/level0/busspeeddownload/CMakeLists.txt b/src/cuda/level0/busspeeddownload/CMakeLists.txt index 1623f7a1..e83f8d60 100644 --- a/src/cuda/level0/busspeeddownload/CMakeLists.txt +++ b/src/cuda/level0/busspeeddownload/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(busspeeddownloadLib BusSpeedDownload.cu) diff --git a/src/cuda/level0/busspeedreadback/CMakeLists.txt b/src/cuda/level0/busspeedreadback/CMakeLists.txt index 02bc6ca1..e3b39995 100644 --- a/src/cuda/level0/busspeedreadback/CMakeLists.txt +++ b/src/cuda/level0/busspeedreadback/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(busspeedreadbackLib BusSpeedReadback.cu) diff --git a/src/cuda/level0/devicememory/CMakeLists.txt b/src/cuda/level0/devicememory/CMakeLists.txt index db1a2e24..b2e596d5 100644 --- a/src/cuda/level0/devicememory/CMakeLists.txt +++ b/src/cuda/level0/devicememory/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(devicememoryLib DeviceMemory.cu) diff --git a/src/cuda/level0/maxflops/CMakeLists.txt b/src/cuda/level0/maxflops/CMakeLists.txt index 6f886ac9..781e1d1f 100644 --- a/src/cuda/level0/maxflops/CMakeLists.txt +++ b/src/cuda/level0/maxflops/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(maxflopsLib MaxFlops.cu) target_compile_options(maxflopsLib PRIVATE $<$:${ARCH_FLAGS}>) diff --git a/src/cuda/level1/CMakeLists.txt b/src/cuda/level1/CMakeLists.txt index 643bf740..1f424f50 100644 --- a/src/cuda/level1/CMakeLists.txt +++ b/src/cuda/level1/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_subdirectory(bfs) add_subdirectory(gemm) diff --git a/src/cuda/level1/bfs/CMakeLists.txt b/src/cuda/level1/bfs/CMakeLists.txt index 8e2611e9..fe180264 100644 --- a/src/cuda/level1/bfs/CMakeLists.txt +++ b/src/cuda/level1/bfs/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(bfsLib bfs.cu) diff --git a/src/cuda/level1/gemm/CMakeLists.txt b/src/cuda/level1/gemm/CMakeLists.txt index f5b6206a..cc0c3cf3 100644 --- a/src/cuda/level1/gemm/CMakeLists.txt +++ b/src/cuda/level1/gemm/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(gemmLib Gemm.cu) target_compile_options(gemmLib PRIVATE $<$:${ARCH_FLAGS}>) diff --git a/src/cuda/level1/gups/CMakeLists.txt b/src/cuda/level1/gups/CMakeLists.txt index 0e1bfb0e..1b87d3b7 100644 --- a/src/cuda/level1/gups/CMakeLists.txt +++ b/src/cuda/level1/gups/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(gupsLib gups.cu) target_link_libraries(gupsLib -lm) diff --git a/src/cuda/level1/pathfinder/CMakeLists.txt b/src/cuda/level1/pathfinder/CMakeLists.txt index 4e6f442c..3f81a855 100644 --- a/src/cuda/level1/pathfinder/CMakeLists.txt +++ b/src/cuda/level1/pathfinder/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(pathfinderLib pathfinder.cu) diff --git a/src/cuda/level1/sort/CMakeLists.txt b/src/cuda/level1/sort/CMakeLists.txt index 025eaf78..0a1b2419 100644 --- a/src/cuda/level1/sort/CMakeLists.txt +++ b/src/cuda/level1/sort/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(sortLib Sort.cu sort_kernel.cu) diff --git a/src/cuda/level2/CMakeLists.txt b/src/cuda/level2/CMakeLists.txt index 35286beb..94fd2ae2 100644 --- a/src/cuda/level2/CMakeLists.txt +++ b/src/cuda/level2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_subdirectory(cfd) add_subdirectory(dwt2d) diff --git a/src/cuda/level2/cfd/CMakeLists.txt b/src/cuda/level2/cfd/CMakeLists.txt index 29ec7bff..5b3ef056 100644 --- a/src/cuda/level2/cfd/CMakeLists.txt +++ b/src/cuda/level2/cfd/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(cfdLib euler3d.cu) target_link_libraries(cfdLib -lm) diff --git a/src/cuda/level2/cfd/euler3d.cu b/src/cuda/level2/cfd/euler3d.cu index 7d729eae..69453577 100755 --- a/src/cuda/level2/cfd/euler3d.cu +++ b/src/cuda/level2/cfd/euler3d.cu @@ -1224,14 +1224,14 @@ void cfd(ResultDatabase &resultDB, OptionParser &op) checkCudaErrors(cudaEventRecord(exec_event, streams[0])); for (int i = 0; i < iterations; i++) { // Time will need to be recomputed, more aggressive optimization TODO - checkCudaErrors(cudaStreamWaitEvent(streams[1], exec_event)); + checkCudaErrors(cudaStreamWaitEvent(streams[1], exec_event, 0)); copy(old_variables, variables, nelr*NVAR, &streams[1]); checkCudaErrors(cudaEventRecord(copy_event, streams[1])); // for the first iteration we compute the time step compute_step_factor(nelr, variables, areas, step_factors, &streams[0]); CHECK_CUDA_ERROR(); - checkCudaErrors(cudaStreamWaitEvent(streams[0], copy_event)); + checkCudaErrors(cudaStreamWaitEvent(streams[0], copy_event, 0)); for(int j = 0; j < RK; j++) { diff --git a/src/cuda/level2/dwt2d/CMakeLists.txt b/src/cuda/level2/dwt2d/CMakeLists.txt index a4120f6b..7c82a61c 100644 --- a/src/cuda/level2/dwt2d/CMakeLists.txt +++ b/src/cuda/level2/dwt2d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) set(DWT_CUDA_DIR ${CMAKE_CURRENT_LIST_DIR}/dwt_cuda) diff --git a/src/cuda/level2/kmeans/CMakeLists.txt b/src/cuda/level2/kmeans/CMakeLists.txt index c9e3be55..bc9ae4a1 100644 --- a/src/cuda/level2/kmeans/CMakeLists.txt +++ b/src/cuda/level2/kmeans/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(kmeansLib kmmain.cu diff --git a/src/cuda/level2/lavamd/CMakeLists.txt b/src/cuda/level2/lavamd/CMakeLists.txt index 66a9dd38..7ff76566 100644 --- a/src/cuda/level2/lavamd/CMakeLists.txt +++ b/src/cuda/level2/lavamd/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(lavamdLib lavaMD.cu diff --git a/src/cuda/level2/mandelbrot/CMakeLists.txt b/src/cuda/level2/mandelbrot/CMakeLists.txt index 104a6dd7..365bd680 100644 --- a/src/cuda/level2/mandelbrot/CMakeLists.txt +++ b/src/cuda/level2/mandelbrot/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(mandelbrotLib mandelbrot.cu diff --git a/src/cuda/level2/nw/CMakeLists.txt b/src/cuda/level2/nw/CMakeLists.txt index 0ecec2a2..1e3db1f3 100644 --- a/src/cuda/level2/nw/CMakeLists.txt +++ b/src/cuda/level2/nw/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(nwLib needle.cu) target_link_libraries(nwLib -lm) diff --git a/src/cuda/level2/particlefilter/CMakeLists.txt b/src/cuda/level2/particlefilter/CMakeLists.txt index 67e4fdc7..af9b74f0 100644 --- a/src/cuda/level2/particlefilter/CMakeLists.txt +++ b/src/cuda/level2/particlefilter/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(particlefilterLib ex_particle_CUDA_naive_seq.cu) target_link_libraries(particlefilterLib -lm) diff --git a/src/cuda/level2/raytracing/CMakeLists.txt b/src/cuda/level2/raytracing/CMakeLists.txt index 1769a322..3de32c32 100644 --- a/src/cuda/level2/raytracing/CMakeLists.txt +++ b/src/cuda/level2/raytracing/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_subdirectory(raytracing_cuda) diff --git a/src/cuda/level2/raytracing/raytracing_cuda/CMakeLists.txt b/src/cuda/level2/raytracing/raytracing_cuda/CMakeLists.txt index 5c50de90..3de76797 100644 --- a/src/cuda/level2/raytracing/raytracing_cuda/CMakeLists.txt +++ b/src/cuda/level2/raytracing/raytracing_cuda/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(raytracingLib raytracing.cu) target_link_libraries(raytracingLib -lm) diff --git a/src/cuda/level2/srad/CMakeLists.txt b/src/cuda/level2/srad/CMakeLists.txt index 2cbd389c..e7abb6c2 100644 --- a/src/cuda/level2/srad/CMakeLists.txt +++ b/src/cuda/level2/srad/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(sradLib srad.cu diff --git a/src/cuda/level2/where/CMakeLists.txt b/src/cuda/level2/where/CMakeLists.txt index 4eacc9cb..d1c2203e 100644 --- a/src/cuda/level2/where/CMakeLists.txt +++ b/src/cuda/level2/where/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.18) add_library(whereLib where.cu) target_link_libraries(whereLib -lm)