Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- uses: LoliGothick/clippy-check@master
with:
token: ${{ secrets.GITHUB_TOKEN }}
options: --features=serde,rkyv,rkyv_08,test_utils --no-deps
options: --features=serde,rkyv_08,test_utils --no-deps
name: Clippy (stable)

- name: Check Rustdoc Links
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- uses: LoliGothick/clippy-check@master
with:
token: ${{ secrets.GITHUB_TOKEN }}
options: --features tracing,fixed,rkyv,rkyv_08,serde --no-deps
options: --features tracing,fixed,rkyv_08,serde --no-deps
name: Clippy nightly

- name: Check Rustdoc Links
Expand Down Expand Up @@ -208,11 +208,9 @@ jobs:

- name: Cargo test
run: |
cargo run --example build-float-doctest-tree --features="rkyv"
cargo run --example build-immutable-doctest-tree --features="rkyv"
cargo run --example build-float-doctest-tree-rkyv_08 --features="rkyv_08"
cargo run --example build-immutable-doctest-tree-rkyv_08 --features="rkyv_08"
cargo test --workspace --features=serde,rkyv,rkyv_08,test_utils
cargo test --workspace --features=serde,rkyv_08,test_utils

test-all-features:
name: Run Tests (Nightly, all features enabled)
Expand Down Expand Up @@ -242,18 +240,14 @@ jobs:

- name: Cargo test (dev build)
run: |
cargo run --example build-float-doctest-tree --features="rkyv"
cargo run --example build-immutable-doctest-tree --features="rkyv"
cargo run --example build-float-doctest-tree-rkyv_08 --features="rkyv_08"
cargo run --example build-immutable-doctest-tree-rkyv_08 --features="rkyv_08"
cargo test --workspace --features "csv,f16,las,serde,simd,rkyv,rkyv_08,test_utils,tracing"
cargo test --workspace --features "csv,f16,las,serde,simd,rkyv_08,test_utils,tracing"

- name: Cargo test (release build)
env:
RUSTFLAGS: '-C target-cpu=native'
run: |
cargo run --example build-float-doctest-tree --features="rkyv"
cargo run --example build-immutable-doctest-tree --features="rkyv"
cargo run --example build-float-doctest-tree-rkyv_08 --features="rkyv_08"
cargo run --example build-immutable-doctest-tree-rkyv_08 --features="rkyv_08"
cargo test --workspace --features "csv,f16,las,serde,simd,rkyv,rkyv_08,test_utils,tracing" --release
cargo test --workspace --features "csv,f16,las,serde,simd,rkyv_08,test_utils,tracing" --release
3 changes: 1 addition & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ jobs:
- name: Generate Coverage
run: |
cargo run --example build-immutable-doctest-tree-rkyv_08 --features="rkyv_08"
cargo run --example build-immutable-doctest-tree --features="rkyv"
cargo llvm-cov --features "csv,las,serde,simd,rkyv,rkyv_08,test_utils,tracing" --tests --ignore-run-fail --workspace --codecov --output-path codecov.json
cargo llvm-cov --features "csv,las,serde,simd,rkyv_08,test_utils,tracing" --tests --ignore-run-fail --workspace --codecov --output-path codecov.json

- uses: codecov/codecov-action@v5
with:
Expand Down
52 changes: 5 additions & 47 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ version = "1"
features = ["num-traits"]
optional = true

# half 2.5.0 switched from rkyv 0.7 to rkyv 0.8.
[dependencies.half]
version = "=2.4.1"
package = "half"
version = "2.5"
optional = true
features = ["num-traits"]

Expand All @@ -92,12 +92,6 @@ version = "1"
optional = true

[dependencies.rkyv]
version = "0.7"
optional = true
default-features = false
features = ["alloc", "copy_unsafe", "size_64"]

[dependencies.rkyv_08]
package = "rkyv"
version = "0.8.9"
optional = true
Expand Down Expand Up @@ -133,8 +127,7 @@ fixed = ["dep:fixed"]
las = ["dep:las"]
serde = ["dep:serde", "serde/derive", "dep:serde_derive", "dep:serde_with", "fixed/serde", "aligned-vec/serde"]
simd = []
rkyv = ["dep:rkyv"]
rkyv_08 = ["dep:rkyv_08"]
rkyv_08 = ["dep:rkyv"]
test_utils = ["dep:rand", "dep:rand_chacha", "dep:rayon", "dep:fixed"]
tracing = ["dep:tracing", "dep:tracing-subscriber"]

Expand Down Expand Up @@ -184,21 +177,11 @@ required-features = ["test_utils"]
name = "avx2-check"
path = "examples/avx2-check.rs"

[[example]]
name = "build-float-doctest-tree"
path = "examples/build-float-doctest-tree.rs"
required-features = ["rkyv"]

[[example]]
name = "build-float-doctest-tree-rkyv_08"
path = "examples/build-float-doctest-tree-rkyv_08.rs"
required-features = ["rkyv_08"]

