Vulkan PR fixes and missing Makefile update

Author: MaggotHATE

Makefile

@@ -29,6 +29,17 @@ ifndef UNAME_M
 UNAME_M := $(shell uname -m)
 endif
 
+# In GNU make default CXX is g++ instead of c++.  Let's fix that so that users
+# of non-gcc compilers don't have to provide g++ alias or wrapper.
+DEFCC  := cc
+DEFCXX := c++
+ifeq ($(origin CC),default)
+CC  := $(DEFCC)
+endif
+ifeq ($(origin CXX),default)
+CXX := $(DEFCXX)
+endif
+
 # detect Windows
 ifneq ($(findstring _NT,$(UNAME_S)),)
 	_WIN32 := 1
@@ -635,6 +646,15 @@ GET_OBJ_FILE = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cu,%.o,$(1))
 
 #NAMED BULDS
 
+chat: $(EXE)_mini
+	@echo Build $(EXE)_mini complete for $(ECHO_MESSAGE)
+    
+chat_cl: $(EXE_CL)_mini
+	@echo Build $(EXE_CL)_mini complete for $(ECHO_MESSAGE)
+    
+chat_vk: $(EXE_VK)_mini
+	@echo Build $(EXE_VK)_mini complete for $(ECHO_MESSAGE)
+    
 demo: $(EXE)
 	@echo Build $(EXE) complete for $(ECHO_MESSAGE) 
 

base/ggml-vulkan.cpp

@@ -5418,7 +5418,7 @@ static void ggml_vk_preallocate_buffers(ggml_backend_vk_context * ctx) {
 }
 
 static void ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_tensor * node, bool last_node){
-    if (ctx->disable || node->backend != GGML_BACKEND_TYPE_GPU) {
+    if (ctx->disable || node->backend != GGML_BACKEND_TYPE_GPU || ggml_is_empty(node)) {
         return;
     }
 
@@ -6218,7 +6218,7 @@ GGML_CALL static ggml_status ggml_backend_vk_graph_compute(ggml_backend_t backen
     int last_node = cgraph->n_nodes - 1;
 
     // If the last op in the cgraph isn't backend GPU, the command buffer doesn't get closed properly
-    while (last_node > 0 && cgraph->nodes[last_node]->backend != GGML_BACKEND_TYPE_GPU) {
+    while (last_node > 0 && (cgraph->nodes[last_node]->backend != GGML_BACKEND_TYPE_GPU || ggml_is_empty(cgraph->nodes[last_node]))) {
         last_node -= 1;
     }