Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ktransformers
Commits
9dd24ecd
Commit
9dd24ecd
authored
Apr 08, 2025
by
Atream
Browse files
fix compile, add abi check to setup.py
parent
f4ae7c85
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
28 deletions
+17
-28
CMakeLists.txt
CMakeLists.txt
+0
-25
csrc/balance_serve/CMakeLists.txt
csrc/balance_serve/CMakeLists.txt
+1
-0
csrc/balance_serve/kvc2/CMakeLists.txt
csrc/balance_serve/kvc2/CMakeLists.txt
+3
-2
csrc/balance_serve/sched/CMakeLists.txt
csrc/balance_serve/sched/CMakeLists.txt
+1
-0
csrc/ktransformers_ext/CMakeLists.txt
csrc/ktransformers_ext/CMakeLists.txt
+1
-0
setup.py
setup.py
+11
-1
No files found.
CMakeLists.txt
deleted
100644 → 0
View file @
f4ae7c85
cmake_minimum_required
(
VERSION 3.10
)
find_package
(
PythonInterp REQUIRED
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"
import torch
print(torch.compiled_with_cxx11_abi())
"
OUTPUT_VARIABLE TORCH_CXX11_ABI
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
TORCH_CXX11_ABI MATCHES
"True|False"
)
if
(
TORCH_CXX11_ABI
)
message
(
STATUS
"PyTorch was compiled with CXX11 ABI: ON"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D_GLIBCXX_USE_CXX11_ABI=1"
)
else
()
message
(
STATUS
"PyTorch was compiled with CXX11 ABI: OFF"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D_GLIBCXX_USE_CXX11_ABI=0"
)
endif
()
else
()
message
(
WARNING
"Could not determine if PyTorch was compiled with CXX11 ABI. Defaulting to OFF."
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-D_GLIBCXX_USE_CXX11_ABI=0"
)
endif
()
csrc/balance_serve/CMakeLists.txt
View file @
9dd24ecd
...
...
@@ -13,6 +13,7 @@ set(CMAKE_CXX_STANDARD 20)
# set(CMAKE_CXX_FLAGS "-Og -march=native -Wall -Wextra -g -fPIC")
# set(CMAKE_BUILD_TYPE "Debug")
set
(
CMAKE_CXX_FLAGS
"-O3 -march=native -Wall -Wextra -fPIC"
)
add_compile_definitions
(
_GLIBCXX_USE_CXX11_ABI=
${
_GLIBCXX_USE_CXX11_ABI
}
)
set
(
CMAKE_BUILD_TYPE
"Release"
)
file
(
GLOB_RECURSE FMT_SOURCES
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/*.cpp"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/*.hpp"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/*.h"
)
...
...
csrc/balance_serve/kvc2/CMakeLists.txt
View file @
9dd24ecd
...
...
@@ -11,8 +11,9 @@ set(CMAKE_CXX_STANDARD 20)
# set(CMAKE_CXX_FLAGS "-Og -march=native -Wall -Wextra -Wpedantic -g -fsanitize=address")
# set(CMAKE_CXX_FLAGS "-march=native -Wall -Wextra -Wpedantic -g")
# set(CMAKE_CXX_FLAGS "-fPIC -O3 -ffast-math -march=native -Wall -Wextra -g")
# set(CMAKE_BUILD_TYPE "Release")
set
(
CMAKE_BUILD_TYPE
"Debug"
)
set
(
CMAKE_BUILD_TYPE
"Release"
)
add_compile_definitions
(
_GLIBCXX_USE_CXX11_ABI=
${
_GLIBCXX_USE_CXX11_ABI
}
)
# set(CMAKE_BUILD_TYPE "Debug")
set
(
CMAKE_EXPORT_COMPILE_COMMANDS ON
)
set
(
BUILD_TEST OFF
)
set
(
BUILD_PYTHON_EXT OFF
)
...
...
csrc/balance_serve/sched/CMakeLists.txt
View file @
9dd24ecd
set
(
CMAKE_CXX_FLAGS
"-Og -march=native -Wall -Wextra -g -fPIC"
)
# set(CMAKE_CXX_FLAGS "-O3 -march=native -Wall -Wextra -fPIC")
add_compile_definitions
(
_GLIBCXX_USE_CXX11_ABI=
${
_GLIBCXX_USE_CXX11_ABI
}
)
set
(
UTILS_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/utils
)
...
...
csrc/ktransformers_ext/CMakeLists.txt
View file @
9dd24ecd
...
...
@@ -6,6 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-O3 -ffast-math -fopenmp"
)
add_compile_definitions
(
_GLIBCXX_USE_CXX11_ABI=
${
_GLIBCXX_USE_CXX11_ABI
}
)
set
(
CMAKE_BUILD_TYPE
"Release"
)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ffast-math -fopenmp")
# set(CMAKE_BUILD_TYPE "Debug")
...
...
setup.py
View file @
9dd24ecd
...
...
@@ -25,6 +25,7 @@ import urllib.request
import
urllib.error
from
pathlib
import
Path
from
packaging.version
import
parse
import
torch
import
torch.version
from
wheel.bdist_wheel
import
bdist_wheel
as
_bdist_wheel
from
setuptools
import
setup
,
Extension
...
...
@@ -281,6 +282,13 @@ class CMakeExtension(Extension):
print
(
name
,
sourcedir
)
self
.
sourcedir
=
sourcedir
def
get_cmake_abi_args
(
cmake_args
):
if
torch
.
compiled_with_cxx11_abi
():
cmake_args
.
append
(
"-D_GLIBCXX_USE_CXX11_ABI=1"
)
else
:
cmake_args
.
append
(
"-D_GLIBCXX_USE_CXX11_ABI=0"
)
return
cmake_args
class
CMakeBuild
(
BuildExtension
):
def
build_extension
(
self
,
ext
)
->
None
:
...
...
@@ -318,6 +326,8 @@ class CMakeBuild(BuildExtension):
cmake_args
+=
[
"-DKTRANSFORMERS_USE_ROCM=ON"
]
else
:
raise
ValueError
(
"Unsupported backend: CUDA_HOME, MUSA_HOME, and ROCM_HOME are not set."
)
cmake_args
=
get_cmake_abi_args
(
cmake_args
)
# log cmake_args
print
(
"CMake args:"
,
cmake_args
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment