Merge develop

configure.ac

@@ -298,9 +298,6 @@ case ${ax_cv_cxx_compiler_vendor} in
   clang|gnu)
     case ${ac_SIMD} in
       GPU)
-        AC_DEFINE([GPU],[1],[GPU float4 vectors])
-	SIMD_FLAGS='';;
-      VGPU)
         AC_DEFINE([GPU_VEC],[1],[GPU vectorised 512bit])
         AC_DEFINE_UNQUOTED([GEN_SIMD_WIDTH],[$ac_gen_simd_width],
                            [generic SIMD vector width (in bytes)])
@@ -358,7 +355,7 @@ case ${ax_cv_cxx_compiler_vendor} in
     esac;;
   intel)
     case ${ac_SIMD} in
-      GPU|VGPU)
+      GPU)
         AC_DEFINE([GPU_VEC],[1],[GPU vectorised ])
 	SIMD_FLAGS='';;
       SSE4)