Skip to content

Commit 09ad163

Browse files
authored
Merge pull request #1866 from finos/standalone
Update `emsdk` to `3.1.14`
2 parents 416e6f1 + 4403ce7 commit 09ad163

File tree

28 files changed

+267
-187
lines changed

28 files changed

+267
-187
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
- docs/
2020
- examples/
2121
- python/perspective/README.md
22-
pull_request:
2322
workflow_dispatch:
2423
inputs:
2524
ci-full:
@@ -765,12 +764,12 @@ jobs:
765764
- is-full-run: false
766765
os: windows-2019
767766

768-
# Exclude Macos 10.11 bulds
767+
# Exclude Macos bulds
769768
- is-full-run: false
770769
os: macos-10.15
771770

772771
- is-full-run: false
773-
os: macos-10.11
772+
os: macos-11
774773

775774
# Exclude Python 3.7 and 3.8 builds
776775
- is-full-run: false
@@ -1247,6 +1246,9 @@ jobs:
12471246
os: macos-10.15
12481247

12491248
# Exclude Python 3.7 and 3.8 builds
1249+
- is-full-run: false
1250+
os: macos-11
1251+
12501252
- is-full-run: false
12511253
python-version: 3.7
12521254

cmake/arrow/CMakeLists.txt

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
1818
endif()
1919

