Commit e6b6fba5 authored by PanZezhong's avatar PanZezhong Committed by wooway777
Browse files

issue/1033 add fpic ldflag for infinirt and fix python link

parent 06362c94
...@@ -336,6 +336,7 @@ target("infinirt") ...@@ -336,6 +336,7 @@ target("infinirt")
if not is_plat("windows") then if not is_plat("windows") then
add_cxflags("-fPIC") add_cxflags("-fPIC")
add_cxxflags("-fPIC") add_cxxflags("-fPIC")
add_ldflags("-fPIC", {force = true})
end end
set_installdir(os.getenv("INFINI_ROOT") or (os.getenv(is_host("windows") and "HOMEPATH" or "HOME") .. "/.infini")) set_installdir(os.getenv("INFINI_ROOT") or (os.getenv(is_host("windows") and "HOMEPATH" or "HOME") .. "/.infini"))
add_files("src/infinirt/*.cc") add_files("src/infinirt/*.cc")
......
...@@ -147,14 +147,10 @@ target("flash-attn-nvidia") ...@@ -147,14 +147,10 @@ target("flash-attn-nvidia")
before_build(function (target) before_build(function (target)
if FLASH_ATTN_ROOT ~= nil then if FLASH_ATTN_ROOT ~= nil then
local outdata = os.iorunv("python", {"-c", "import torch, os; print(os.path.dirname(torch.__file__))"}):trim() local TORCH_DIR = os.iorunv("python", {"-c", "import torch, os; print(os.path.dirname(torch.__file__))"}):trim()
local TORCH_DIR = outdata local PYTHON_INCLUDE = os.iorunv("python", {"-c", "import sysconfig; print(sysconfig.get_paths()['include'])"}):trim()
local PYTHON_LIB_DIR= os.iorunv("python", {"-c", "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"}):trim()
local outdata = os.iorunv("python", {"-c", "import sysconfig; print(sysconfig.get_paths()['include'])"}):trim() local LIB_PYTHON = os.iorunv("python", {"-c", "import sysconfig, os; print(sysconfig.get_config_var('LDLIBRARY'))"}):trim()
local PYTHON_INCLUDE = outdata
local outdata = os.iorunv("python", {"-c", "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))"}):trim()
local PYTHON_LIB_DIR = outdata
-- Include dirs -- Include dirs
target:add("includedirs", FLASH_ATTN_ROOT .. "/csrc/flash_attn/src", {public = false}) target:add("includedirs", FLASH_ATTN_ROOT .. "/csrc/flash_attn/src", {public = false})
target:add("includedirs", TORCH_DIR .. "/include/torch/csrc/api/include", {public = false}) target:add("includedirs", TORCH_DIR .. "/include/torch/csrc/api/include", {public = false})
...@@ -165,7 +161,7 @@ target("flash-attn-nvidia") ...@@ -165,7 +161,7 @@ target("flash-attn-nvidia")
-- Link libraries -- Link libraries
target:add("linkdirs", TORCH_DIR .. "/lib", PYTHON_LIB_DIR) target:add("linkdirs", TORCH_DIR .. "/lib", PYTHON_LIB_DIR)
target:add("links", "torch", "torch_cuda", "torch_cpu", "c10", "c10_cuda", "torch_python", "python3") target:add("links", "torch", "torch_cuda", "torch_cpu", "c10", "c10_cuda", "torch_python", LIB_PYTHON)
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment