From 00b7b537cea6f3c1a3f8c9c433f352156a37daac Mon Sep 17 00:00:00 2001 From: jpekkila Date: Mon, 2 Nov 2020 10:58:18 +0200 Subject: [PATCH] Modifications for master merge: reverted CMakeLists.txt to the original, disabled mixed precision by default --- CMakeLists.txt | 10 +++++----- src/core/kernels/kernels.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bfc25e..66b8001 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(astaroth C CXX CUDA) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) ## Project-wide compilation flags -set(COMMON_FLAGS "-mavx -DOMPI_SKIP_MPICXX -Wdouble-promotion -Wfloat-conversion -Wshadow") # -DOMPI_SKIP_MPICXX is to force OpenMPI to use the C interface +set(COMMON_FLAGS "-mavx -DOMPI_SKIP_MPICXX -Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow") # -DOMPI_SKIP_MPICXX is to force OpenMPI to use the C interface set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}") set(CMAKE_C_STANDARD 11) @@ -38,10 +38,10 @@ endif() message(STATUS "Build type: " ${CMAKE_BUILD_TYPE}) ## Options -option(DOUBLE_PRECISION "Generates double precision code." ON) +option(DOUBLE_PRECISION "Generates double precision code." OFF) option(BUILD_SAMPLES "Builds projects in samples subdirectory." ON) -option(MPI_ENABLED "Enables additional functions for MPI communciation." ON) -option(MULTIGPU_ENABLED "Enables multi-GPU on a single node. Uses peer-to-peer communication instead of MPI. Affects Legacy & Node layers only." OFF) +option(MPI_ENABLED "Enables additional functions for MPI communciation." OFF) +option(MULTIGPU_ENABLED "Enables multi-GPU on a single node. Uses peer-to-peer communication instead of MPI. Affects Legacy & Node layers only." ON) option(VERBOSE "Enables various status and warning messages" OFF) ## Options (DEPRECATED) @@ -110,7 +110,7 @@ if (BUILD_SAMPLES) add_subdirectory(samples/cpptest) add_subdirectory(samples/mpitest) add_subdirectory(samples/benchmark) - add_subdirectory(samples/genbenchmarkscripts) + #add_subdirectory(samples/genbenchmarkscripts) #add_subdirectory(samples/mpi_reduce_bench) add_subdirectory(samples/fortrantest) diff --git a/src/core/kernels/kernels.h b/src/core/kernels/kernels.h index 513c5e4..282f1c4 100644 --- a/src/core/kernels/kernels.h +++ b/src/core/kernels/kernels.h @@ -8,7 +8,7 @@ #define MPI_GPUDIRECT_DISABLED (0) #endif // AC_MPI_ENABLED -typedef float AcRealPacked; +typedef AcReal AcRealPacked; typedef struct { int3 dims;