Skip to content

Commit 30d1d56

Browse files
committed
feat: add simdjson subproject
chore: stop ignoring c and cpp files They are generated in the build directory. fix: statically link simdjson
1 parent fb517ba commit 30d1d56

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

.gitignore

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ monkeytype.sqlite3
8484
# meson editable install folder
8585
.mesonpy
8686

87+
# Meson #
88+
#########
89+
/subprojects/*
90+
!/subprojects/*.wrap
8791

8892
# OS generated files #
8993
######################
@@ -103,15 +107,6 @@ pandas/io/*.dat
103107
pandas/io/*.json
104108
scikits
105109

106-
# Generated Sources #
107-
#####################
108-
!skts.c
109-
*.c
110-
*.cpp
111-
!pandas/_libs/src/**/*.c
112-
!pandas/_libs/src/**/*.h
113-
!pandas/_libs/include/**/*.h
114-
115110
# Unit / Performance Testing #
116111
##############################
117112
asv_bench/env/

pandas/_libs/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
simdjson_proj = subproject(
2+
'simdjson',
3+
default_options: ['default_library=static'],
4+
)
5+
simdjson_dep = simdjson_proj.get_variable('simdjson_dep')
6+
17
_algos_take_helper = custom_target(
28
'algos_take_helper_pxi',
39
output: 'algos_take_helper.pxi',

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ parentdir_prefix = "pandas-"
142142

143143
[tool.meson-python.args]
144144
setup = ['--vsenv'] # For Windows
145+
install = ['--skip-subprojects']
145146

146147
[tool.cibuildwheel]
147148
skip = ["*_i686", "*_ppc64le", "*_s390x"]

subprojects/simdjson.wrap

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[wrap-file]
2+
directory = simdjson-4.2.2
3+
source_url = https://github.com/simdjson/simdjson/archive/refs/tags/v4.2.2.tar.gz
4+
source_filename = simdjson-4.2.2.tar.gz
5+
source_hash = 3efae22cb41f83299fe0b2e8a187af543d3dda93abbb910586f897df670f9eaa
6+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/simdjson_4.2.2-1/simdjson-4.2.2.tar.gz
7+
patch_filename = simdjson_4.2.2-1_patch.zip
8+
patch_url = https://wrapdb.mesonbuild.com/v2/simdjson_4.2.2-1/get_patch
9+
patch_hash = ff4008b3547e71510cb49b159458ec5b7eee129832b9d9168eafea7b3c51ac34
10+
wrapdb_version = 4.2.2-1
11+
12+
[provide]
13+
dependency_names = simdjson

0 commit comments

Comments
 (0)