Skip to content

Commit bf51e2b

Browse files
committed
gpu update
Signed-off-by: Joe Isaacs <[email protected]>
1 parent 0dcc251 commit bf51e2b

File tree

2 files changed

+5
-66
lines changed

2 files changed

+5
-66
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 61 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:
@@ -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
@@ -396,65 +390,16 @@ jobs:
396390
- name: Rust Tests
397391
run: |
398392
# 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
393+
cargo +nightly build --locked --workspace --all-features --target x86_64-unknown-linux-gnu
400394
# Run tests with sanitizers and debug output
401395
cargo +nightly nextest run \
402396
--locked \
403397
--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 \
452398
--all-features \
453399
--no-fail-fast \
454400
--target x86_64-unknown-linux-gnu \
455401
--verbose
456402
457-
458403
build-java:
459404
name: "Java"
460405
runs-on: ubuntu-latest
@@ -518,7 +463,6 @@ jobs:
518463
--exclude vortex-datafusion \
519464
--exclude vortex-duckdb \
520465
--exclude vortex-fuzz \
521-
--exclude vortex-gpu \
522466
--exclude vortex-python \
523467
--exclude vortex-tui \
524468
--exclude xtask \

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
members = [
33
"bench-vortex",
44
"encodings/*",
5-
"vortex-gpu-kernels",
65
"fuzz",
76
"vortex",
87
"vortex-array",
@@ -32,7 +31,6 @@ members = [
3231
"vortex-utils",
3332
"vortex-vector",
3433
"xtask",
35-
"vortex-gpu",
3634
]
3735
exclude = ["java/testfiles", "wasm-test"]
3836
resolver = "2"
@@ -232,7 +230,6 @@ vortex-fastlanes = { version = "0.1.0", path = "./encodings/fastlanes", default-
232230
vortex-file = { version = "0.1.0", path = "./vortex-file", default-features = false }
233231
vortex-flatbuffers = { version = "0.1.0", path = "./vortex-flatbuffers", default-features = false }
234232
vortex-fsst = { version = "0.1.0", path = "./encodings/fsst", default-features = false }
235-
vortex-gpu = { version = "0.1.0", path = "./vortex-gpu", default-features = false }
236233
vortex-io = { version = "0.1.0", path = "./vortex-io", default-features = false }
237234
vortex-ipc = { version = "0.1.0", path = "./vortex-ipc", default-features = false }
238235
vortex-layout = { version = "0.1.0", path = "./vortex-layout", default-features = false }
@@ -257,8 +254,6 @@ vortex-zstd = { version = "0.1.0", path = "./encodings/zstd", default-features =
257254
vortex-cxx = { path = "./vortex-cxx", default-features = false }
258255
vortex-duckdb = { path = "./vortex-duckdb", default-features = false }
259256
vortex-ffi = { path = "./vortex-ffi", default-features = false }
260-
vortex-gpu-kernels = { version = "0.1.0", path = "./vortex-gpu-kernels", default-features = false }
261-
262257
xshell = "0.2.6"
263258
zigzag = "0.1.0"
264259
zstd = { version = "0.13.3", default-features = false, features = [

0 commit comments

Comments
 (0)