Skip to content

Commit e4ed704

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ji/expr-reduce-rules
# Conflicts: # vortex-gpu/benches/gpu_bitunpack.rs
2 parents 9c16134 + 07f5039 commit e4ed704

Some content is hidden

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

102 files changed

+1321
-6501
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ jobs:
140140
repo-token: ${{ secrets.GITHUB_TOKEN }}
141141
- name: Docs
142142
run: |
143-
RUSTFLAGS="--cfg gpu_unstable" RUSTDOCFLAGS="-D warnings" cargo doc --no-deps
143+
RUSTDOCFLAGS="-D warnings" cargo doc --no-deps
144144
# nextest doesn't support doc tests, so we run it here
145-
RUSTFLAGS="--cfg gpu_unstable" cargo test --doc --workspace --all-features --exclude vortex-cxx --exclude vortex-jni --exclude vortex-ffi --exclude xtask --no-fail-fast
145+
cargo test --doc --workspace --all-features --exclude vortex-cxx --exclude vortex-jni --exclude vortex-ffi --exclude xtask --no-fail-fast
146146
147147
build-rust:
148148
name: "Rust build (${{matrix.config.name}})"
@@ -156,7 +156,7 @@ jobs:
156156
- tag=${{ matrix.config.name }}
157157
env:
158158
# disable lints for build, they will be caught in Rust lint job.
159-
RUSTFLAGS: "-A warnings --cfg gpu_unstable"
159+
RUSTFLAGS: "-A warnings"
160160
strategy:
161161
fail-fast: false
162162
matrix:
@@ -175,7 +175,7 @@ jobs:
175175
target: wasm32-unknown-unknown
176176
env:
177177
rustflags: "RUSTFLAGS='-A warnings --cfg getrandom_backend=\"wasm_js\"'"
178-
args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-datafusion --exclude vortex-duckdb --exclude vortex-tui --exclude vortex-zstd --exclude vortex-gpu"
178+
args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-datafusion --exclude vortex-duckdb --exclude vortex-tui --exclude vortex-zstd"
179179
steps:
180180
- uses: runs-on/action@v2
181181
with:
@@ -199,8 +199,6 @@ jobs:
199199
check-min-deps:
200200
name: "Check build with minimal dependencies"
201201
timeout-minutes: 120
202-
env:
203-
RUSTFLAGS: "--cfg gpu_unstable"
204202
runs-on:
205203
- runs-on=${{ github.run_id }}
206204
- family=m7i+m7i-flex+m7a
@@ -223,8 +221,6 @@ jobs:
223221
rust-lint:
224222
name: "Rust (lint)"
225223
timeout-minutes: 120
226-
env:
227-
RUSTFLAGS: "--cfg gpu_unstable"
228224
runs-on:
229225
- runs-on=${{ github.run_id }}
230226
- family=m7i+m7i-flex+m7a
@@ -253,8 +249,6 @@ jobs:
253249
rust-lint-no-default:
254250
name: "Rust (lint, no default)"
255251
timeout-minutes: 120
256-
env:
257-
RUSTFLAGS: "--cfg gpu_unstable"
258252
runs-on:
259253
- runs-on=${{ github.run_id }}
260254
- family=m7i+m7i-flex+m7a
@@ -319,7 +313,7 @@ jobs:
319313
- name: Rust Tests
320314
if: ${{ matrix.suite == 'tests' }}
321315
run: |
322-
cargo +nightly nextest run --locked --workspace --exclude vortex-gpu --all-features --no-fail-fast
316+
cargo +nightly nextest run --locked --workspace --all-features --no-fail-fast
323317
- name: Run TPC-H
324318
if: ${{ matrix.suite == 'tpc-h' }}
325319
# We use i2 to ensure that restarting the duckdb connection succeeds
@@ -339,7 +333,6 @@ jobs:
339333
--ignore 'vortex-python/*' --ignore 'vortex-jni/*' --ignore 'vortex-flatbuffers/*' \
340334
--ignore 'vortex-proto/*' --ignore 'vortex-tui/*' --ignore 'vortex-datafusion/examples/*' \
341335
--ignore 'vortex-ffi/examples/*' --ignore '*/arbitrary/*' --ignore '*/arbitrary.rs' --ignore 'vortex-cxx/*' \
342-
--ignore 'vortex-gpu/*' \
343336
-o ${{ env.GRCOV_OUTPUT_FILE }}
344337
- name: Codecov
345338
uses: codecov/codecov-action@v5
@@ -396,65 +389,16 @@ jobs:
396389
- name: Rust Tests
397390
run: |
398391
# Build with full debug info first (helps with caching)
399-
cargo +nightly build --locked --workspace --exclude vortex-gpu --all-features --target x86_64-unknown-linux-gnu
392+
cargo +nightly build --locked --workspace --all-features --target x86_64-unknown-linux-gnu
400393
# Run tests with sanitizers and debug output
401394
cargo +nightly nextest run \
402395
--locked \
403396
--workspace \
404-
--exclude vortex-gpu \
405-
--all-features \
406-
--no-fail-fast \
407-
--target x86_64-unknown-linux-gnu \
408-
--verbose
409-
410-
gpu-test:
411-
name: "GPU tests"
412-
timeout-minutes: 120
413-
runs-on:
414-
- runs-on=${{ github.run_id }}
415-
- family=g5
416-
- cpu=8
417-
- image=ubuntu24-gpu-x64
418-
- extras=s3-cache
419-
- tag=cuda-tests
420-
env:
421-
# Keep frame pointers for better stack traces
422-
CARGO_PROFILE_DEV_DEBUG: "true"
423-
CARGO_PROFILE_TEST_DEBUG: "true"
424-
RUSTFLAGS: "--cfg gpu_unstable"
425-
steps:
426-
- uses: runs-on/action@v2
427-
with:
428-
sccache: s3
429-
- name: Display NVIDIA SMI details
430-
run: |
431-
nvidia-smi
432-
nvidia-smi -L
433-
nvidia-smi -q -d Memory
434-
- uses: actions/checkout@v5
435-
- uses: ./.github/actions/setup-rust
436-
with:
437-
repo-token: ${{ secrets.GITHUB_TOKEN }}
438-
toolchain: nightly
439-
components: "rust-src, rustfmt, clippy, llvm-tools-preview"
440-
- name: Install nextest
441-
uses: taiki-e/install-action@v2
442-
with:
443-
tool: nextest
444-
- name: Rust Tests
445-
run: |
446-
# Build with full debug info first (helps with caching)
447-
cargo +nightly build --locked -p vortex-gpu --all-features --target x86_64-unknown-linux-gnu
448-
# Run tests with sanitizers and debug output
449-
cargo +nightly nextest run \
450-
--locked \
451-
-p vortex-gpu \
452397
--all-features \
453398
--no-fail-fast \
454399
--target x86_64-unknown-linux-gnu \
455400
--verbose
456401
457-
458402
build-java:
459403
name: "Java"
460404
runs-on: ubuntu-latest
@@ -518,7 +462,6 @@ jobs:
518462
--exclude vortex-datafusion \
519463
--exclude vortex-duckdb \
520464
--exclude vortex-fuzz \
521-
--exclude vortex-gpu \
522465
--exclude vortex-python \
523466
--exclude vortex-tui \
524467
--exclude xtask \
@@ -530,7 +473,7 @@ jobs:
530473
--profile bench
531474
532475
- name: Run benchmarks
533-
uses: CodSpeedHQ/action@bb005fe1c1eea036d3894f02c049cb6b154a1c27
476+
uses: CodSpeedHQ/action@6a8e2b874c338bf81cc5e8be715ada75908d3871
534477
with:
535478
run: cargo codspeed run
536479
token: ${{ secrets.CODSPEED_TOKEN }}

0 commit comments

Comments
 (0)