Merge branch 'rf/cuda' into 'master'

Rf/cuda

See merge request !8

CHANGELOG.md

 # FSL base project changelog
 
 
+## 2101.5 (Saturday 23rd January 2021)
+
+ - Updated the `supportedGencodes.sh` script to support CUDA versions
+   10.2, 11.1 and 11.2.
+ - Fixed a bug in the final creation of `NVCCFLAGS` and `NVCCLDFLAGS`.
+
+
 ## 2101.4 (Friday 22nd January 2021)
 
  - Fixed a bug in the default CFLAGS assignment under Linux.

config/supportedGencodes.sh

@@ -150,6 +150,22 @@ then
           -gencode arch=compute_75,code=sm_75"
     exit 0
 elif [ "$vn" = 10.1 ]
+then
+    echo "-gencode arch=compute_30,code=sm_30 \
+          -gencode arch=compute_32,code=sm_32 \
+          -gencode arch=compute_35,code=sm_35 \
+          -gencode arch=compute_37,code=sm_37 \
+          -gencode arch=compute_50,code=sm_50 \
+          -gencode arch=compute_52,code=sm_52 \
+          -gencode arch=compute_53,code=sm_53 \
+          -gencode arch=compute_60,code=sm_60 \
+          -gencode arch=compute_61,code=sm_61 \
+          -gencode arch=compute_62,code=sm_62 \
+          -gencode arch=compute_70,code=sm_70 \
+          -gencode arch=compute_72,code=sm_72 \
+          -gencode arch=compute_75,code=sm_75"
+    exit 0
+elif [ "$vn" = 10.2 ]
 then
     echo "-gencode arch=compute_30,code=sm_30 \
           -gencode arch=compute_32,code=sm_32 \
@@ -180,6 +196,38 @@ then
           -gencode arch=compute_75,code=sm_75 \
           -gencode arch=compute_80,code=sm_80"
     exit 0
+elif [ "$vn" = 11.1 ]
+then
+    echo "-gencode arch=compute_35,code=sm_35 \
+          -gencode arch=compute_37,code=sm_37 \
+          -gencode arch=compute_50,code=sm_50 \
+          -gencode arch=compute_52,code=sm_52 \
+          -gencode arch=compute_53,code=sm_53 \
+          -gencode arch=compute_60,code=sm_60 \
+          -gencode arch=compute_61,code=sm_61 \
+          -gencode arch=compute_62,code=sm_62 \
+          -gencode arch=compute_70,code=sm_70 \
+          -gencode arch=compute_72,code=sm_72 \
+          -gencode arch=compute_75,code=sm_75 \
+          -gencode arch=compute_80,code=sm_80 \
+          -gencode arch=compute_86,code=sm_86"
+    exit 0
+elif [ "$vn" = 11.2 ]
+then
+    echo "-gencode arch=compute_35,code=sm_35 \
+          -gencode arch=compute_37,code=sm_37 \
+          -gencode arch=compute_50,code=sm_50 \
+          -gencode arch=compute_52,code=sm_52 \
+          -gencode arch=compute_53,code=sm_53 \
+          -gencode arch=compute_60,code=sm_60 \
+          -gencode arch=compute_61,code=sm_61 \
+          -gencode arch=compute_62,code=sm_62 \
+          -gencode arch=compute_70,code=sm_70 \
+          -gencode arch=compute_72,code=sm_72 \
+          -gencode arch=compute_75,code=sm_75 \
+          -gencode arch=compute_80,code=sm_80 \
+          -gencode arch=compute_86,code=sm_86"
+    exit 0
 else
     echo $default_arch
     exit 0

config/vars.mk

@@ -110,11 +110,15 @@ CXXFLAGS    += ${CPPFLAGS} ${ARCHCXXFLAGS} ${USRCXXFLAGS} ${INCFLAGS}
 LDFLAGS     += ${ARCHLDFLAGS} ${USRLDFLAGS}   \
                -L. -L${DEVLIBDIR} -L${LIBDIR} \
                 ${LIBS} ${ARCHLIBS}
-NVCCFLAGS   += ${CPPFLAGS}                      \
-               ${ARCHNVCCFLAGS} ${ARCHCXXFLAGS} \
-               ${USRNVCCFLAGS}  ${USRCXXFLASG}  \
+NVCCFLAGS   += --compiler-options "${CPPFLAGS}"     \
+               ${ARCHNVCCFLAGS}                     \
+               --compiler-options "${ARCHCXXFLAGS}" \
+               ${USRNVCCFLAGS}                      \
+               --compiler-options "${USRCXXFLASG}"  \
                ${INCFLAGS}
-NVCCLDFLAGS += ${ARCHNVCCLDFLAGS} ${ARCHLDFLAGS} \
-               ${USRNVCCLDFLAGS}  ${USRLDFLAGS}  \
-               -L. -L${DEVLIBDIR} -L${LIBDIR}    \
+NVCCLDFLAGS += ${ARCHNVCCLDFLAGS}                  \
+               --compiler-options "${ARCHLDFLAGS}" \
+               ${USRNVCCLDFLAGS}                   \
+               --compiler-options "${USRLDFLAGS}"  \
+               -L. -L${DEVLIBDIR} -L${LIBDIR}      \
                 ${LIBS} ${CUDALIBS} ${ARCHLIBS}