fix vulkan builds

Author: dbsanfte

.devcontainer/Dockerfile

@@ -3,6 +3,7 @@ FROM ubuntu:24.04
 # Build arguments for optional components (default: disabled)
 ARG INSTALL_CUDA=false
 ARG INSTALL_ROCM=false
+ARG INSTALL_VULKAN=false
 ARG INSTALL_PYTHON_DEPS=false
 
 # Avoid prompts from apt
@@ -84,6 +85,18 @@ RUN if [ "$INSTALL_ROCM" = "true" ]; then \
         echo "Skipping ROCm installation"; \
     fi
 
+# Install Vulkan SDK (conditional)
+RUN if [ "$INSTALL_VULKAN" = "true" ]; then \
+        wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | tee /etc/apt/trusted.gpg.d/lunarg.asc && \
+        wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list http://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list && \
+        apt-get update && \
+        apt-get install -y vulkan-sdk && \
+        apt-get autoremove -y && \
+        apt-get clean; \
+    else \
+        echo "Skipping Vulkan SDK installation"; \
+    fi
+
 # Install Python dependencies for gguf conversion tools (conditional)
 RUN if [ "$INSTALL_PYTHON_DEPS" = "true" ]; then \
         python3 -m pip install --break-system-packages \

.devcontainer/devcontainer.json

@@ -5,7 +5,8 @@
 		"args": {
 			// Enable/disable optional components (set to "true" to install)
 			"INSTALL_CUDA": "true",
-			"INSTALL_ROCM": "true", 
+			"INSTALL_ROCM": "true",
+			"INSTALL_VULKAN": "true",
 			"INSTALL_PYTHON_DEPS": "false"
 		}
 	},

ggml/src/ggml-vulkan/ggml-vulkan.cpp

@@ -1398,7 +1398,7 @@ static void * const vk_ptr_base = (void *)(uintptr_t) 0x1000;  // NOLINT
 
 static uint64_t vk_tensor_offset(const ggml_tensor * tensor) {
     if (tensor->view_src) {
-        return (uint8_t *) tensor->tensor_data(view_src) - (uint8_t *) vk_ptr_base;
+        return (uint8_t *) tensor_data(tensor->view_src) - (uint8_t *) vk_ptr_base;
     }
     return (uint8_t *) tensor_data(tensor) - (uint8_t *) vk_ptr_base;
 }
@@ -7356,7 +7356,7 @@ static void ggml_vk_flash_attn(ggml_backend_vk_context * ctx, vk_context& subctx
     if (ctx->device->uma) {
         ggml_vk_host_get(ctx->device, tensor_data(q), d_Q, q_buf_offset);
         ggml_vk_host_get(ctx->device, tensor_data(k), d_K, k_buf_offset);
-        ggml_vk_host_get(ctx->device, v->data(), d_V, v_buf_offset);
+        ggml_vk_host_get(ctx->device, tensor_data(v), d_V, v_buf_offset);
         ggml_vk_host_get(ctx->device, tensor_data(dst), d_D, d_buf_offset);
         Q_uma = d_Q != nullptr;
         K_uma = d_K != nullptr;
@@ -8555,7 +8555,7 @@ static void ggml_vk_multi_add(ggml_backend_vk_context * ctx, vk_context& subctx,
         uma[i] = false;
 
         if (ctx->device->uma) {
-            ggml_vk_host_get(ctx->device, tensors[i]->data, buf[i], offset[i]);
+            ggml_vk_host_get(ctx->device, tensor_data(tensors[i]), buf[i], offset[i]);
             uma[i] = buf[i] != nullptr;
         }
         if (!uma[i]) {
@@ -8708,7 +8708,7 @@ static void ggml_vk_op_f32_wkv(ggml_backend_vk_context * ctx, vk_context& subctx
 
     if (ctx->device->uma) {
         for (int i = 0; i < num_srcs; i++) {
-            ggml_vk_host_get(ctx->device, dst->src[i]->data, d_srcs[i], src_offsets[i]);
+            ggml_vk_host_get(ctx->device, tensor_data(dst->src[i]), d_srcs[i], src_offsets[i]);
             srcs_uma[i] = d_srcs[i] != nullptr;
         }