[[example]]
name = "build-immutable-doctest-tree"
path = "examples/build-immutable-doctest-tree.rs"
required-features = ["rkyv"]

[[example]]
name = "build-immutable-doctest-tree-rkyv_08"
path = "examples/build-immutable-doctest-tree-rkyv_08.rs"
Expand Down Expand Up @@ -233,16 +216,6 @@ name = "immutable-large"
path = "examples/immutable-large.rs"
required-features = ["test_utils"]

[[example]]
name = "immutable-rkyv-serialize"
path = "examples/immutable-rkyv-serialize.rs"
required-features = ["rkyv"]

[[example]]
name = "immutable-rkyv-deserialize"
path = "examples/immutable-rkyv-deserialize.rs"
required-features = ["rkyv"]

[[example]]
name = "immutable-rkyv_08-serialize"
path = "examples/immutable-rkyv_08-serialize.rs"
Expand All @@ -256,27 +229,12 @@ required-features = ["rkyv_08"]
[[example]]
name = "pointcloud-las"
path = "examples/pointcloud-las.rs"
required-features = ["las", "rkyv"]
required-features = ["las", "rkyv_08"]

[[example]]
name = "pointcloud-csv"
path = "examples/pointcloud-csv.rs"
required-features = ["csv", "rkyv"]

[[example]]
name = "rkyv"
path = "examples/rkyv.rs"
required-features = ["csv", "rkyv"]

[[example]]
name = "rkyv-large-serialize"
path = "examples/rkyv-large-serialize.rs"
required-features = ["rkyv"]

[[example]]
name = "rkyv-large-deserialize"
path = "examples/rkyv-large-deserialize.rs"
required-features = ["rkyv"]
required-features = ["csv", "rkyv_08"]

[[example]]
name = "serde"
Expand Down
2 changes: 1 addition & 1 deletion examples/build-float-doctest-tree-rkyv_08.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::error::Error;
use std::fs::File;
use std::io::Write;

use rkyv_08::{rancor::Error as RkyvError, to_bytes};
use rkyv::{rancor::Error as RkyvError, to_bytes};

use kiddo::KdTree;

Expand Down
43 changes: 0 additions & 43 deletions examples/build-float-doctest-tree.rs

This file was deleted.

2 changes: 1 addition & 1 deletion examples/build-immutable-doctest-tree-rkyv_08.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use kiddo::immutable::float::kdtree::ImmutableKdTree;
use rkyv_08::{rancor::Error as RkyvError, to_bytes};
use rkyv::{rancor::Error as RkyvError, to_bytes};
use std::error::Error;
use std::fs::File;
use std::io::Write;
Expand Down
43 changes: 0 additions & 43 deletions examples/build-immutable-doctest-tree.rs

This file was deleted.

8 changes: 4 additions & 4 deletions examples/float-rkyv_08-deserialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use tracing::Level;
#[cfg(feature = "tracing")]
use tracing_subscriber::fmt;

use rkyv_08::rancor::Error as RkyvError;
use rkyv::rancor::Error as RkyvError;

use kiddo::float::kdtree::ArchivedR8KdTree;
use kiddo::float::kdtree::KdTree;
Expand All @@ -34,7 +34,7 @@ where
{
// full deserialization
let start = Instant::now();
let tree = unsafe { rkyv_08::from_bytes_unchecked::<Tree, RkyvError>(&buf) }?;
let tree = unsafe { rkyv::from_bytes_unchecked::<Tree, RkyvError>(&buf) }?;
let loaded = Instant::now();

// perform some queries
Expand Down Expand Up @@ -116,7 +116,7 @@ where

// Get archived tree
let archived_tree =
rkyv_08::access::<ArchivedR8KdTree<f64, u32, 3, 32, u32>, RkyvError>(&buf[..]).unwrap();
rkyv::access::<ArchivedR8KdTree<f64, u32, 3, 32, u32>, RkyvError>(&buf[..]).unwrap();
let loaded = Instant::now();

println!("Tree Size: {}", archived_tree.size());
Expand Down Expand Up @@ -200,7 +200,7 @@ where

// Get archived tree using unsafe method
let archived_tree =
unsafe { rkyv_08::access_unchecked::<ArchivedR8KdTree<f64, u32, 3, 32, u32>>(&buf) };
unsafe { rkyv::access_unchecked::<ArchivedR8KdTree<f64, u32, 3, 32, u32>>(&buf) };
let loaded = Instant::now();

// perform a query using the wrapper
Expand Down
2 changes: 1 addition & 1 deletion examples/float-rkyv_08-serialize.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use elapsed::ElapsedDuration;
use rand::Rng;
use rand_chacha::rand_core::SeedableRng;
use rkyv_08::{rancor::Error as RkyvError, to_bytes};
use rkyv::{rancor::Error as RkyvError, to_bytes};
use std::error::Error;
use std::fs::File;
use std::io::Write;
Expand Down
44 changes: 0 additions & 44 deletions examples/immutable-rkyv-deserialize.rs

This file was deleted.

Loading