remoting: rewrite to avoid hard-coded paths

Author: kpouget

ggml/src/ggml-remotingbackend/backend.cpp

@@ -10,17 +10,10 @@
 #include "shared/apir_backend.h"
 #include "shared/venus_cs.h"
 
-#define USE_METAL 1
-
-#if USE_METAL
-#define GGML_BACKEND_LIBRARY_PATH "/Users/kevinpouget/remoting/llama_cpp/build.remoting-backend/bin/libggml-metal.dylib"
-#define GGML_BACKEND_REG_FCT_NAME "ggml_backend_metal_reg"
-#define GGML_BACKEND_INIT_FCT_NAME "ggml_backend_metal_init"
-#else
-#define GGML_BACKEND_LIBRARY_PATH "/Users/kevinpouget/remoting/llama_cpp/build.remoting-backend/bin/libggml-vulkan.dylib"
-#define GGML_BACKEND_REG_FCT_NAME "ggml_backend_vk_reg"
-#define GGML_BACKEND_INIT_FCT_NAME "ggml_backend_vk_init"
-#endif
+#define GGML_BACKEND_LIBRARY_PATH_ENV "APIR_LLAMA_CPP_GGML_LIBRARY_PATH"
+#define GGML_BACKEND_LIBRARY_REG_ENV "APIR_LLAMA_CPP_GGML_LIBRARY_REG"
+#define GGML_BACKEND_LIBRARY_INIT_ENV "APIR_LLAMA_CPP_GGML_LIBRARY_INIT"
+
 
 static void *backend_library_handle = NULL;
 
