8000 python modules shall dynamicly link to libstdc++ by yuzhichang · Pull Request #1423 · infiniflow/infinity · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

python modules shall dynamicly link to libstdc++ #1423

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 2 commits into from
Jul 2, 2024
Merged

python modules shall dynamicly link to libstdc++ #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a116ccc
Removed unused modules
yuzhichang Jul 2, 2024
9f9076b
Python module shall dynamic link libstdc++
yuzhichang Jul 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
run: |
sudo rm -f cmake-build-release/*.deb cmake-build-release/*.rpm cmake-build-release/*.gz
sed -i "s/^version = \".*\"/version = \"$(echo $RELEASE_TAG | cut -c2-)\"/" pyproject.toml
sudo docker exec infinity_build bash -c "cd /infinity/ && rm -f dist/* && /usr/local/bin/pip3.10 wheel . -v -w dist --config-settings=wheel.py-api=cp310 --config-settings=build-dir='cmake-build-release' && /usr/local/bin/pip3.11 wheel . -v -w dist --config-settings=wheel.py-api=cp311 --config-settings=build-dir='cmake-build-release' && /usr/local/bin/pip3.12 wheel . -v -w dist --config-settings=wheel.py-api=cp312 --config-settings=build-dir='cmake-build-release' && auditwheel repair --plat manylinux_2_17_x86_64 dist/infinity*.whl"
sudo docker exec infinity_build bash -c "cd /infinity/ && rm -rf dist wheelhouse && /usr/local/bin/pip3.10 wheel . -v -w dist --config-settings=wheel.py-api=cp310 --config-settings=build-dir='cmake-build-release' && /usr/local/bin/pip3.11 wheel . -v -w dist --config-settings=wheel.py-api=cp311 --config-settings=build-dir='cmake-build-release' && /usr/local/bin/pip3.12 wheel . -v -w dist --config-settings=wheel.py-api=cp312 --config-settings=build-dir='cmake-build-release' && mkdir wheelhouse && cp dist/infinity*.whl wheelhouse && wheel tags --remove --platform-tag manylinux_2_17_x86_64 wheelhouse/infinity*linux_x86_64.whl"

- name: Publish package distributions to PyPI
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
6 changes: 2 additions & 4 deletions src/CMakeLists.txt
10000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,9 @@ target_link_libraries(embedded_infinity_ext PRIVATE
jma
opencc
)
target_link_options(embedded_infinity_ext PRIVATE -static-libstdc++ -static-libgcc)

#if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
# target_link_libraries(embedded_infinity_ext PRIVATE libasan.a)
#endif ()
# WARN: python modules shall dynamicly link to libstdc++!!!
#target_link_options(embedded_infinity_ext PRIVATE -static-libstdc++ -static-libgcc)

target_link_directories(embedded_infinity_ext PUBLIC "${CMAKE_BINARY_DIR}/lib")
target_link_directories(embedded_infinity_ext PUBLIC "${CMAKE_BINARY_DIR}/third_party/oatpp/src/")
Expand Down
30 changes: 12 additions & 18 deletions src/executor/operator/physical_scan/physical_knn_scan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,36 @@

module;

#include "type/complex/row_id.h"
#include <string>

module physical_knn_scan;

import stl;
import query_context;
import operator_state;
import physical_operator_type;
import base_table_ref;
import table_entry;
import block_column_entry;
import segment_index_entry;
import load_meta;
import knn_expression;
import data_type;
import common_query_filter;
import physical_filter_scan_base;

import logger;
import operator_state;
import global_block_id;
import block_index;
import base_table_ref;
import knn_scan_data;
import knn_filter;
import vector_buffer;
import knn_distance;
import third_party;
import txn;
import infinity_exception;
import default_values;
import segment_iter;
import knn_expression;
import column_expression;

import index_base;
import buffer_manager;
import merge_knn;
import knn_result_handler;
Expand All @@ -47,23 +52,12 @@ import annivfflat_index_data;
import buffer_handle;
import data_block;
import bitmask;
import bitmask_buffer;
import column_vector;
import expression_evaluator;
import expression_state;
import index_hnsw;
import status;
import hnsw_alg;
import knn_expression;
import value;
import status;
import buffer_obj;
import create_index_info;
import knn_expr;
import chunk_index_entry;
import internal_types;
import block_entry;
import segment_index_entry;
import segment_entry;
import abstract_hnsw;

Expand Down
7 changes: 0 additions & 7 deletions src/executor/operator/physical_scan/physical_knn_scan.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,15 @@ module;
export module physical_knn_scan;

import stl;

import query_context;
import operator_state;
import physical_operator;
import physical_operator_type;
import base_expression;
import global_block_id;
import base_table_ref;
import table_entry;
import block_column_entry;
import segment_index_entry;
import block_index;
import load_meta;
import knn_expression;
import infinity_exception;
import internal_types;
import data_type;
import common_query_filter;
import physical_filter_scan_base;
Expand Down
Loading
0