Skip to content

[metax]modify library to static library #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 16, 2025
Merged

[metax]modify library to static library #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51da6b7
modify cmake for warpctc and warprnnt
jxwangmetax Sep 16, 2025
b60cba2
Merge branch 'metax666:develop' into develop
jxwangmetax Sep 16, 2025
1abea54
modify conv for tf32 and fp32
jxwangmetax Sep 16, 2025
fc63171
Merge branch 'metax666:develop' into develop
jxwangmetax Sep 16, 2025
f26987f
modify conv kernel
jxwangmetax Sep 16, 2025
a0cb0a7
modify library to static library
jxwangmetax Sep 16, 2025
d6579b8
Merge branch 'develop' into develop
jxwangmetax Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions backends/metax_gpu/cmake/warpctc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ set(WARPCTC_LIB_DIR

if(WIN32)
set(WARPCTC_LIBRARIES
"${WARPCTC_INSTALL_DIR}/bin/warpctc${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${WARPCTC_INSTALL_DIR}/bin/warpctc${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE FILEPATH "Warp-ctc Library" FORCE)
else()
set(WARPCTC_LIBRARIES
"${WARPCTC_INSTALL_DIR}/lib/libwarpctc${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${WARPCTC_INSTALL_DIR}/lib/libwarpctc${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE FILEPATH "Warp-ctc Library" FORCE)
endif()

Expand All @@ -93,10 +93,10 @@ if(WIN32)
set(WARPCTC_CXX_FLAGS_DEBUG
$<FILTER:${CMAKE_CXX_FLAGS_DEBUG},EXCLUDE,/Zc:inline>)
else()
set(WARPCTC_C_FLAGS ${CMAKE_C_FLAGS})
set(WARPCTC_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(WARPCTC_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
set(WARPCTC_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
set(WARPCTC_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(WARPCTC_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(WARPCTC_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
set(WARPCTC_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
endif()
Expand Down Expand Up @@ -127,7 +127,7 @@ ExternalProject_Add(
-DNVCC_FLAGS_EXTRA=${NVCC_FLAGS_EXTRA}
-DWITH_TORCH=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Torch=ON
-DBUILD_SHARED=ON
-DBUILD_SHARED=OFF
-DBUILD_TESTS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
Expand All @@ -145,8 +145,7 @@ get_filename_component(WARPCTC_LIBRARY_PATH ${WARPCTC_LIBRARIES} DIRECTORY)
include_directories(${WARPCTC_INCLUDE_DIR}) # For warpctc code to include its
# headers.

add_library(warpctc SHARED IMPORTED GLOBAL)
set_target_properties(warpctc PROPERTIES
IMPORTED_LOCATION ${WARPCTC_LIBRARIES}
INTERFACE_INCLUDE_DIRECTORIES ${WARPCTC_INCLUDE_DIR}
)
add_library(warpctc STATIC IMPORTED GLOBAL)
set_target_properties(
warpctc PROPERTIES IMPORTED_LOCATION ${WARPCTC_LIBRARIES}
INTERFACE_INCLUDE_DIRECTORIES ${WARPCTC_INCLUDE_DIR})
19 changes: 9 additions & 10 deletions backends/metax_gpu/cmake/warprnnt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ set(WARPRNNT_LIB_DIR

if(WIN32)
set(WARPRNNT_LIBRARIES
"${WARPRNNT_INSTALL_DIR}/bin/warprnnt${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${WARPRNNT_INSTALL_DIR}/bin/warprnnt${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE FILEPATH "Warp-rnnt Library" FORCE)
else()
set(WARPRNNT_LIBRARIES
"${WARPRNNT_INSTALL_DIR}/lib/libwarprnnt${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${WARPRNNT_INSTALL_DIR}/lib/libwarprnnt${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE FILEPATH "Warp-rnnt Library" FORCE)
endif()

Expand All @@ -90,10 +90,10 @@ if(WIN32)
set(WARPRNNT_CXX_FLAGS_DEBUG
$<FILTER:${CMAKE_CXX_FLAGS_DEBUG},EXCLUDE,/Zc:inline>)
else()
set(WARPRNNT_C_FLAGS ${CMAKE_C_FLAGS})
set(WARPRNNT_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(WARPRNNT_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
set(WARPRNNT_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
set(WARPRNNT_CXX_FLAGS ${CMAKE_CXX_FLAGS})
set(WARPRNNT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(WARPRNNT_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
set(WARPRNNT_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
endif()
Expand All @@ -120,7 +120,7 @@ ExternalProject_Add(
-DWITH_ROCM=${WITH_ROCM}
-DWITH_OMP=${USE_OMP}
-DNVCC_FLAGS_EXTRA=${NVCC_FLAGS_EXTRA}
-DBUILD_SHARED=ON
-DBUILD_SHARED=OFF
-DBUILD_TESTS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
Expand All @@ -137,8 +137,7 @@ get_filename_component(WARPRNNT_LIBRARY_PATH ${WARPRNNT_LIBRARIES} DIRECTORY)
include_directories(${WARPRNNT_INCLUDE_DIR}) # For warprnnt code to include its
# headers.

add_library(warprnnt SHARED IMPORTED GLOBAL)
set_target_properties(warprnnt PROPERTIES
IMPORTED_LOCATION ${WARPRNNT_LIBRARIES}
INTERFACE_INCLUDE_DIRECTORIES ${WARPRNNT_INCLUDE_DIR}
)
add_library(warprnnt STATIC IMPORTED GLOBAL)
set_target_properties(
warprnnt PROPERTIES IMPORTED_LOCATION ${WARPRNNT_LIBRARIES}
INTERFACE_INCLUDE_DIRECTORIES ${WARPRNNT_INCLUDE_DIR})
Loading