diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29450e543fc08cd68fc7ae921a86dda0c0e3b319..84a7c77a4d4cf0a3b4f34b292f55386c1aee9bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# FSL base project changelog
+## 2106.1 (Friday 6th June 2021)
+
+ - Updated the `supportedGencodes.sh` script to add JIT targets for CUDA
+ projects.
+ - Added a Makefile.
+
## 2101.5 (Saturday 23rd January 2021)
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..1eac9931c6d6070dcccad7b5c1452ac7eb29bc11
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+MKDIR ?= /bin/mkdir -m 0755
+INSTALL ?= install -p
+PREFIX ?= ${FSLDEVDIR}
+
+install:
+ ${MKDIR} -p ${PREFIX}/bin
+ ${MKDIR} -p ${PREFIX}/config
+ ${MKDIR} -p ${PREFIX}/doc/images
+ ${MKDIR} -p ${PREFIX}/etc/fslconf
+ ${MKDIR} -p ${PREFIX}/etc/flirtsch
+ ${MKDIR} -p ${PREFIX}/etc/js
+ ${MKDIR} -p ${PREFIX}/etc/luts
+ ${MKDIR} -p ${PREFIX}/etc/matlab
+ ${MKDIR} -p ${PREFIX}/share/fsl/copyrights
+ ${MKDIR} -p ${PREFIX}/share/fsl/sbin
+ ${MKDIR} -p ${PREFIX}/share/fsl/bin
+
+ ${INSTALL} -m 0755 bin/* ${PREFIX}/bin/
+ ${INSTALL} -m 0755 bin/* ${PREFIX}/share/fsl/bin/
+ ${INSTALL} -m 0644 config/* ${PREFIX}/config/
+ ${INSTALL} -m 0755 config/supportedGencodes.sh ${PREFIX}/config/
+ ${INSTALL} -m 0644 doc/images/* ${PREFIX}/doc/images/
+ ${INSTALL} -m 0644 etc/fslconf/* ${PREFIX}/etc/fslconf/
+ ${INSTALL} -m 0644 etc/flirtsch/* ${PREFIX}/etc/flirtsch/
+ ${INSTALL} -m 0644 etc/fslconf/* ${PREFIX}/etc/fslconf/
+ ${INSTALL} -m 0644 etc/js/* ${PREFIX}/etc/js/
+ ${INSTALL} -m 0644 etc/luts/* ${PREFIX}/etc/luts/
+ ${INSTALL} -m 0644 etc/matlab/* ${PREFIX}/etc/matlab/
+ ${INSTALL} -m 0644 share/fsl/copyrights/* ${PREFIX}/share/fsl/copyrights/
+ ${INSTALL} -m 0755 share/fsl/sbin/* ${PREFIX}/share/fsl/sbin/
diff --git a/config/supportedGencodes.sh b/config/supportedGencodes.sh
index f2ed504c87a4fccd33d1dec9a520f9785f9052f1..3380ffca671f9beb974d4dcc7a7a66dd7663a000 100755
--- a/config/supportedGencodes.sh
+++ b/config/supportedGencodes.sh
@@ -8,7 +8,7 @@
default_arch="-gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_20,code=sm_21 \
-gencode arch=compute_30,code=sm_30 \
- -gencode arch=compute_35,code=sm_35"
+ -gencode arch=compute_35,code=compute_35"
vn=$1
@@ -21,7 +21,8 @@ then
-gencode arch=compute_20,code=sm_20 \
-gencode arch=compute_20,code=sm_21 \
-gencode arch=compute_30,code=sm_30 \
- -gencode arch=compute_35,code=sm_35"
+ -gencode arch=compute_35,code=sm_35 \
+ -gencode arch=compute_35,code=compute_35"
exit 0
elif [ "$vn" = 6.0 ]
then
@@ -34,7 +35,8 @@ then
-gencode arch=compute_30,code=sm_30 \
-gencode arch=compute_32,code=sm_32 \
-gencode arch=compute_35,code=sm_35 \
- -gencode arch=compute_50,code=sm_50"
+ -gencode arch=compute_50,code=sm_50 \
+ -gencode arch=compute_50,code=compute_50"
exit 0
elif [ "$vn" = 6.5 ]
then
@@ -47,7 +49,8 @@ then
-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_50,code=sm_50 \
+ -gencode arch=compute_50,code=compute_50"
exit 0
elif [ "$vn" = 7.0 ]
then
@@ -59,7 +62,8 @@ then
-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_53,code=sm_53 \
+ -gencode arch=compute_53,code=compute_53"
exit 0
elif [ "$vn" = 7.5 ]
then
@@ -71,7 +75,8 @@ then
-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_53,code=sm_53 \
+ -gencode arch=compute_53,code=compute_53"
exit 0
elif [ "$vn" = 8.0 ]
then
@@ -86,7 +91,8 @@ then
-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_62,code=sm_62 \
+ -gencode arch=compute_62,code=compute_62"
exit 0
elif [ "$vn" = 9.0 ]
then
@@ -101,7 +107,8 @@ then
-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_72,code=sm_72 \
+ -gencode arch=compute_72,code=compute_72"
exit 0
elif [ "$vn" = 9.1 ]
then
@@ -116,7 +123,8 @@ then
-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_72,code=sm_72 \
+ -gencode arch=compute_72,code=compute_72"
exit 0
elif [ "$vn" = 9.2 ]
then
@@ -131,7 +139,8 @@ then
-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_72,code=sm_72 \
+ -gencode arch=compute_72,code=compute_72"
exit 0
elif [ "$vn" = 10.0 ]
then
@@ -147,7 +156,8 @@ then
-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_75,code=sm_75 \
+ -gencode arch=compute_75,code=compute_75"
exit 0
elif [ "$vn" = 10.1 ]
then
@@ -163,7 +173,8 @@ then
-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_75,code=sm_75 \
+ -gencode arch=compute_75,code=compute_75"
exit 0
elif [ "$vn" = 10.2 ]
then
@@ -179,7 +190,8 @@ then
-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_75,code=sm_75 \
+ -gencode arch=compute_75,code=compute_75"
exit 0
elif [ "$vn" = 11.0 ]
then
@@ -194,7 +206,8 @@ then
-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_80,code=sm_80 \
+ -gencode arch=compute_80,code=compute_80"
exit 0
elif [ "$vn" = 11.1 ]
then
@@ -210,7 +223,8 @@ then
-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"
+ -gencode arch=compute_86,code=sm_86 \
+ -gencode arch=compute_86,code=compute_86"
exit 0
elif [ "$vn" = 11.2 ]
then
@@ -226,7 +240,8 @@ then
-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"
+ -gencode arch=compute_86,code=sm_86 \
+ -gencode arch=compute_86,code=compute_86"
exit 0
else
echo $default_arch
diff --git a/etc/fslconf/fsl-devel.sh b/etc/fslconf/fsl-devel.sh
index 6820726cedbe8d06fbf72df95e804cd0fec7c078..4b1559cfded596873251cb3251b7d1b19479c53b 100644
--- a/etc/fslconf/fsl-devel.sh
+++ b/etc/fslconf/fsl-devel.sh
@@ -10,9 +10,6 @@
# source $FSLDIR/etc/fslconf/fsl-devel.sh
#
-# SHBASECOPYRIGHT
-
-
# If this is an official (fslinstaller-installed)
# FSL installation, we activate the $FSLDIR conda
# environment so that we have access to its compiler
diff --git a/etc/fslconf/fsl.csh b/etc/fslconf/fsl.csh
index 970051348930722c818ceb1ab077c3a1b427a26d..f5c58fa35a9b00360ae99f7f8a0814582a624657 100644
--- a/etc/fslconf/fsl.csh
+++ b/etc/fslconf/fsl.csh
@@ -5,8 +5,6 @@
# Written by Mark Jenkinson
# FMRIB Analysis Group, University of Oxford
-# SHBASECOPYRIGHT
-
#### Set up standard FSL user environment variables ####
diff --git a/etc/fslconf/fsl.sh b/etc/fslconf/fsl.sh
index a7c356a49f826874724bef576c4ee05e5d0f0a1d..3be2ad6753630b13b8cd55720523bc62cbe87856 100644
--- a/etc/fslconf/fsl.sh
+++ b/etc/fslconf/fsl.sh
@@ -7,14 +7,11 @@
# export FSLDIR=/usr/local/fsl
# source $FSLDIR/etc/fslconf/fsl.sh
#
-# See fsl-devel.sh if you are a developer.
+# See fsl-devel.sh if you are compiling FSL projects.
#
# Written by Mark Jenkinson
# FMRIB Analysis Group, University of Oxford
-# SHBASECOPYRIGHT
-
-
#### Set up standard FSL user environment variables ####
# If this is an official (fslinstaller-installed)