cleaning installation infrastructure, removing global compiler flags for wrappers

Author: alberto-scolari

cmake/AddGRBInstall.cmake

@@ -48,8 +48,6 @@ set( HYPERDAGS_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/hyperdags" )
 set( BSP1D_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/spmd" )
 set( HYBRID_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/hybrid" )
 
-
-
 # addBackendWrapperGenOptions
 # creates the variables to store the settings for a backend, in order to create
 # the wrapper scripts for the installation; unless otherwise specified, arguments
@@ -69,42 +67,31 @@ set( HYBRID_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/hybrid" )
 # WARNING! do NOT turn this into a macro, otherwise escaped paths don't work anymore
 # since they are expanded as macro arguments
 #
-function( addBackendWrapperGenOptions backend )
+function( addBackendWrapperGenOptions backend lib_dir )
 	set( multiValueArgs "COMPILER_COMMAND;RUNNER"
-		"COMPILE_DEFINITIONS;COMPILE_OPTIONS;LINK_FLAGS;LIB_DIR"
+		"COMPILE_DEFINITIONS;COMPILE_OPTIONS;LINK_FLAGS"
 	)
-	cmake_parse_arguments( parsed "${options}" "${oneValueArgs}"
+	cmake_parse_arguments( parsed "${options}" ""
 		"${multiValueArgs}" "${ARGN}"
 	)
 
 	if( NOT "${backend}" IN_LIST AVAILABLE_BACKENDS )
 		message( FATAL_ERROR "cannot find ${backend} among available backends")
 	endif()
 
-	assert_valid_variables( parsed_LIB_DIR )
+	assert_valid_variables( lib_dir )
 
 	set( ${backend}_WRAPPER_COMPILER_COMMAND "${parsed_COMPILER_COMMAND}" PARENT_SCOPE )
 	if( NOT parsed_COMPILER_COMMAND )
 		set( ${backend}_WRAPPER_COMPILER_COMMAND "${CMAKE_CXX_COMPILER}" PARENT_SCOPE )
 	endif()
 	set( ${backend}_WRAPPER_RUNNER "${parsed_RUNNER}" PARENT_SCOPE )
-	set( ${backend}_LIB_DIR "${parsed_LIB_DIR}" PARENT_SCOPE )
-
+	set( ${backend}_LIB_DIR "${lib_dir}" PARENT_SCOPE )
 	set( ${backend}_WRAPPER_COMPILE_DEFINITIONS "${parsed_COMPILE_DEFINITIONS}" PARENT_SCOPE )
-
 	set( ${backend}_WRAPPER_COMPILE_OPTIONS "${parsed_COMPILE_OPTIONS}" PARENT_SCOPE )
 	set( ${backend}_WRAPPER_LINK_FLAGS "${parsed_LINK_FLAGS}" PARENT_SCOPE )
 endfunction( addBackendWrapperGenOptions )
 
-## compile definitions and options common to all backends: do not change!
-set( COMMON_WRAPPER_DEFINITIONS
-		"${REFERENCE_INCLUDE_DEFS}"
-		"${REFERENCE_OMP_INCLUDE_DEFS}"
-)
-set( COMMON_WRAPPER_OPTIONS
-		"${OpenMP_CXX_FLAGS}"
-)
-
 if( WITH_NUMA )
 	set( NUMA_LFLAG "-lnuma" )
 endif()
@@ -113,36 +100,39 @@ endif()
 # for each enabled backend, add its information for the wrapper generation
 # paths may have spaces, hence wrap them inside single quotes ''
 
+# all backends include both REFERENCE_INCLUDE_DEFS and REFERENCE_OMP_INCLUDE_DEFS,
+# due to the dependency on OpenMP -- to be resolved
+
 # shared memory backends
 if( WITH_REFERENCE_BACKEND )
-	addBackendWrapperGenOptions( "reference"
-		COMPILE_DEFINITIONS "${REFERENCE_SELECTION_DEFS}"
-		LIB_DIR "${SHMEM_BACKEND_INSTALL_DIR}"
+	addBackendWrapperGenOptions( "reference" "${SHMEM_BACKEND_INSTALL_DIR}"
+		COMPILE_DEFINITIONS
+		"${REFERENCE_INCLUDE_DEFS};${REFERENCE_OMP_INCLUDE_DEFS};${REFERENCE_SELECTION_DEFS}"
 		LINK_FLAGS "${NUMA_LFLAG}"
 	)
 endif()
 
 if( WITH_OMP_BACKEND )
-	addBackendWrapperGenOptions( "reference_omp"
-		COMPILE_DEFINITIONS "${REFERENCE_OMP_SELECTION_DEFS}"
-		LIB_DIR "${SHMEM_BACKEND_INSTALL_DIR}"
+	addBackendWrapperGenOptions( "reference_omp" "${SHMEM_BACKEND_INSTALL_DIR}"
+		COMPILE_DEFINITIONS
+			"${REFERENCE_INCLUDE_DEFS};${REFERENCE_OMP_INCLUDE_DEFS};${REFERENCE_OMP_SELECTION_DEFS}"
+		COMPILE_OPTIONS "-fopenmp"
 		LINK_FLAGS "${NUMA_LFLAG}"
 	)
 endif()
 
 # dependent backends
 if( WITH_HYPERDAGS_BACKEND )
-	addBackendWrapperGenOptions( "hyperdags"
-		COMPILE_DEFINITIONS "${HYPERDAGS_SELECTION_DEFS};${HYPERDAGS_INCLUDE_DEFS}"
-		LIB_DIR "${HYPERDAGS_BACKEND_INSTALL_DIR}"
+	addBackendWrapperGenOptions( "hyperdags" "${HYPERDAGS_BACKEND_INSTALL_DIR}"
+		COMPILE_DEFINITIONS
+		"${REFERENCE_INCLUDE_DEFS};${REFERENCE_OMP_INCLUDE_DEFS};${HYPERDAGS_INCLUDE_DEFS};${HYPERDAGS_SELECTION_DEFS}"
 		LINK_FLAGS "${NUMA_LFLAG}"
 	)
 endif()
 
 if( WITH_NONBLOCKING_BACKEND )
-	addBackendWrapperGenOptions( "nonblocking"
-		COMPILE_DEFINITIONS "${NONBLOCKING_SELECTION_DEFS};${NONBLOCKING_INCLUDE_DEFS}"
-		LIB_DIR "${SHMEM_BACKEND_INSTALL_DIR}"
+	addBackendWrapperGenOptions( "nonblocking" "${SHMEM_BACKEND_INSTALL_DIR}"
+		COMPILE_DEFINITIONS "${NONBLOCKING_INCLUDE_DEFS};${NONBLOCKING_SELECTION_DEFS}"
 		LINK_FLAGS "${NUMA_LFLAG}"
 	)
 endif()
@@ -170,22 +160,24 @@ if( WITH_BSP1D_BACKEND OR WITH_HYBRID_BACKEND )
 	set( MANUALRUN "${LPFRUN_CMD}" "${MANUALRUN_ARGS}" )
 
 	if( WITH_BSP1D_BACKEND )
-		addBackendWrapperGenOptions( "bsp1d"
+		addBackendWrapperGenOptions( "bsp1d" "${BSP1D_BACKEND_INSTALL_DIR}"
 			COMPILER_COMMAND "${LPF_CXX_COMPILER}"
 			RUNNER "${LPFRUN_CMD}"
-			COMPILE_DEFINITIONS "${LPF_INCLUDE_DEFS};${BSP1D_SELECTION_DEFS}"
-			LIB_DIR "${BSP1D_BACKEND_INSTALL_DIR}"
-			LINK_FLAGS "${NUMA_LFLAG}" "-lpthread" "-lm"
+			COMPILE_DEFINITIONS
+				"${REFERENCE_INCLUDE_DEFS};${REFERENCE_OMP_INCLUDE_DEFS};${LPF_INCLUDE_DEFS};${BSP1D_SELECTION_DEFS}"
+			COMPILE_OPTIONS "-fopenmp"
+			LINK_FLAGS "${NUMA_LFLAG}"
 		)
 	endif()
 
 	if( WITH_HYBRID_BACKEND )
-		addBackendWrapperGenOptions( "hybrid"
+		addBackendWrapperGenOptions( "hybrid" "${HYBRID_BACKEND_INSTALL_DIR}"
 			COMPILER_COMMAND "${LPF_CXX_COMPILER}"
 			RUNNER "${LPFRUN_CMD}"
-			COMPILE_DEFINITIONS "${LPF_INCLUDE_DEFS};${HYBRID_SELECTION_DEFS}"
-			LIB_DIR "${HYBRID_BACKEND_INSTALL_DIR}"
-			LINK_FLAGS "${NUMA_LFLAG}" "-lpthread" "-lm"
+			COMPILE_DEFINITIONS
+				"${REFERENCE_INCLUDE_DEFS};${REFERENCE_OMP_INCLUDE_DEFS};${LPF_INCLUDE_DEFS};${HYBRID_SELECTION_DEFS}"
+			COMPILE_OPTIONS "-fopenmp"
+			LINK_FLAGS "${NUMA_LFLAG}"
 		)
 	endif()
 endif()

src/CMakeLists.txt

@@ -30,7 +30,6 @@ add_subdirectory( transition )
 assert_valid_variables( AVAILABLE_BACKENDS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR
 	VERSION BIN_INSTALL_DIR
 )
-assert_defined_variables( COMMON_WRAPPER_DEFINITIONS COMMON_WRAPPER_OPTIONS )
 
 if( WITH_BSP1D_BACKEND OR WITH_HYBRID_BACKEND )
 	assert_valid_variables( LPFRUN_CMD MANUALRUN )
@@ -90,11 +89,6 @@ list( JOIN MANUALRUN " " MANUALRUN_SPACED )
 joinWithNewLine( backend_dir_list BACKEND_DIR_LIST )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/setenv.in ${CMAKE_CURRENT_BINARY_DIR}/setenv @ONLY )
 
-set( cflags "${COMMON_WRAPPER_DEFINITIONS}" )
-list( TRANSFORM cflags PREPEND "-D" )
-list( APPEND cflags "${COMMON_WRAPPER_OPTIONS}" )
-joinAndAppend( COMMON_FLAGS_SPACED cflags )
-
 joinWithNewLine( compiler_list BACKEND_COMPILERS_SPACED )
 joinWithNewLine( library_dir LIBRARY_DIRS_SPACED )
 

src/grbcxx.in

@@ -22,7 +22,6 @@ BACKENDS=(@AVAILABLE_BACKENDS_SPACED@)
 BACKENDCOMPILERS=(@BACKEND_COMPILERS_SPACED@)
 BACKENDCFLAGS=(@BACKEND_CFLAGS_SPACED@)
 BACKENDLFLAGS=(@BACKEND_LFLAGS_SPACED@)
-COMMONCFLAGS=@COMMON_FLAGS_SPACED@
 VERSION="@VERSION@"
 BACKEND_LIBRARY_OUTPUT_NAME="@BACKEND_LIBRARY_OUTPUT_NAME@"
 LIBRARY_DIRS=(@LIBRARY_DIRS_SPACED@)
@@ -97,6 +96,6 @@ LFLAGS="${LIB} ${BACKENDLFLAGS[${BACKENDID}]}"
 
 COMPILER="${BACKENDCOMPILERS[${BACKENDID}]}"
 
-CMD="${COMPILER} -std=${CXXSTD} -I'${INCLUDEDIR}' ${COMMONCFLAGS} ${BACKENDCFLAGS[${BACKENDID}]} ${ARGS[@]} "$@" ${LFLAGS}"
+CMD="${COMPILER} -std=${CXXSTD} -I'${INCLUDEDIR}' ${BACKENDCFLAGS[${BACKENDID}]} ${ARGS[@]} "$@" ${LFLAGS}"
 
 ${SHOW} "${CMD}"