Merge branch 'rf/cuda-linking' into 'master'

Rf/cuda linking

See merge request !15

CHANGELOG.md

 # FSL base project changelog
 
 
+## 2107.2 (Sunday 11th July 2021)
+
+ - Further tweaks to CUDA linking logic.
+
+
 ## 2107.1 (Friday 9th July 2021)
 
  - Fix an issue with CUDA linking.

config/buildSettings.mk

@@ -153,15 +153,27 @@ ifneq ($(shell which nvcc), )
   # was invoked with "make CUDA_STATIC=1".
   _CUDALIBS = -lcuda
   ifdef CUDA_STATIC
-    # The cuda/cudart libs are handled by nvcc. Other
-    # components of the CUDA toolkit are provided as
-    # both dynamic and static libraries. "_CUDALIBS"
+    # The cuda/cudart/cudadevrt libs are handled by nvcc.
+    # Other components of the CUDA toolkit are provided
+    # as both dynamic and static libraries. "_CUDALIBS"
     # is what is used to construct the final NVCCLDFLAGS
-    # (see vars.mk)
-    # Other CUDA toolkit components will be added here
-    # on an as-needed basis.
-    NVCCFLAGS += --cudart=static --cudadevrt=static
-    _CUDALIBS += $(subst -lcublas,-lcublas_static -lcublasLt_static -lculibos, \
+    # (see vars.mk).
+    #
+    # --cudadevrt was added in CUDA/nvcc 10.*
+    #
+    # In CUDA 10.* and newer, cublas_static requires
+    # cublas_Lt_static, in addition to culibos
+    ifeq ($(patsubst 9.%,,${CUDA_VER}),)
+      CUBLAS_STATIC = -lcublas_static -lculibos
+      NVCCFLAGS    += --cudart=static
+    else
+      CUBLAS_STATIC = -lcublas_static -lcublasLt_static -lculibos
+      NVCCFLAGS    += --cudart=static --cudadevrt=static
+	endif
+
+    # Other CUDA toolkit components will
+    # be added here on an as-needed basis.
+    _CUDALIBS += $(subst -lcublas,${CUBLAS_STATIC}, \
                  $(subst -lcurand,-lcurand_static,${CUDALIBS}))
   else
     NVCCFLAGS += --cudart=shared  --cudadevrt=static