From 58847977756e2efe31706cfad9f0986a0d4d93a1 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 4 Aug 2022 16:32:46 +0200 Subject: [PATCH 1/4] Adding numpy to requirements.txt shouldn't do anything --- crates/re_sdk_python/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/re_sdk_python/requirements.txt b/crates/re_sdk_python/requirements.txt index d14f0ce891a4..df03046daf34 100644 --- a/crates/re_sdk_python/requirements.txt +++ b/crates/re_sdk_python/requirements.txt @@ -1,2 +1,3 @@ maturin +numpy opencv-python From bff1bc7c258830afcc7b162e16551062247cc7c0 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 4 Aug 2022 16:33:38 +0200 Subject: [PATCH 2/4] Adding bytemuck and itertools should also work --- Cargo.lock | 6 ++++-- crates/re_sdk_python/Cargo.toml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a18c409616bc..378995a2a01e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -324,9 +324,9 @@ checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "bytemuck" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" +checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" dependencies = [ "bytemuck_derive", ] @@ -2839,6 +2839,8 @@ dependencies = [ name = "re_sdk_python" version = "0.1.0" dependencies = [ + "bytemuck", + "itertools", "nohash-hasher", "numpy", "once_cell", diff --git a/crates/re_sdk_python/Cargo.toml b/crates/re_sdk_python/Cargo.toml index 15fd88ab3288..c80dffce898f 100644 --- a/crates/re_sdk_python/Cargo.toml +++ b/crates/re_sdk_python/Cargo.toml @@ -24,6 +24,8 @@ default = ["extension-module"] re_log_types = { path = "../re_log_types" } re_sdk_comms = { path = "../re_sdk_comms", features = ["client"] } +bytemuck = { version = "1.11", features = ["extern_crate_alloc"] } +itertools = "0.10" nohash-hasher = "0.2" numpy = "0.16" once_cell = "1.12" From a6f4f1f903b51b89eb273e94e9efb98af4b6eef9 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 4 Aug 2022 16:34:11 +0200 Subject: [PATCH 3/4] Adding re_viewer could be a problem --- Cargo.lock | 1 + crates/re_sdk_python/Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 378995a2a01e..b416073550ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2848,6 +2848,7 @@ dependencies = [ "pyo3-build-config", "re_log_types", "re_sdk_comms", + "re_viewer", "tracing", "tracing-subscriber", ] diff --git a/crates/re_sdk_python/Cargo.toml b/crates/re_sdk_python/Cargo.toml index c80dffce898f..270f32a865c5 100644 --- a/crates/re_sdk_python/Cargo.toml +++ b/crates/re_sdk_python/Cargo.toml @@ -23,6 +23,7 @@ default = ["extension-module"] [dependencies] re_log_types = { path = "../re_log_types" } re_sdk_comms = { path = "../re_sdk_comms", features = ["client"] } +re_viewer = { path = "../re_viewer", optional = true } bytemuck = { version = "1.11", features = ["extern_crate_alloc"] } itertools = "0.10" From c67c3f4bfafe80e8cd6fe43ddff0ce32d93af900 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 4 Aug 2022 16:34:41 +0200 Subject: [PATCH 4/4] Especially if we enable it --- crates/re_sdk_python/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/re_sdk_python/Cargo.toml b/crates/re_sdk_python/Cargo.toml index 270f32a865c5..8de28a2d1d15 100644 --- a/crates/re_sdk_python/Cargo.toml +++ b/crates/re_sdk_python/Cargo.toml @@ -16,8 +16,9 @@ name = "rerun_sdk" # name of the Python library [features] +default = ["extension-module", "re_viewer"] + extension-module = ["pyo3/extension-module"] -default = ["extension-module"] [dependencies]