From a08107a97d6bda1ffcc7dcdc8e80ccd58f076134 Mon Sep 17 00:00:00 2001 From: knarf Date: Mon, 7 Feb 2011 21:51:49 +0000 Subject: add CUDA support to the flesh git-svn-id: http://svn.cactuscode.org/flesh/trunk@4684 17b73243-c579-4c4c-a9d2-2d5706c11dac --- lib/make/make.config.defn.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'lib/make/make.config.defn.in') diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in index 88a37c0b..b3b02abc 100644 --- a/lib/make/make.config.defn.in +++ b/lib/make/make.config.defn.in @@ -25,6 +25,7 @@ export CC = @CC@ export CXX = @CXX@ export F90 = @F90@ export F77 = @F77@ +export NVCC = @NVCC@ export CPP = @CPP@ export FPP = @FPP@ export LD = @LD@ @@ -36,6 +37,7 @@ export CFLAGS = @CFLAGS@ export CXXFLAGS = @CXXFLAGS@ export F90FLAGS = @F90FLAGS@ export F77FLAGS = @F77FLAGS@ +export NVCCFLAGS = @NVCCFLAGS@ export CPPFLAGS = @CPPFLAGS@ export FPPFLAGS = @FPPFLAGS@ @@ -49,6 +51,7 @@ export F_LINE_DIRECTIVES = @F_LINE_DIRECTIVES@ # FPP: @FPP_VERSION@ # F77: @F77_VERSION@ # F90: @F90_VERSION@ +# NVCC: @NVCC_VERSION@ export MKDIRFLAGS = @MKDIRFLAGS@ @@ -67,6 +70,7 @@ export C_DEBUG_FLAGS = @C_DEBUG_FLAGS@ export CXX_DEBUG_FLAGS = @CXX_DEBUG_FLAGS@ export F90_DEBUG_FLAGS = @F90_DEBUG_FLAGS@ export F77_DEBUG_FLAGS = @F77_DEBUG_FLAGS@ +export NVCC_DEBUG_FLAGS = @NVCC_DEBUG_FLAGS@ # Optimisation flags export CPP_OPTIMISE_FLAGS = @CPP_OPTIMISE_FLAGS@ @@ -75,12 +79,14 @@ export C_OPTIMISE_FLAGS = @C_OPTIMISE_FLAGS@ export CXX_OPTIMISE_FLAGS = @CXX_OPTIMISE_FLAGS@ export F90_OPTIMISE_FLAGS = @F90_OPTIMISE_FLAGS@ export F77_OPTIMISE_FLAGS = @F77_OPTIMISE_FLAGS@ +export NVCC_OPTIMISE_FLAGS = @NVCC_OPTIMISE_FLAGS@ # No-optimisation flags export C_NO_OPTIMISE_FLAGS = @C_NO_OPTIMISE_FLAGS@ export CXX_NO_OPTIMISE_FLAGS = @CXX_NO_OPTIMISE_FLAGS@ export F90_NO_OPTIMISE_FLAGS = @F90_NO_OPTIMISE_FLAGS@ export F77_NO_OPTIMISE_FLAGS = @F77_NO_OPTIMISE_FLAGS@ +export NVCC_NO_OPTIMISE_FLAGS = @NVCC_NO_OPTIMISE_FLAGS@ # Profiling flags export CPP_PROFILE_FLAGS = @CPP_PROFILE_FLAGS@ @@ -89,6 +95,7 @@ export C_PROFILE_FLAGS = @C_PROFILE_FLAGS@ export CXX_PROFILE_FLAGS = @CXX_PROFILE_FLAGS@ export F90_PROFILE_FLAGS = @F90_PROFILE_FLAGS@ export F77_PROFILE_FLAGS = @F77_PROFILE_FLAGS@ +export NVCC_PROFILE_FLAGS = @NVCC_PROFILE_FLAGS@ # OpenMP flags export CPP_OPENMP_FLAGS = @CPP_OPENMP_FLAGS@ @@ -97,6 +104,7 @@ export C_OPENMP_FLAGS = @C_OPENMP_FLAGS@ export CXX_OPENMP_FLAGS = @CXX_OPENMP_FLAGS@ export F90_OPENMP_FLAGS = @F90_OPENMP_FLAGS@ export F77_OPENMP_FLAGS = @F77_OPENMP_FLAGS@ +export NVCC_OPENMP_FLAGS = @NVCC_OPENMP_FLAGS@ # Warning flags export CPP_WARN_FLAGS = @CPP_WARN_FLAGS@ @@ -105,6 +113,7 @@ export C_WARN_FLAGS = @C_WARN_FLAGS@ export CXX_WARN_FLAGS = @CXX_WARN_FLAGS@ export F90_WARN_FLAGS = @F90_WARN_FLAGS@ export F77_WARN_FLAGS = @F77_WARN_FLAGS@ +export NVCC_WARN_FLAGS = @NVCC_WARN_FLAGS@ # Most compilers use -c -o to compile only, some do something different export CCOMPILEONLY = @CCOMPILEONLY@ @@ -133,12 +142,14 @@ export CXX_DEPEND = @CXX_DEPEND@ export F77_DEPEND = @F77_DEPEND@ export F_DEPEND = @F_DEPEND@ export F_DEPEND_MODULES = @F_DEPEND_MODULES@ +export CU_DEPEND = @CU_DEPEND@ export C_DEPEND_OUT = @C_DEPEND_OUT@ export CXX_DEPEND_OUT = @CXX_DEPEND_OUT@ export F77_DEPEND_OUT = @F77_DEPEND_OUT@ export F_DEPEND_OUT = @F_DEPEND_OUT@ export F_DEPEND_MODULES_OUT = @F_DEPEND_MODULES_OUT@ +export CU_DEPEND_OUT = @CU_DEPEND_OUT@ # Some compilers are very picky about the names of C++ files export CXX_WORKING_NAME = @CXX_WORKING_NAME@ @@ -152,6 +163,7 @@ export CXX_POSTPROCESSING = @CXX_POSTPROCESSING@ export F77_POSTPROCESSING = @F77_POSTPROCESSING@ export F_POSTPROCESSING = @F_POSTPROCESSING@ export F90_POSTPROCESSING = @F90_POSTPROCESSING@ +export NVCC_POSTPROCESSING = @NVCC_POSTPROCESSING@ # Do we need to use ranlib ? export USE_RANLIB = @USE_RANLIB@ @@ -222,6 +234,7 @@ ifeq ($(strip $(CCTK_DEBUG_MODE)),yes) CXXFLAGS += $(CXX_DEBUG_FLAGS) F77FLAGS += $(F77_DEBUG_FLAGS) F90FLAGS += $(F90_DEBUG_FLAGS) + NVCCFLAGS += $(NVCC_DEBUG_FLAGS) endif # Is this an optimising configuration ? @@ -234,11 +247,13 @@ ifeq ($(strip $(CCTK_OPTIMISE_MODE)),yes) CXXFLAGS += $(CXX_OPTIMISE_FLAGS) F77FLAGS += $(F77_OPTIMISE_FLAGS) F90FLAGS += $(F90_OPTIMISE_FLAGS) + NVCCFLAGS += $(NVCC_OPTIMISE_FLAGS) else CFLAGS += $(C_NO_OPTIMISE_FLAGS) CXXFLAGS += $(CXX_NO_OPTIMISE_FLAGS) F77FLAGS += $(F77_NO_OPTIMISE_FLAGS) F90FLAGS += $(F90_NO_OPTIMISE_FLAGS) + NVCCFLAGS += $(NVCC_NO_OPTIMISE_FLAGS) endif # Is this a profiling configuration ? @@ -251,6 +266,7 @@ ifeq ($(strip $(CCTK_PROFILE_MODE)),yes) CXXFLAGS += $(CXX_PROFILE_FLAGS) F77FLAGS += $(F77_PROFILE_FLAGS) F90FLAGS += $(F90_PROFILE_FLAGS) + NVCCFLAGS += $(NVCC_PROFILE_FLAGS) endif # Are we building with OpenMP support ? @@ -263,6 +279,7 @@ ifeq ($(strip $(CCTK_OPENMP_MODE)),yes) CXXFLAGS += $(CXX_OPENMP_FLAGS) F77FLAGS += $(F77_OPENMP_FLAGS) F90FLAGS += $(F90_OPENMP_FLAGS) + NVCCFLAGS += $(NVCC_OPENMP_FLAGS) endif # Are we building with all warnings switched on ? @@ -280,6 +297,7 @@ ifeq ($(strip $(CCTK_WARN_MODE)),yes) CXXFLAGS += $(CXX_WARN_FLAGS) F77FLAGS += $(F77_WARN_FLAGS) F90FLAGS += $(F90_WARN_FLAGS) + NVCCFLAGS += $(NVCC_WARN_FLAGS) endif # Stuff specific to an architecture. -- cgit v1.2.3