Merge branch 'vulkan_test' into concedo_experimental

# Conflicts:
#	CMakeLists.txt
#	Makefile
#	llama.cpp

expose.h

@@ -44,6 +44,7 @@ struct load_model_inputs
     const bool use_contextshift;
     const int clblast_info = 0;
     const int cublas_info = 0;
+    const int vulkan_info = 0;
     const int blasbatchsize = 512;
     const int debugmode = 0;
     const int forceversion = 0;