fix infllmv2 link

Signed-off-by: Ceng23333 <441651826@qq.com>

Author: Ceng23333

test/infinicore/ops/test_infllmv2_attention.py

@@ -28,14 +28,6 @@
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
-# Load InfLLM-v2 with RTLD_GLOBAL before libinfinicore_cpp_api resolves mha_* symbols.
-try:
-    from infllmv2_loader import preload_infllmv2_if_available
-except ImportError:
-    pass
-else:
-    preload_infllmv2_if_available()
-
 import infinicore
 import torch
 

test/infinicore/ops/test_simple_gla_decode_recurrent.py

@@ -18,10 +18,6 @@
 
 import torch
 
-from infllmv2_loader import preload_infllmv2_if_available
-
-preload_infllmv2_if_available()
-
 import infinicore
 
 from framework import (

test/infinicore/ops/test_simple_gla_prefill.py

@@ -16,10 +16,6 @@
 
 import torch
 
-from infllmv2_loader import preload_infllmv2_if_available
-
-preload_infllmv2_if_available()
-
 import infinicore
 
 from framework import (
@@ -153,4 +149,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-

xmake.lua

@@ -575,9 +575,11 @@ target("infinicore_cpp_api")
             local abs = path.absolute(resolved_infllmv2)
             local so_dir = path.directory(abs)
             local so_name = path.filename(abs)
-            target:add("linkdirs", so_dir, { public = true })
-            target:add("ldflags", "-l:" .. so_name, { public = true })
-            target:add("ldflags", "-Wl,-rpath," .. so_dir, { public = true })
+            -- IMPORTANT: ensure `infinicore_cpp_api` gets a DT_NEEDED on infllm_v2 .so.
+            -- Using `shflags` (not `ldflags`) and `--no-as-needed` avoids the linker
+            -- dropping the dependency and leaving runtime undefined symbols
+            -- (e.g. `mha_varlen_fwd`) that would otherwise require LD_PRELOAD/ctypes preload.
+            target:add("shflags", "-Wl,--no-as-needed -L" .. so_dir .. " -l:" .. so_name .. " -Wl,-rpath," .. so_dir, { public = true })
         end
     end)