Skip to content

Commit fca5bda

Browse files
committed
Try and unblock release by publishing GPU code
Signed-off-by: Adam Gutglick <[email protected]>
1 parent 69377e1 commit fca5bda

File tree

21 files changed

+40
-43
lines changed

21 files changed

+40
-43
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ jobs:
415415
# Keep frame pointers for better stack traces
416416
CARGO_PROFILE_DEV_DEBUG: "true"
417417
CARGO_PROFILE_TEST_DEBUG: "true"
418+
RUSTFLAGS: "--cfg gpu_unstable"
418419
steps:
419420
- uses: runs-on/action@v2
420421
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@ jobs:
3434
3535
- name: Release
3636
run: |
37-
cargo +nightly publish -Zpublish-timeout --no-verify --allow-dirty --workspace \
38-
--exclude bench-vortex \
39-
--exclude vortex-python \
40-
--exclude vortex-duckdb \
41-
--exclude vortex-ffi \
42-
--exclude vortex-fuzz \
43-
--exclude vortex-jni \
44-
--exclude xtask
37+
cargo +nightly publish -Zpublish-timeout --no-verify --allow-dirty --workspace
4538
env:
4639
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4740
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ unexpected_cfgs = { level = "deny", check-cfg = [
282282
"cfg(codspeed)",
283283
"cfg(disable_loom)",
284284
"cfg(vortex_nightly)",
285+
"cfg(gpu_unstable)",
285286
] }
286287
warnings = "warn"
287288

vortex-buffer/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ all-features = true
1818

1919
[features]
2020
arrow = []
21-
cuda = ["dep:cudarc"]
2221
memmap2 = ["dep:memmap2"]
2322
serde = ["dep:serde"]
2423
warn-copy = ["dep:log"]
@@ -27,7 +26,6 @@ warn-copy = ["dep:log"]
2726
arrow-buffer = { workspace = true }
2827
bitvec = { workspace = true }
2928
bytes = { workspace = true }
30-
cudarc = { workspace = true, optional = true }
3129
itertools = { workspace = true }
3230
log = { workspace = true, optional = true }
3331
memmap2 = { workspace = true, optional = true }
@@ -36,6 +34,9 @@ serde = { workspace = true, optional = true }
3634
simdutf8 = { workspace = true }
3735
vortex-error = { workspace = true }
3836

37+
[target.'cfg(gpu_unstable)'.dependencies]
38+
cudarc = { workspace = true }
39+
3940
[lints]
4041
workspace = true
4142

vortex-buffer/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ mod buffer;
6464
mod buffer_mut;
6565
mod bytes;
6666
mod r#const;
67-
#[cfg(feature = "cuda")]
67+
#[cfg(gpu_unstable)]
6868
mod cuda;
6969
mod debug;
7070
mod macros;

vortex-file/Cargo.toml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ all-features = true
1919
[dependencies]
2020
async-trait = { workspace = true }
2121
bytes = { workspace = true }
22-
cudarc = { workspace = true, optional = true }
2322
flatbuffers = { workspace = true }
2423
futures = { workspace = true, features = ["std", "async-await"] }
2524
# Needed to pickup the "wasm_js" feature for wasm targets from the workspace configuration
@@ -44,7 +43,6 @@ vortex-error = { workspace = true }
4443
vortex-fastlanes = { workspace = true }
4544
vortex-flatbuffers = { workspace = true, features = ["file"] }
4645
vortex-fsst = { workspace = true }
47-
vortex-gpu = { workspace = true, optional = true }
4846
vortex-io = { workspace = true }
4947
vortex-layout = { workspace = true }
5048
vortex-metrics = { workspace = true }
@@ -78,10 +76,7 @@ tokio = [
7876
"vortex-scan/tokio",
7977
]
8078
zstd = ["dep:vortex-zstd", "vortex-layout/zstd"]
81-
gpu = [
82-
"dep:cudarc",
83-
"dep:vortex-gpu",
84-
"vortex-gpu/cuda",
85-
"vortex-layout/gpu",
86-
"vortex-scan/gpu",
87-
]
79+
80+
[target.'cfg(gpu_unstable)'.dependencies]
81+
cudarc = { workspace = true }
82+
vortex-gpu = { workspace = true, features = ["cuda"] }

vortex-file/src/file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl VortexFile {
9696
)
9797
}
9898

99-
#[cfg(feature = "gpu")]
99+
#[cfg(gpu_unstable)]
100100
pub fn gpu_scan(
101101
&self,
102102
ctx: Arc<cudarc::driver::CudaContext>,

vortex-gpu-kernels/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ readme = { workspace = true }
1212
repository = { workspace = true }
1313
rust-version = { workspace = true }
1414
version = { workspace = true }
15-
publish = false
1615

1716
[lib]
1817
name = "vortex_gpu_kernels"

vortex-gpu/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ readme = { workspace = true }
1212
repository = { workspace = true }
1313
rust-version = { workspace = true }
1414
version = { workspace = true }
15-
publish = false
1615

1716
[dependencies]
1817
cudarc = { workspace = true }
1918
itertools = { workspace = true }
2019
parking_lot = { workspace = true }
2120
vortex-alp = { workspace = true }
2221
vortex-array = { workspace = true }
23-
vortex-buffer = { workspace = true, features = ["cuda"] }
22+
vortex-buffer = { workspace = true }
2423
vortex-dict = { workspace = true }
2524
vortex-dtype = { workspace = true }
2625
vortex-error = { workspace = true }

vortex-gpu/src/lib.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4+
//! This crate contains support for GPU and CUDA accelerated compute for Vortex.
5+
//!
6+
//! This crate is currently considered unstable, and much of its code is behind a the `gpu_unstable` config.
7+
//! If you wish to use it, you should build your code with:
8+
//! ```shell
9+
//! RUSTFLAGS="--cfg gpu_unstable" cargo build -p ...
10+
//! ```
11+
412
pub mod bit_unpack;
513
pub mod for_;
614
mod for_bp;

0 commit comments

Comments
 (0)