@@ -52,25 +45,47 @@ extern "C" {
   uint32_t apir_backend_initialize() {
     const char* dlsym_error;
 
-    INFO("%s: hello " GGML_BACKEND_REG_FCT_NAME " :wave: \\o/", __func__);
+    const char* library_name = getenv(GGML_BACKEND_LIBRARY_PATH_ENV);
+    const char* library_reg = getenv(GGML_BACKEND_LIBRARY_REG_ENV);
+    const char* library_init = getenv(GGML_BACKEND_LIBRARY_INIT_ENV);
+
+    INFO("%s: loading %s (%s|%s)", __func__, library_name, library_reg, library_init);
+
+    if (!library_name) {
+      ERROR("Cannot open library: env var '%s' not defined\n", GGML_BACKEND_LIBRARY_PATH_ENV);
 
-    backend_library_handle = dlopen(GGML_BACKEND_LIBRARY_PATH, RTLD_LAZY);
+      return APIR_BACKEND_INITIALIZE_CANNOT_OPEN_GGML_LIBRARY;
+    }
+
+    backend_library_handle = dlopen(library_name, RTLD_LAZY);
 
     if (!backend_library_handle) {
       ERROR("Cannot open library: %s\n", dlerror());
 
       return APIR_BACKEND_INITIALIZE_CANNOT_OPEN_GGML_LIBRARY;
     }
 
-    void *ggml_backend_reg_fct = dlsym(backend_library_handle, GGML_BACKEND_REG_FCT_NAME);
+    if (!library_reg) {
+      ERROR("Cannot register library: env var '%s' not defined\n", GGML_BACKEND_LIBRARY_REG_ENV);
+
+      return APIR_BACKEND_INITIALIZE_CANNOT_OPEN_GGML_LIBRARY;
+    }
+
+    void *ggml_backend_reg_fct = dlsym(backend_library_handle, library_reg);
     dlsym_error = dlerror();
     if (dlsym_error) {
       ERROR("Cannot load symbol: %s\n", dlsym_error);
 
       return APIR_BACKEND_INITIALIZE_MISSING_GGML_SYMBOLS;
     }
 
-    void *ggml_backend_init_fct = dlsym(backend_library_handle, GGML_BACKEND_INIT_FCT_NAME);
+    if (!library_init) {
+      ERROR("Cannot initialize library: env var '%s' not defined\n", library_init);
+
+      return APIR_BACKEND_INITIALIZE_CANNOT_OPEN_GGML_LIBRARY;
+    }
+
+    void *ggml_backend_init_fct = dlsym(backend_library_handle, library_init);
     dlsym_error = dlerror();
     if (dlsym_error) {
       ERROR("Cannot load symbol: %s\n", dlsym_error);

ggml/src/ggml-remotingbackend/shared/api_remoting.h

@@ -1,4 +1,3 @@
-
 #define VIRGL_APIR_COMMAND_TYPE_LoadLibrary 255
 #define VIRGL_APIR_COMMAND_TYPE_Forward 256
 

ggml/src/ggml-remotingbackend/shared/apir_backend.h

@@ -1,10 +1,5 @@
 #pragma once
 
-#define APIR_LIBRARY_PATH "/Users/kevinpouget/remoting/llama_cpp/build.remoting-backend-prod/bin/libggml-remotingbackend.dylib"
-#define APIR_INITIALIZE_FCT_NAME "apir_backend_initialize"
-#define APIR_DEINIT_FCT_NAME "apir_backend_deinit"
-#define APIR_DISPATCH_FCT_NAME "apir_backend_dispatcher"
-
 #define APIR_BACKEND_INITIALIZE_SUCCESSS 0
 #define APIR_BACKEND_INITIALIZE_CANNOT_OPEN_BACKEND_LIBRARY 1
 #define APIR_BACKEND_INITIALIZE_CANNOT_OPEN_GGML_LIBRARY 2
@@ -24,18 +19,9 @@ typedef struct {
   apir_buffer_type_host_handle_t buft_host_handle;
 } apir_buffer_context_t;
 
-typedef uint32_t (*apir_backend_initialize_t)(void);
-typedef void (*apir_backend_deinit_t)(void);
-
 struct vn_dispatch_context;
 struct virgl_apir_context;
 
-typedef uint32_t (*apir_backend_dispatch_t)(uint32_t cmd_type, struct virgl_apir_context *ctx,
-                                            char *dec_cur, const char *dec_end,
-                                            char *enc_cur, const char *enc_end,
-                                            char **enc_cur_after
-  );
-
 typedef enum ApirBackendCommandType {
   /* device */
   APIR_COMMAND_TYPE_DEVICE_GET_COUNT = 0,
@@ -72,7 +58,7 @@ typedef enum ApirBackendCommandType {
 
 struct virgl_apir_callbacks {
   void *(*get_shmem_ptr)(struct vn_dispatch_context *ctx, uint32_t res_id);
-} ;
+};
 
 struct virgl_apir_context {
   struct vn_dispatch_context *virgl_ctx;

ggml/src/ggml-remotingfrontend/CMakeLists.txt

@@ -22,17 +22,11 @@ ggml_add_backend_library(ggml-remotingfrontend
                          venus_cs_ggml-rpc-front.cpp
                         )
 
+# dnf install -y libdrm-devel
 target_link_libraries(ggml-remotingfrontend PUBLIC drm)
 target_include_directories(ggml-remotingfrontend PUBLIC /usr/include/libdrm/)
+target_include_directories(ggml-remotingfrontend PUBLIC ./include)
 
-set(REMOTING_PROJECT /Users/kevinpouget/remoting)
-set(MESA_PROJECT_HOME ${REMOTING_PROJECT}/mesa)
-set(MESA_PROJECT_SRC ${MESA_PROJECT_HOME}/src)
-
-target_include_directories(ggml-remotingfrontend PUBLIC ${MESA_PROJECT_SRC}/virtio/virtio-gpu/)
-target_include_directories(ggml-remotingfrontend PUBLIC ${MESA_PROJECT_HOME}/include)
 target_include_directories(ggml-remotingfrontend PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 target_compile_options(ggml-remotingfrontend PRIVATE -std=c++20)
-
-# dnf install -y libdrm-devel