Skip to content

Commit

Permalink
Update versions, remove grpc support. (#471)
Browse files Browse the repository at this point in the history
* Update versions, remove grpc support.

Signed-off-by: Marco Feuerstein <mfeuerstein@lyft.com>

* Remove grpcio-compiler

Signed-off-by: Marco Feuerstein <mfeuerstein@lyft.com>

* Fix nightly

Signed-off-by: Marco Feuerstein <mfeuerstein@lyft.com>
  • Loading branch information
Marco Feuerstein committed Oct 12, 2020
1 parent 699d848 commit 4a9c9b8
Show file tree
Hide file tree
Showing 31 changed files with 723 additions and 1,727 deletions.
1,109 changes: 628 additions & 481 deletions Cargo.lock

Large diffs are not rendered by default.

34 changes: 16 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,26 @@ edition = "2018"
[dependencies]
arrayvec = "0.5.1"
byteorder = "1.3.4"
clap = "3.0.0-beta.1"
crossbeam = "0.7.3"
error-chain = "0.12.2"
clap = "3.0.0-beta.2"
crossbeam = "0.8.0"
error-chain = "0.12.4"
fnv = "1.0.7"
image = "0.23.4"
libc = "0.2.71"
lru = "0.5.1"
nalgebra = { version = "0.21.0", features = ["serde-serialize"] }
nav-types = "0.5.0"
num = "0.2.1"
image = "0.23.10"
libc = "0.2.79"
lru = "0.6.0"
nalgebra = { version = "0.22.0", features = ["serde-serialize"] }
nav-types = "0.5.1"
num = "0.3.0"
num_cpus = "1.13.0"
num-integer = "0.1.42"
num-traits = "0.2.11"
num-integer = "0.1.43"
num-traits = "0.2.12"
pbr = "1.0.3"
protobuf = "2.14.0"
rayon = "1.3.0"
protobuf = "2.18.0"
rayon = "1.4.1"
s2 = { version = "0.0.10", features = ["serde"] }
serde = "1.0.111"
serde_derive = "1.0.111"
simba = "0.1.2"
serde = "1.0.116"
serde_derive = "1.0.116"
simba = "0.2.1"
rand = "0.7.3"

[dependencies.point_viewer_proto_rust]
Expand All @@ -61,8 +61,6 @@ members = [
"octree_web_viewer",
"point_cloud_client",
"point_cloud_test",
"point_viewer_grpc",
"point_viewer_grpc_proto_rust",
"point_viewer_proto_rust",
"protobuf_provider",
"quadtree",
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ It was build to serve the needs of the [Cartographer](https://github.com/cartogr
The project consist of a root crate that can build and read octrees on disk and viewer binaries to visualize the data. For Mac OS X, we assume below that you've installed [Homebrew](https://brew.sh).

- Install Rust: `curl https://sh.rustup.rs -sSf | sh`. See <https://rustup.rs> for details.
- Install the rust gRPC protobuf plugin: `cargo install grpcio-compiler` and
make sure it is in your `$PATH`. This has more dependencies, it requires cmake
and go. On mac: `brew install cmake go`.
- Initialize all submodules: `git submodule update --init --recursive`.

### Creating Octrees
Expand Down
2 changes: 0 additions & 2 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ main() {
install_javascript_stuff

export PATH="$PATH:$HOME/bin"

cargo install --force grpcio-compiler
}

main
14 changes: 7 additions & 7 deletions octree_web_viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ authors = [
edition = "2018"

[dependencies]
actix = "0.9.0"
actix-web = "2.0.0"
actix = "0.10.0"
actix-web = "3.1.0"
byteorder = "1.3.4"
clap = "3.0.0-beta.1"
clap = "3.0.0-beta.2"
crossbeam-utils = "0.7.2"
failure = "0.1.8"
json = "0.12.4"
nalgebra = "0.21.0"
serde = "1.0.111"
serde_derive = "1.0.111"
time = "0.2.16"
nalgebra = "0.22.0"
serde = "1.0.116"
serde_derive = "1.0.116"
time = "0.2.22"

[dependencies.point_viewer]
path = ".."
7 changes: 3 additions & 4 deletions point_cloud_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ name = "point_cloud_client_test"
path = "src/bin/test.rs"

[dependencies]
clap = "3.0.0-beta.1"
clap = "3.0.0-beta.2"
fnv = "1.0.7"
nalgebra = "0.21.0"
nalgebra = "0.22.0"
num_cpus ="1.13.0"
point_viewer = { path = ".." }
point_viewer_grpc = { path = "../point_viewer_grpc" }
protobuf = "2.14.0"
protobuf = "2.18.0"
12 changes: 6 additions & 6 deletions point_cloud_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ edition = "2018"

[dependencies]
lazy_static = "1.4.0"
nalgebra = "0.21.0"
nav-types = "0.5.0"
num-integer = "0.1.42"
nalgebra = "0.22.0"
nav-types = "0.5.1"
num-integer = "0.1.43"
point_viewer = { path = ".." }
point_cloud_client = { path = "../point_cloud_client" }
protobuf = "2.14.0"
protobuf = "2.18.0"
rand = "0.7.3"
rayon = "1.3.0"
rayon = "1.4.1"
s2 = { version = "0.0.10", features = ["serde"] }
tempdir = "0.3.7"

[dev-dependencies]
criterion = "0.3.2"
criterion = "0.3.3"

[[bench]]
name = "main"
Expand Down
42 changes: 0 additions & 42 deletions point_viewer_grpc/Cargo.toml

This file was deleted.

156 changes: 0 additions & 156 deletions point_viewer_grpc/src/bin/octree_benchmark.rs

This file was deleted.

57 changes: 0 additions & 57 deletions point_viewer_grpc/src/bin/octree_server.rs

This file was deleted.

0 comments on commit 4a9c9b8

Please sign in to comment.