Skip to content

Commit e2ba139

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ji/all-around-cdtx
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk> # Conflicts: # vortex-array/src/arrays/primitive/compute/cast.rs
2 parents 3d0b3b0 + 8b587bb commit e2ba139

234 files changed

Lines changed: 2062 additions & 1448 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cargo/config.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ rustflags = [
33
"-C", "force-frame-pointers=yes",
44
]
55

6-
[target.wasm32-unknown-unknown]
7-
rustflags = ['--cfg', 'getrandom_backend="wasm_js"', '-C', 'target-feature=+atomics']
8-
96
[alias]
107
xtask = "run -p xtask --"
118
vx = "run -p vortex-tui --"

.github/scripts/run-sql-bench.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
set -Eeu -o pipefail
2424

25+
export VORTEX_EXPERIMENTAL_PATCHED_ARRAY=1
26+
export FLAT_LAYOUT_INLINE_ARRAY_NODE=1
27+
2528
subcommand="$1"
2629
targets="$2"
2730
shift 2

.github/workflows/bench-pr.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
env:
6161
RUSTFLAGS: "-C target-cpu=native"
6262
run: |
63-
cargo build --package ${{ matrix.benchmark.id }} --profile release_debug ${{ matrix.benchmark.build_args }}
63+
cargo build --package ${{ matrix.benchmark.id }} --profile release_debug ${{ matrix.benchmark.build_args }} --features unstable_encodings
6464
6565
- name: Setup Polar Signals
6666
if: github.event.pull_request.head.repo.fork == false
@@ -76,6 +76,8 @@ jobs:
7676
shell: bash
7777
env:
7878
RUST_BACKTRACE: full
79+
VORTEX_EXPERIMENTAL_PATCHED_ARRAY: "1"
80+
FLAT_LAYOUT_INLINE_ARRAY_NODE: "1"
7981
run: |
8082
bash scripts/bench-taskset.sh target/release_debug/${{ matrix.benchmark.id }} -d gh-json -o results.json
8183

.github/workflows/bench.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
&& format('runs-on={0}/runner=bench-dedicated/extras=s3-cache/tag={1}', github.run_id, matrix.benchmark.id)
3939
|| 'ubuntu-latest' }}
4040
strategy:
41+
fail-fast: false
4142
matrix:
4243
benchmark:
4344
- id: random-access-bench
@@ -73,7 +74,7 @@ jobs:
7374
env:
7475
RUSTFLAGS: "-C target-cpu=native"
7576
run: |
76-
cargo build --bin ${{ matrix.benchmark.id }} --profile release_debug ${{ matrix.benchmark.build_args }}
77+
cargo build --bin ${{ matrix.benchmark.id }} --profile release_debug ${{ matrix.benchmark.build_args }} --features unstable_encodings
7778
7879
- name: Setup Polar Signals
7980
uses: polarsignals/gh-actions-ps-profiling@v0.8.1
@@ -88,6 +89,8 @@ jobs:
8889
shell: bash
8990
env:
9091
RUST_BACKTRACE: full
92+
VORTEX_EXPERIMENTAL_PATCHED_ARRAY: "1"
93+
FLAT_LAYOUT_INLINE_ARRAY_NODE: "1"
9194
run: |
9295
bash scripts/bench-taskset.sh target/release_debug/${{ matrix.benchmark.id }} --formats ${{ matrix.benchmark.formats }} -d gh-json -o results.json
9396

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
runner: amd64-medium
204204
target: wasm32-unknown-unknown
205205
env:
206-
rustflags: "RUSTFLAGS='-A warnings'"
206+
rustflags: "RUSTFLAGS='-A warnings --cfg getrandom_backend=\"unsupported\"'"
207207
args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-cuda --exclude vortex-cub --exclude vortex-nvcomp --exclude vortex-datafusion --exclude vortex-duckdb --exclude vortex-tui --exclude vortex-zstd --exclude vortex-test-e2e-cuda --exclude vortex-sqllogictest"
208208
steps:
209209
- uses: runs-on/action@v2

.github/workflows/sql-benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
if [ "${{ matrix.build_lance }}" = "true" ]; then
145145
packages="$packages --bin lance-bench"
146146
fi
147-
cargo build $packages --profile release_debug
147+
cargo build $packages --profile release_debug --features unstable_encodings
148148
149149
- name: Generate data
150150
shell: bash

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/stale@v10
1414
with:
1515
# After 30 days of no activity, a PR will be marked as stale
16-
days-before-pr-stale: 30
16+
days-before-pr-stale: 14
1717
# PR has 7 more days to become active, otherwise it will be closed.
1818
days-before-pr-close: 7
1919
stale-pr-label: "stale"

Cargo.lock

Lines changed: 26 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ itertools = "0.14.0"
163163
jetscii = "0.5.3"
164164
jiff = "0.2.0"
165165
kanal = "0.1.1"
166+
lasso = { version = "0.7", features = ["multi-threaded"] }
166167
lending-iterator = "0.1.7"
167168
libfuzzer-sys = "0.4"
168169
libloading = "0.8"
@@ -302,11 +303,6 @@ vortex-duckdb = { path = "./vortex-duckdb", default-features = false }
302303
vortex-test-e2e-cuda = { path = "./vortex-test/e2e-cuda", default-features = false }
303304
vortex-tui = { path = "./vortex-tui" }
304305

305-
[workspace.dependencies.getrandom_v03]
306-
features = ["wasm_js"]
307-
package = "getrandom"
308-
version = "0.4.0"
309-
310306
[workspace.lints.rust]
311307
let_underscore_drop = "deny"
312308
macro_use_extern_crate = "deny"

benchmarks/compress-bench/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ vortex-bench = { workspace = true }
3434

3535
[features]
3636
lance = ["dep:lance-bench"]
37+
unstable_encodings = ["vortex/unstable_encodings"]
3738

3839
[lints]
3940
workspace = true

0 commit comments

Comments
 (0)