cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifications for master merge: reverted CMakeLists.txt to the original, disabled mixed precision by default

Browse Source
This commit is contained in:
jpekkila
2020-11-02 10:58:18 +02:00
parent bf7eb83084
commit 00b7b537ce
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -11,7 +11,7 @@ project(astaroth C CXX CUDA)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
## Project-wide compilation flags ## 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_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
@@ -38,10 +38,10 @@ endif()
message(STATUS "Build type: " ${CMAKE_BUILD_TYPE}) message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
## Options ## 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(BUILD_SAMPLES "Builds projects in samples subdirectory." ON)
option(MPI_ENABLED "Enables additional functions for MPI communciation." ON) 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." 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) option(VERBOSE "Enables various status and warning messages" OFF)
## Options (DEPRECATED) ## Options (DEPRECATED)
@@ -110,7 +110,7 @@ if (BUILD_SAMPLES)
add_subdirectory(samples/cpptest) add_subdirectory(samples/cpptest)
add_subdirectory(samples/mpitest) add_subdirectory(samples/mpitest)
add_subdirectory(samples/benchmark) add_subdirectory(samples/benchmark)
add_subdirectory(samples/genbenchmarkscripts) #add_subdirectory(samples/genbenchmarkscripts)
#add_subdirectory(samples/mpi_reduce_bench) #add_subdirectory(samples/mpi_reduce_bench)
add_subdirectory(samples/fortrantest) add_subdirectory(samples/fortrantest)

2
src/core/kernels/kernels.h
View File

@@ -8,7 +8,7 @@
#define MPI_GPUDIRECT_DISABLED (0) #define MPI_GPUDIRECT_DISABLED (0)
#endif // AC_MPI_ENABLED #endif // AC_MPI_ENABLED
typedef float AcRealPacked; typedef AcReal AcRealPacked;
typedef struct { typedef struct {
int3 dims; int3 dims;