Skip to content

Commit 3072885

Browse files
authored
Merge fad25fd into b35d76c
2 parents b35d76c + fad25fd commit 3072885

20 files changed

Lines changed: 856 additions & 10 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
target: wasm32-unknown-unknown
172172
env:
173173
rustflags: "RUSTFLAGS='-A warnings --cfg getrandom_backend=\"wasm_js\"'"
174-
args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-datafusion --exclude vortex-duckdb --exclude vortex-tui --exclude vortex-zstd"
174+
args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-datafusion --exclude vortex-duckdb --exclude vortex-tui --exclude vortex-zstd --exclude vortex-gpu"
175175
steps:
176176
- uses: runs-on/action@v2
177177
with:
@@ -300,7 +300,7 @@ jobs:
300300
- name: Rust Tests
301301
if: ${{ matrix.suite == 'tests' }}
302302
run: |
303-
cargo +nightly nextest run --locked --workspace --all-features --no-fail-fast
303+
cargo +nightly nextest run --locked --workspace --exclude vortex-gpu --all-features --no-fail-fast
304304
- name: Run TPC-H
305305
if: ${{ matrix.suite == 'tpc-h' }}
306306
run: |
@@ -319,6 +319,7 @@ jobs:
319319
--ignore 'vortex-python/*' --ignore 'vortex-jni/*' --ignore 'vortex-flatbuffers/*' \
320320
--ignore 'vortex-proto/*' --ignore 'vortex-tui/*' --ignore 'vortex-datafusion/examples/*' \
321321
--ignore 'vortex-ffi/examples/*' --ignore '*/arbitrary/*' --ignore '*/arbitrary.rs' --ignore 'vortex-cxx/*' \
322+
--ignore 'vortex-gpu/*' \
322323
-o ${{ env.GRCOV_OUTPUT_FILE }}
323324
- name: Codecov
324325
uses: codecov/codecov-action@v5
@@ -374,16 +375,63 @@ jobs:
374375
- name: Rust Tests
375376
run: |
376377
# Build with full debug info first (helps with caching)
377-
cargo +nightly build --locked --workspace --all-features --target x86_64-unknown-linux-gnu
378+
cargo +nightly build --locked --workspace --exclude vortex-gpu --all-features --target x86_64-unknown-linux-gnu
378379
# Run tests with sanitizers and debug output
379380
cargo +nightly nextest run \
380381
--locked \
381382
--workspace \
383+
--exclude vortex-gpu \
382384
--all-features \
383385
--no-fail-fast \
384386
--target x86_64-unknown-linux-gnu \
385387
--verbose
386388
389+
gpu-test:
390+
name: "GPU tests"
391+
timeout-minutes: 120
392+
runs-on:
393+
- runs-on=${{ github.run_id }}
394+
- family=g5
395+
- cpu=8
396+
- image=ubuntu24-gpu-x64
397+
- extras=s3-cache
398+
- tag=cuda-tests
399+
env:
400+
# Keep frame pointers for better stack traces
401+
CARGO_PROFILE_DEV_DEBUG: "true"
402+
CARGO_PROFILE_TEST_DEBUG: "true"
403+
steps:
404+
- uses: runs-on/action@v2
405+
with:
406+
sccache: s3
407+
- name: Display NVIDIA SMI details
408+
run: |
409+
nvidia-smi
410+
nvidia-smi -L
411+
nvidia-smi -q -d Memory
412+
- uses: actions/checkout@v5
413+
- uses: ./.github/actions/setup-rust
414+
with:
415+
toolchain: nightly
416+
components: "rust-src, rustfmt, clippy, llvm-tools-preview"
417+
- name: Install nextest
418+
uses: taiki-e/install-action@v2
419+
with:
420+
tool: nextest
421+
- name: Rust Tests
422+
run: |
423+
# Build with full debug info first (helps with caching)
424+
cargo +nightly build --locked -p vortex-gpu --all-features --target x86_64-unknown-linux-gnu
425+
# Run tests with sanitizers and debug output
426+
cargo +nightly nextest run \
427+
--locked \
428+
-p vortex-gpu \
429+
--all-features \
430+
--no-fail-fast \
431+
--target x86_64-unknown-linux-gnu \
432+
--verbose
433+
434+
387435
build-java:
388436
name: "Java"
389437
runs-on: ubuntu-latest

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ members = [
2929
"vortex-tui",
3030
"vortex-utils",
3131
"xtask",
32+
"vortex-gpu",
3233
]
33-
exclude = ["duckdb-vortex/duckdb-rs", "java/testfiles", "wasm-test"]
34+
exclude = ["fls-gpu-kernel-gen", "java/testfiles", "wasm-test"]
3435
resolver = "2"
3536

3637
[workspace.package]
@@ -85,6 +86,12 @@ clap = "4.5"
8586
crossbeam-deque = "0.8.6"
8687
crossbeam-queue = "0.3.12"
8788
crossterm = "0.29"
89+
cudarc = { version = "0.17.3", features = [
90+
"std",
91+
"driver",
92+
"cuda-12080",
93+
"dynamic-loading",
94+
], default-features = false }
8895
dashmap = "6.1.0"
8996
datafusion = { version = "50", default-features = false }
9097
datafusion-catalog = { version = "50" }
@@ -216,6 +223,7 @@ vortex-fastlanes = { version = "0.1.0", path = "./encodings/fastlanes", default-
216223
vortex-file = { version = "0.1.0", path = "./vortex-file", default-features = false }
217224
vortex-flatbuffers = { version = "0.1.0", path = "./vortex-flatbuffers", default-features = false }
218225
vortex-fsst = { version = "0.1.0", path = "./encodings/fsst", default-features = false }
226+
vortex-gpu = { version = "0.1.0", path = "./vortex-gpu", default-features = false }
219227
vortex-io = { version = "0.1.0", path = "./vortex-io", default-features = false }
220228
vortex-ipc = { version = "0.1.0", path = "./vortex-ipc", default-features = false }
221229
vortex-layout = { version = "0.1.0", path = "./vortex-layout", default-features = false }

‎encodings/fastlanes/src/bitpacking/mod.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl BitPackedArray {
8181
offset: u16,
8282
) -> VortexResult<()> {
8383
vortex_ensure!(ptype.is_int(), MismatchedTypes: "integer", ptype);
84-
vortex_ensure!(bit_width <= 64, "Unsupported bit width {}", bit_width);
84+
vortex_ensure!(bit_width <= 64, "Unsupported bit width {bit_width}");
8585

8686
if let Some(validity_len) = validity.maybe_len() {
8787
vortex_ensure!(
@@ -93,8 +93,7 @@ impl BitPackedArray {
9393
// Validate offset for sliced arrays
9494
vortex_ensure!(
9595
offset < 1024,
96-
"Offset must be less than full block, i.e. 1024, got {}",
97-
offset
96+
"Offset must be less than the full block i.e., 1024, got {offset}"
9897
);
9998

10099
// Validate patches

0 commit comments

Comments
 (0)