RF: Rename *CUDA* vars to *NVCC*

config/common/buildSettings.mk

@@ -46,10 +46,10 @@ ARCHLDFLAGS =
 ARCHLIBS =
 
 # Compiler flags for CUDA projects.
-ARCHCUDACXXFLAGS =
+ARCHNVCCFLAGS =
 
 # Linker flags for CUDA projects.
-ARCHCUDALDFLAGS =
+ARCHNVCCLDFLAGS =
 
 #####################################################################
 #
@@ -99,10 +99,10 @@ ifneq ($(shell which nvcc), )
 
   # TODO Allow override, don't
   #      assume CUDADIR=FSLDIR
-  NVCC          = nvcc
-  CUDAVER       = $(shell nvcc --version | grep -Po "release \K[0-9\.]+")
-  GENCODE_FLAGS = $(shell ${FSLDIR}/config/common/supportedGencodes.sh ${CUDAVER})
-  CUDADIR       = ${FSLDIR}
+  NVCC         = nvcc
+  CUDAVER      = $(shell nvcc --version | grep -Po "release \K[0-9\.]+")
+  GENCODEFLAGS = $(shell ${FSLDIR}/config/common/supportedGencodes.sh ${CUDAVER})
+  CUDADIR      = ${FSLDIR}
 
   # nvcc-specific tweaks:
   #  - Define ARMA_ALLOW_FAKE_GCC, otherwise byte-alignment issues
@@ -112,22 +112,22 @@ ifneq ($(shell which nvcc), )
   #    transpiled cuda code will trigger "warning: style of line
   #    directive is a GCC extension".
   #  - Specify the compiler to use with --compiler-bindir, as nvcc
-  #    will otherwise naively call "gcc"
-  ARCHCUDACXXFLAGS = -I${CUDADIR}/include  \
-                     -maxrregcount=64      \
-                     ${GENCODE_FLAGS}      \
-                     -DARMA_ALLOW_FAKE_GCC \
-                     --compiler-bindir     \
-                     $(shell which $(CC))  \
-                     --compiler-options    \
-                     "$(filter-out -pedantic, ${ARCHCXXFLAGS})"
-  ARCHCUDALDFLAGS  = -L${CUDADIR}/lib \
-                     -L${CUDADIR}/lib/stubs
-
+  #    might otherwise naively call "gcc"
+  ARCHNVCCFLAGS   = -I${CUDADIR}/include  \
+                    -maxrregcount=64      \
+                    ${GENCODEFLAGS}       \
+                    -DARMA_ALLOW_FAKE_GCC \
+                    --compiler-bindir     \
+                    $(shell which $(CC))  \
+                    --compiler-options    \
+                    "$(filter-out -pedantic, ${ARCHCXXFLAGS})"
+  ARCHNVCCLDFLAGS = -L${CUDADIR}/lib \
+                    -L${CUDADIR}/lib/stubs
+
+  # TODO All this stuff removed
   ifeq ($(SYSTYPE), Darwin)
 
     # Project specific variables
-    EDDYBUILDPARAMETERS = "cuda=1 CUDAVER=7.5" "cpu=1"
     FDT_COMPILE_GPU     = 0
     PTX2_COMPILE_GPU    = 0
   endif # if Darwin
@@ -135,8 +135,6 @@ ifneq ($(shell which nvcc), )
   ifeq ($(SYSTYPE), Linux)
 
     # Project specific variables
-    PARALLELFLAGS       = -fopenmp
-    EDDYBUILDPARAMETERS = "cuda=1 CUDAVER=8.0" "cuda=1 CUDAVER=9.1" "cpu=1"
     FDT_COMPILE_GPU     = 1
     PTX2_COMPILE_GPU    = 1
   endif # if Linux

config/common/vars.mk

@@ -15,11 +15,11 @@ USRCXXFLAGS     = # Project-specific compiler flags for C++ projects
 LIBS            = # Project-specific libraries to link against for C
                   # and C++ projects - these are incorporated into the
                   # final LDFLAGS, below.
-USRCUDACXXFLAGS = # Project-specific compiler flags for CUDA projects
-USRCUDALDFLAGS  = # Project-specific linker flags for CUDA projects
+USRNVCCFLAGS    = # Project-specific compiler flags for CUDA projects
+USRNVCCLDFLAGS  = # Project-specific linker flags for CUDA projects
 CUDALIBS        = # Project-specific libraries to link against for CUDA
                   # projects - these are incorporated into the final
-                  # CUDALDFLAGS, below.
+                  # NVCCLDFLAGS, below.
 
 # Project outputs - these variables control
 # what gets installed from a project. They
@@ -67,28 +67,28 @@ INCFLAGS = ${USRINCFLAGS} -I. -I${DEVINCDIR} -I${INCDIR}
 #############################
 
 # Ignore flags provided by the environment
-CFLAGS       =
-CXXFLAGS     =
-CPPFLAGS     =
-CUDACXXFLAGS =
-LDFLAGS      =
-CUDALDFLAGS  =
+CFLAGS      =
+CXXFLAGS    =
+CPPFLAGS    =
+NVCCFLAGS   =
+LDFLAGS     =
+NVCCLDFLAGS =
 
 # All projects must use these flags for
 # compilation/linking, using the form:
 #
-# $(CC)   $(CFLAGS)       <project flags/files> $(LDFLAGS)
-# $(CXX)  $(CXXFLAGS)     <project flags/files> $(LDFLAGS)
-# $(NVCC) $(CUDACXXFLAGS) <project flags/files> $(LDFLAGS) $(CUDALDFLAGS)
+# $(CC)   $(CFLAGS)    <project flags/files> $(LDFLAGS)
+# $(CXX)  $(CXXFLAGS)  <project flags/files> $(LDFLAGS)
+# $(NVCC) $(NVCCFLAGS) <project flags/files> $(LDFLAGS) $(NVCCLDFLAGS)
 #
 # LDFLAGS *must* come at the end, to ensure proper linking.
 
 LDFLAGS       += ${ARCHLDFLAGS} ${USRLDFLAGS} \
                  -L. -L${DEVLIBDIR} -L${LIBDIR} \
                   ${LIBS} ${ARCHLIBS}
-CUDALDFLAGS   += ${ARCHCUDALDFLAGS} ${USRCUDALDFLAGS} \
+NVCCLDFLAGS   += ${ARCHNVCCLDFLAGS} ${USRNVCCLDFLAGS} \
                  -L. -L${DEVLIBDIR} -L${LIBDIR} \
                  ${CUDALIBS}
-CFLAGS        += ${ARCHCFLAGS}       ${USRCFLAGS}       ${INCFLAGS}
-CXXFLAGS      += ${ARCHCXXFLAGS}     ${USRCXXFLAGS}     ${INCFLAGS}
-CUDACXXFLAGS  += ${ARCHCUDACXXFLAGS} ${USRCUDACXXFLAGS} ${INCFLAGS}
+CFLAGS        += ${ARCHCFLAGS}    ${USRCFLAGS}    ${INCFLAGS}
+CXXFLAGS      += ${ARCHCXXFLAGS}  ${USRCXXFLAGS}  ${INCFLAGS}
+NVCCFLAGS     += ${ARCHNVCCFLAGS} ${USRNVCCFLAGS} ${INCFLAGS}