Skip to content
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

Optimize serializing speed #220

Merged
merged 13 commits into from
Jul 31, 2024
Merged

Optimize serializing speed #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
354ed65
Use mmap for loading model binaries
bab2min Jul 31, 2024
3f810f4
Optimize read operation of serializer
bab2min Jul 31, 2024
ed78fe6
move files under src/python
bab2min Jul 31, 2024
f99c80b
adjust relative include paths
bab2min Jul 31, 2024
d6dcbf7
Refactor src files in src/Utils
bab2min Jul 31, 2024
8bfdd7b
Refactor serializer definition of Document classes
bab2min Jul 31, 2024
2a76f34
Change to using cmake for install package
bab2min Jul 31, 2024
712a8c0
fixed compilation errors
bab2min Jul 31, 2024
a0d59b1
Remove build target `'none'` for x64
bab2min Jul 31, 2024
9fbfdca
Fix compilation errors
bab2min Jul 31, 2024
703488c
fixed setup.py & workflows
bab2min Jul 31, 2024
ab90f89
Refactor BlockStreamBuffer class to use non-contiguous memory blocks
bab2min Jul 31, 2024
b83e971
Merge branch 'main' into dev_improve_serializer
bab2min Jul 31, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/pull_request_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ jobs:
mv variant-1.1.3/include/mapbox include/
- name: Build
run: |
export AUDITWHEEL_PLAT=many
export MACOSX_DEPLOYMENT_TARGET=10.14
python -m pip install numpy==`python .github/workflows/numpy_version.py`
TOMOTOPY_CPU_ARCH=${{ matrix.cpu-arch }} python setup.py build install
Expand Down
116 changes: 116 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
cmake_minimum_required(VERSION 3.9)

project(tomotopy)

set ( CMAKE_CXX_STANDARD 17 )
set ( CMAKE_VERBOSE_MAKEFILE true )

set ( CMAKE_SKIP_RPATH ON )
set ( CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version" )

set ( EXT_TYPE "handler" CACHE STRING "dispatcher or handler" )
set ( TARGET_ARCH "" CACHE STRING "target architecture" )
set ( MODULE_NAME "_tomotopy" CACHE STRING "module name" )
set ( TOMOTOPY_ISA "none" CACHE STRING "target ISA" )
set ( NO_DEBUG_INFO OFF CACHE BOOL "no debug info" )
set ( TOMOTOPY_LANG "en" CACHE STRING "language" )

if(MSVC)
if (TARGET_ARCH STREQUAL "none")
set (ADDITIONAL_FLAGS "")
elseif (TARGET_ARCH STREQUAL "sse2")
set (ADDITIONAL_FLAGS "/arch:SSE2")
add_definitions(-D__SSE2__)
elseif (TARGET_ARCH STREQUAL "avx")
set (ADDITIONAL_FLAGS "/arch:AVX")
add_definitions(-D__SSE2__)
elseif (TARGET_ARCH STREQUAL "avx2")
set (ADDITIONAL_FLAGS "/arch:AVX2")
add_definitions(-D__SSE2__)
endif()

set ( CMAKE_C_FLAGS_DEBUG "-DDEBUG -DC_FLAGS -Zc:__cplusplus -Zi -Od ${ADDITIONAL_FLAGS}" )
set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" )

set ( CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DRELEASE -DC_FLAGS -Zc:__cplusplus -O2 -Oi -Gy ${ADDITIONAL_FLAGS}" )
set ( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" )

set ( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -Zi /bigobj")
set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set ( CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELEASE}" )
else()
set (CPU_ARCH "x86_64")
if (TARGET_ARCH STREQUAL "none")
set (ADDITIONAL_FLAGS "")
elseif (TARGET_ARCH STREQUAL "native")
set (ADDITIONAL_FLAGS "-march=native")
elseif (TARGET_ARCH STREQUAL "sse2")
set (ADDITIONAL_FLAGS "-msse2")
elseif (TARGET_ARCH STREQUAL "avx")
set (ADDITIONAL_FLAGS "-mavx")
elseif (TARGET_ARCH STREQUAL "avx2")
set (ADDITIONAL_FLAGS "-mavx2")
elseif (TARGET_ARCH STREQUAL "arm64")
set (CPU_ARCH "arm64")
endif()

if (APPLE)
message(STATUS "Apple Clang: use undefined=dynamic_lookup")
set (CMAKE_OSX_ARCHITECTURES "${CPU_ARCH}")
set (ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -undefined dynamic_lookup")
set (ADDITIONAL_LINKER_FLAGS "-stdlib=libc++")
endif()

set ( CMAKE_C_FLAGS_DEBUG "-DDEBUG -DC_FLAGS -g3 -O0 ${ADDITIONAL_FLAGS}" )
set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" )
set ( CMAKE_EXE_LINKER_FLAGS_DEBUG "-DDEBUG -DLINKER_FLAGS ${ADDITIONAL_LINKER_FLAGS}" )

set ( CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DRELEASE -DC_FLAGS -O3 ${ADDITIONAL_FLAGS}" )
set ( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" )
set ( CMAKE_EXE_LINKER_FLAGS_RELEASE "-DRELEASE -DLINKER_FLAGS ${ADDITIONAL_LINKER_FLAGS}" )

if (NO_DEBUG_INFO)
set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g0")
set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g0")
set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -g0")
set ( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g0")
endif()

set ( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g3")
set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set ( CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${ADDITIONAL_LINKER_FLAGS}" )
endif()

SET (srcs
)

if (EXT_TYPE STREQUAL "handler")
file(GLOB cpp_files "src/python/handler/*.cpp" "src/Utils/*.cpp" "src/TopicModel/*.cpp" "src/Labeling/*.cpp")
SET(srcs
${srcs}
${cpp_files}
)
add_definitions(-DMODULE_NAME=${MODULE_NAME})
add_definitions(-DTOMOTOPY_ISA=${TOMOTOPY_ISA})
if (TOMOTOPY_LANG STREQUAL "kr")
add_definitions(-DDOC_KO=1)
endif()
else()
file(GLOB cpp_files "src/python/dispatcher/*.cpp")
SET(srcs
${srcs}
${cpp_files}
)
endif()

include_directories(${INCLUDE_DIRS}
)
link_directories(${LIBRARY_DIRS})

add_library("_tomotopy_target" SHARED
${srcs}
)

target_link_libraries("_tomotopy_target" PRIVATE
${LIBRARIES}
)
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
numpy>=1.10.0
numpy>=1.10.0,<2
Loading
Loading