2020
set(ARROW_SRCS
21+
2122
# Base
2223
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/array/array_base.cc
2324
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/array/array_binary.cc
@@ -57,6 +58,7 @@ set(ARROW_SRCS
5758
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/table.cc
5859
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/table_builder.cc
5960
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor.cc
61+
6062
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor/coo_converter.cc
6163
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor/csf_converter.cc
6264
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor/csx_converter.cc
@@ -66,6 +68,7 @@ set(ARROW_SRCS
6668
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/buffered.cc
6769
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/caching.cc
6870
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/compressed.cc
71+
6972
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/file.cc
7073
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/interfaces.cc
7174
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/memory.cc
@@ -119,6 +122,7 @@ set(ARROW_SRCS
119122
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/vendored/double-conversion/fixed-dtoa.cc
120123
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/vendored/double-conversion/diy-fp.cc
121124
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/vendored/double-conversion/strtod.cc
125+
122126
# CSV
123127
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/csv/converter.cc
124128
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/csv/chunker.cc
@@ -128,6 +132,7 @@ set(ARROW_SRCS
128132
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/csv/parser.cc
129133
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/csv/reader.cc
130134
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/csv/writer.cc
135+
131136
# IPC
132137
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/dictionary.cc
133138
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/feather.cc
@@ -136,15 +141,18 @@ set(ARROW_SRCS
136141
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/options.cc
137142
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/reader.cc
138143
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/writer.cc
144+
139145
# Compute
140146
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/api_aggregate.cc
141147
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/api_scalar.cc
142148
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/api_vector.cc
143149
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/cast.cc
144150
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec.cc
151+
145152
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/aggregate_node.cc
146153
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/exec_plan.cc
147154
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/expression.cc
155+
148156
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/filter_node.cc
149157
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/project_node.cc
150158
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/source_node.cc
@@ -153,13 +161,15 @@ set(ARROW_SRCS
153161
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/function.cc
154162
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/function_internal.cc
155163
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernel.cc
164+
156165
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/registry.cc
157166
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/aggregate_basic.cc
158167
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/aggregate_mode.cc
159168
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/aggregate_quantile.cc
160169
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/aggregate_tdigest.cc
161170
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/aggregate_var_std.cc
162171
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/codegen_internal.cc
172+
163173
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/hash_aggregate.cc
164174
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
165175
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_boolean.cc
@@ -170,6 +180,7 @@ set(ARROW_SRCS
170180
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc
171181
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_cast_string.cc
172182
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_cast_temporal.cc
183+
173184
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_compare.cc
174185
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_nested.cc
175186
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_set_lookup.cc
@@ -179,11 +190,13 @@ set(ARROW_SRCS
179190
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_validity.cc
180191
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/scalar_if_else.cc
181192
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/util_internal.cc
193+
182194
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/vector_array_sort.cc
183195
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/vector_hash.cc
184196
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/vector_nested.cc
185197
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/vector_replace.cc
186198
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/vector_selection.cc
199+
187200
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/vector_sort.cc
188201
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/kernels/row_encoder.cc
189202
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/union_node.cc
@@ -196,15 +209,16 @@ set(ARROW_SRCS
196209
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/hash_join.cc
197210
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/hash_join_node.cc
198211
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/task_util.cc
199-
)
212+
)
200213

201-
if (PSP_PYTHON_BUILD)
214+
if(PSP_PYTHON_BUILD)
202215
set(ARROW_SRCS
203216
${ARROW_SRCS}
204217
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/io/file.cc
205218
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor/coo_converter.cc
206219
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor/csf_converter.cc
207220
${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/tensor/csx_converter.cc
221+
208222
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/util/time.cc
209223
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/vendored/double-conversion/bignum-dtoa.cc
210224
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/vendored/double-conversion/fast-dtoa.cc
@@ -219,8 +233,8 @@ if (PSP_PYTHON_BUILD)
219233
endif()
220234

221235
set_property(SOURCE util/io_util.cc
222-
APPEND_STRING
223-
PROPERTY COMPILE_FLAGS " -Wno-unused-macros -stdlib=libc++")
236+
APPEND_STRING
237+
PROPERTY COMPILE_FLAGS " -Wno-unused-macros -stdlib=libc++")
224238

225239
# # make clean will delete the generated file
226240
# set_source_files_properties(${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Message_generated.h PROPERTIES GENERATED TRUE)
@@ -231,26 +245,26 @@ set_property(SOURCE util/io_util.cc
231245
# set_source_files_properties(${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/feather_generated.h PROPERTIES GENERATED TRUE)
232246

233247
# set(FBS_OUTPUT_FILES
234-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Message_generated.h
235-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/File_generated.h
236-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Schema_generated.h
237-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Tensor_generated.h
238-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/SparseTensor_generated.h
239-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/feather_generated.h)
248+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Message_generated.h
249+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/File_generated.h
250+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Schema_generated.h
251+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/Tensor_generated.h
252+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/SparseTensor_generated.h
253+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/feather_generated.h)
240254

241255
# set(FBS_SRC
242-
# ${CMAKE_BINARY_DIR}/arrow-src/format/Message.fbs
243-
# ${CMAKE_BINARY_DIR}/arrow-src/format/File.fbs
244-
# ${CMAKE_BINARY_DIR}/arrow-src/format/Schema.fbs
245-
# ${CMAKE_BINARY_DIR}/arrow-src/format/Tensor.fbs
246-
# ${CMAKE_BINARY_DIR}/arrow-src/format/SparseTensor.fbs
247-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/feather.fbs)
248-
256+
# ${CMAKE_BINARY_DIR}/arrow-src/format/Message.fbs
257+
# ${CMAKE_BINARY_DIR}/arrow-src/format/File.fbs
258+
# ${CMAKE_BINARY_DIR}/arrow-src/format/Schema.fbs
259+
# ${CMAKE_BINARY_DIR}/arrow-src/format/Tensor.fbs
260+
# ${CMAKE_BINARY_DIR}/arrow-src/format/SparseTensor.fbs
261+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/feather.fbs)
249262
include_directories(src)
250263

251264
# Build Arrow as a static library
252265
set(ARROW_BUILD_STATIC ON)
253-
if (PSP_WASM_BUILD)
266+
267+
if(PSP_WASM_BUILD)
254268
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
255269
elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
256270
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -272,14 +286,13 @@ target_link_libraries(arrow
272286
# find_package(Flatbuffers)
273287

274288
# add_custom_command(OUTPUT ${FBS_OUTPUT_FILES}
275-
# COMMAND ${FLATBUFFERS_COMPILER}
276-
# -c
277-
# -o
278-
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/
279-
# ${FBS_SRC}
280-
# DEPENDS ${FLATBUFFERS_COMPILER}
281-
# COMMENT "Running flatc compiler on ${FBS_SRC}"
282-
# VERBATIM)
283-
289+
# COMMAND ${FLATBUFFERS_COMPILER}
290+
# -c
291+
# -o
292+
# ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/ipc/
293+
# ${FBS_SRC}
294+
# DEPENDS ${FLATBUFFERS_COMPILER}
295+
# COMMENT "Running flatc compiler on ${FBS_SRC}"
296+
# VERBATIM)
284297
add_custom_target(arrow_fb_files DEPENDS ${FBS_OUTPUT_FILES})
285298
add_dependencies(arrow arrow_fb_files)

0 commit comments

Comments
 (0)