Merge pull request #2026 from OvenMediaLabs/fix/cuda-stub

fix: added missing functions to libcudart.so.12

Author: Keukhan

misc/ome_docker_launcher.sh

@@ -138,7 +138,7 @@ banner()
 
 # Configurations
 IMAGE_NAME=airensoft/ovenmediaengine:latest
-CONTAINER_NAME=${CONTAINER_NAME:-ovenemediaengine}
+CONTAINER_NAME=${CONTAINER_NAME:-ovenmediaengine}
 PREFIX=${PREFIX:-/usr/share/ovenmediaengine/}
 
 if command -v realpath > /dev/null 2>&1

misc/ome_launcher.sh

@@ -145,9 +145,10 @@ banner()
 #############################################################################################
 append_ld_preload() {
     local lib_path="$1"
-    logd "Checking library for PRELOAD_PATH ${lib_path}"
     [[ -f "${lib_path}" ]] || return 0
 
+        logd "found for PRELOAD_PATH: ${lib_path}"
+
     if [[ -z "${LD_PRELOAD:-}" ]]; then
         LD_PRELOAD="${lib_path}"
     elif [[ ":${LD_PRELOAD}:" != *":${lib_path}:"* ]]; then
@@ -157,9 +158,11 @@ append_ld_preload() {
 
 append_ld_library_path() {
     local lib_path="$1"
-    logd "Checking library path for LD_LIBRARY_PATH: ${lib_path}"
+
     [[ -d "${lib_path}" ]] || return 0
 
+    logd "found for LD_LIBRARY_PATH: ${lib_path}"
+
     if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
         LD_LIBRARY_PATH="${lib_path}"
     elif [[ ":${LD_LIBRARY_PATH}:" != *":${lib_path}:"* ]]; then
@@ -199,7 +202,7 @@ load_library_set_if_complete() {
         local lib_path=""
         lib_path="$(find_lib "${lib_file}")"
         if [[ -z "${lib_path}" || ! -f "${lib_path}" ]]; then
-            logw "${label} libraries are not loaded. Missing: ${lib_file}"
+            logd "${label} libraries are not loaded. Missing: ${lib_file}"
             return 1
         fi
 
@@ -238,7 +241,7 @@ show_stub_linkage() {
 # Preload the installed drivers
 ##########################################################################################
 preload_xilinx_driver() {
-    logi "Checking for XILINX/XMA drivers to preload..."
+    logd "Checking for XILINX/XMA drivers to preload..."
 
     if [[ -f /opt/xilinx/xcdr/xrmd_start.bash ]]; then
         local lib_files=(
@@ -249,6 +252,7 @@ preload_xilinx_driver() {
         )
 
         if ! load_library_set_if_complete "XILINX/XMA" "${lib_files[@]}"; then
+            logi "Xiline/XMA driver not found. hardware acceleration is not supported"
             return
         fi
 
@@ -257,14 +261,15 @@ preload_xilinx_driver() {
         source /opt/xilinx/xrm/setup.sh > /dev/null 2>&1 || true
         source /opt/xilinx/xcdr/xrmd_start.bash || true
     else 
-        logw "XILINX/XMA drivers not found, skipping preload."
+	    logi "Xilinx/XMA driver not found. hardware acceleration is not supported"
     fi
 }
 
 preload_nvidia_driver() {
-    logi "Checking for NVIDIA/CUDA drivers to preload..."
+    logd "Checking for NVIDIA/CUDA drivers to preload..."
 
-    # CUDA 10.x libraries. It will be deprecated soon. 
+    # Deprecated
+    # CUDA 10.x libraries. 
     local lib_files_10=(
         "libnvidia-ml.so.1"
         "libcuda.so.1"
@@ -298,18 +303,22 @@ preload_nvidia_driver() {
     )
 
     if load_library_set_if_complete "NVIDIA/CUDA 12.x" "${lib_files_12[@]}"; then
+        logi "NVIDIA/CUDA 12.x drivers are installed. hardware acceleration is supported"
         return
     fi
 
     if load_library_set_if_complete "NVIDIA/CUDA 11.x" "${lib_files_11[@]}"; then
+        logw "NVIDIA/CUDA 11.x drivers are installed. hardware acceleration is supported. However, Some features may not be supported. it is recommended to update to CUDA 12.x for better performance and compatibility.."
         return
     fi
 
-    if load_library_set_if_complete "NVIDIA/CUDA 10.x" "${lib_files_10[@]}"; then
-        return
-    fi
+    # Deprecated
+    #if load_library_set_if_complete "NVIDIA/CUDA 10.x" "${lib_files_10[@]}"; then
+    #	logw "NVIDIA/CUDA 10.x drivers are installed. hardware acceleration is supported. However, Some features may not be supported. it is strongly recommended to update to CUDA 12.x for better performance and compatibility. "
+    #   return
+    #fi
 
-    logd "No complete NVIDIA/CUDA library set found. Skipping NVIDIA preload."
+    logi "NVIDIA/CUDA driver not found. hardware acceleration is not supported"
 }
 
 ############################################################################################
@@ -341,8 +350,8 @@ banner
 
 # Check the installed drivers and preload them.
 LD_PRELOAD=""
-preload_xilinx_driver
 preload_nvidia_driver
+preload_xilinx_driver
 
 # Set LD_LIBRARY_PATH (prepend required paths while preserving the existing value).
 append_ld_library_path "${DEFAULT_LIB_DIR}/lib/stubs"
@@ -370,4 +379,4 @@ else
     loge "OvenMediaEngine executable not found."
 fi    
 
-exit 1
+exit 1

misc/stubs/Makefile

@@ -8,7 +8,7 @@ CFLAGS = -Wall -fPIC
 LDFLAGS = -shared
 
 # Source files
-SOURCES = libnvidia-ml_stub.c libcuda_stub.c libcudart_stub.c libcublas_stub.c libcublasLt_stub.c libxma2api_stub.c libxrm_stub.c libxrt_core_stub.c 
+SOURCES = libnvidia-ml_stub.c libcuda_stub.c libcudart11_stub.c libcudart12_stub.c libcublas_stub.c libcublasLt_stub.c libxma2api_stub.c libxrm_stub.c libxrt_core_stub.c 
 
 # Object files
 OBJECTS = $(SOURCES:.c=.o)
@@ -32,7 +32,7 @@ libnvidia-ml.so.1: libnvidia-ml_stub.o
 libcuda.so.1: libcuda_stub.o
 	$(CC) $(LDFLAGS) -Wl,-soname,libcuda.so.1 -Wl,--version-script=libcuda.map -o $@ $^
 
-libcudart.so.11.0: libcudart_stub.o
+libcudart.so.11.0: libcudart11_stub.o
 	$(CC) $(LDFLAGS) -Wl,-soname,libcudart.so.11.0 -Wl,--version-script=libcudart11.map -o $@ $^
 
 libcublas.so.11: libcublas_stub.o
@@ -41,7 +41,7 @@ libcublas.so.11: libcublas_stub.o
 libcublasLt.so.11: libcublasLt_stub.o
 	$(CC) $(LDFLAGS) -Wl,-soname,libcublasLt.so.11 -Wl,--version-script=libcublasLt11.map -o $@ $^
 
-libcudart.so.12: libcudart_stub.o
+libcudart.so.12: libcudart12_stub.o
 	$(CC) $(LDFLAGS) -Wl,-soname,libcudart.so.12 -Wl,--version-script=libcudart12.map -o $@ $^
 
 libcublas.so.12: libcublas_stub.o