From 786078c8cc4b243817de53d022a8142222574ffa Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 4 Apr 2023 10:19:37 -0700 Subject: [PATCH 1/6] Bump dependencies. --- Cargo.lock | 511 +++++++++++++++++++++++++++++++----------- conda/environment.yml | 1 - rust/Cargo.toml | 6 +- 3 files changed, 386 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91a284f4..8bead253 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,6 +87,29 @@ name = "arrow2" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a4c5b03335bc1cb0fd9f5297f8fd3bbfd6fb04f3cb0bc7d6c91b7128cb8336a" +dependencies = [ + "ahash", + "bytemuck", + "chrono", + "dyn-clone", + "either", + "ethnum", + "foreign_vec", + "getrandom", + "hash_hasher", + "lexical-core", + "multiversion 0.6.1", + "num-traits", + "rustc_version", + "simdutf8", + "strength_reduce", +] + +[[package]] +name = "arrow2" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c63cf31f1416ed2fab8f91e8488e10129f47bd89c553ec354a06751d5697f3" dependencies = [ "ahash", "arrow-format", @@ -103,14 +126,14 @@ dependencies = [ "hash_hasher", "lexical-core", "lz4", - "multiversion", + "multiversion 0.7.1", "num-traits", "parquet2", "rustc_version", "simdutf8", "streaming-iterator", "strength_reduce", - "zstd", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] @@ -143,7 +166,16 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.13", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", ] [[package]] @@ -175,7 +207,7 @@ dependencies = [ "ndarray", "numpy", "once_cell", - "polars", + "polars 0.28.0", "pyo3", "pyo3-polars", "rayon", @@ -184,9 +216,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "bincode" @@ -247,7 +279,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.13", ] [[package]] @@ -284,11 +316,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", - "js-sys", "num-integer", "num-traits", - "time", - "wasm-bindgen", "winapi", ] @@ -386,9 +415,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "crc32fast" @@ -533,7 +562,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.11", + "syn 2.0.13", ] [[package]] @@ -550,7 +579,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.13", ] [[package]] @@ -609,6 +638,12 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" + [[package]] name = "flate2" version = "1.0.25" @@ -627,9 +662,9 @@ checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -642,9 +677,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -652,15 +687,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -669,38 +704,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -723,7 +758,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -787,9 +822,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -948,9 +983,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libm" @@ -1059,7 +1094,7 @@ checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1069,7 +1104,17 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373" dependencies = [ - "multiversion-macros", + "multiversion-macros 0.6.1", +] + +[[package]] +name = "multiversion" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a87eede2251ca235e5573086d01d2ab6b59dfaea54c2be10f9320980f7e8f7" +dependencies = [ + "multiversion-macros 0.7.1", + "target-features", ] [[package]] @@ -1083,6 +1128,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "multiversion-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1af1abf82261d780d114014eff4b555e47d823f3b84f893c4388572b40e089fb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "target-features", +] + [[package]] name = "ndarray" version = "0.15.6" @@ -1308,7 +1365,7 @@ dependencies = [ "seq-macro", "snap", "streaming-decompression", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -1373,10 +1430,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8918f4add49e6244bae2fe91cac89be339f2d6a77c59a4df3d7348bd40f98d1e" dependencies = [ "getrandom", - "polars-core", + "polars-core 0.27.2", + "polars-ops 0.27.2", + "version_check", +] + +[[package]] +name = "polars" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f04742abbadbd348d73a803617e6df61464485a410361e9c6634e55a4bc01c" +dependencies = [ + "getrandom", + "polars-core 0.28.0", "polars-io", "polars-lazy", - "polars-ops", + "polars-ops 0.28.0", "polars-time", "version_check", ] @@ -1387,12 +1456,26 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06e57a7b929edf6c73475dbc3f63d35152f14f4a9455476acc6127d770daa0f6" dependencies = [ - "arrow2", + "arrow2 0.16.0", "hashbrown 0.13.2", "num", "thiserror", ] +[[package]] +name = "polars-arrow" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eacd179fe0cc7cf18e12a80cfda3e6d15ce907655203cc69277e883a925f9bd8" +dependencies = [ + "arrow2 0.17.0", + "hashbrown 0.13.2", + "multiversion 0.7.1", + "num-traits", + "polars-error", + "thiserror", +] + [[package]] name = "polars-core" version = "0.27.2" @@ -1401,17 +1484,42 @@ checksum = "5a440cd53916f1a87fac1fda36cd7cc2d226247b4d4570d96242da5fa7f07b2a" dependencies = [ "ahash", "anyhow", - "arrow2", + "arrow2 0.16.0", + "bitflags", + "hashbrown 0.13.2", + "indexmap", + "num", + "once_cell", + "polars-arrow 0.27.2", + "polars-utils 0.27.2", + "rayon", + "smartstring", + "thiserror", + "wasm-timer", + "xxhash-rust", +] + +[[package]] +name = "polars-core" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04145d95791f31a0df3b2d3d600cbb5d0d43ccc105d74e871ffe7351a5e70cbe" +dependencies = [ + "ahash", + "arrow2 0.17.0", "bitflags", "chrono", "comfy-table", + "either", "hashbrown 0.13.2", "indexmap", "ndarray", - "num", + "num-traits", "once_cell", - "polars-arrow", - "polars-utils", + "polars-arrow 0.28.0", + "polars-error", + "polars-row", + "polars-utils 0.28.0", "rand", "rand_distr", "rayon", @@ -1423,51 +1531,67 @@ dependencies = [ "xxhash-rust", ] +[[package]] +name = "polars-error" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc2fb4ff74f7224b4096b3551b309c50bfd49bb0b66fb3948e70feffb1a8e51" +dependencies = [ + "arrow2 0.17.0", + "regex", + "thiserror", +] + [[package]] name = "polars-io" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d941750cba70a3acf150b959fcf446c09e8a8a4a35d03472d941bd6740bc43" +checksum = "d4d186157d427b39085f812e74eefb04608b7bd033ef3a7f848b93a5939c396d" dependencies = [ "ahash", - "anyhow", - "arrow2", + "arrow2 0.17.0", + "async-trait", "bytes", "chrono", "dirs", + "fast-float", + "futures", "lexical", "lexical-core", "memchr", "memmap2", - "num", + "num-traits", "once_cell", - "polars-arrow", - "polars-core", + "polars-arrow 0.28.0", + "polars-core 0.28.0", + "polars-error", "polars-time", - "polars-utils", + "polars-utils 0.28.0", "rayon", "regex", "simdutf8", + "tokio", ] [[package]] name = "polars-lazy" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d227fcb817485be462748d3172d2e55c61d56fbdc7fd56c24b72fa2e510e7be6" +checksum = "385b1beb0ae4f1c8fbe6aef9769b8e0a22a8b56ba494e382f17de82ce653702f" dependencies = [ "ahash", "bitflags", "glob", - "polars-arrow", - "polars-core", + "polars-arrow 0.28.0", + "polars-core 0.28.0", "polars-io", - "polars-ops", + "polars-ops 0.28.0", "polars-pipe", "polars-plan", "polars-time", - "polars-utils", + "polars-utils 0.28.0", "rayon", + "smartstring", ] [[package]] @@ -1476,64 +1600,95 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36638340fd9f4377dab11f307877ebb5bdac3bc9b25ea32a771584de76e5280a" dependencies = [ - "arrow2", - "polars-arrow", - "polars-core", - "polars-utils", + "arrow2 0.16.0", + "polars-arrow 0.27.2", + "polars-core 0.27.2", + "polars-utils 0.27.2", +] + +[[package]] +name = "polars-ops" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8beae89044ad6f5a2237103852d2650c7a52e7b339e356c1d707b9427b48ba7" +dependencies = [ + "arrow2 0.17.0", + "either", + "memchr", + "polars-arrow 0.28.0", + "polars-core 0.28.0", + "polars-utils 0.28.0", + "smartstring", ] [[package]] name = "polars-pipe" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1dfae18a14a812119d3328dae8790be53f1bc0fbcb977606dcf0f181490a8f" +checksum = "59c7fbda6ff77db1ae1a0d8f210b9729b2c0cb7c584345504a8282e3bd38e97d" dependencies = [ "crossbeam-channel", "enum_dispatch", "hashbrown 0.13.2", - "num", - "polars-arrow", - "polars-core", + "num-traits", + "polars-arrow 0.28.0", + "polars-core 0.28.0", "polars-io", - "polars-ops", + "polars-ops 0.28.0", "polars-plan", - "polars-utils", + "polars-row", + "polars-utils 0.28.0", "rayon", "smartstring", ] [[package]] name = "polars-plan" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca57df4974f25fa0642ae18ef00c0836c5120d4371be77a34d4684173b043c3" +checksum = "11b788cb03c651c9b92c2293b0adc07cb89ae64d7f187310cb7d62d688ccd9d8" dependencies = [ "ahash", + "arrow2 0.17.0", "once_cell", - "polars-arrow", - "polars-core", + "polars-arrow 0.28.0", + "polars-core 0.28.0", "polars-io", - "polars-ops", + "polars-ops 0.28.0", "polars-time", - "polars-utils", + "polars-utils 0.28.0", "rayon", + "smartstring", +] + +[[package]] +name = "polars-row" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bfcd216b7953321a6946c38d352fdfa67260a4d2125cbb4a1c3b46f03d0bebb" +dependencies = [ + "arrow2 0.17.0", + "polars-error", + "polars-utils 0.28.0", ] [[package]] name = "polars-time" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d961a9ccbe3c739de063fbf78449b3c172baf3379f958769c42ee9c309289786" +checksum = "5384945cc104ba99683455760dcfe1048e4025bfaf78043e14450cc8c988a745" dependencies = [ + "arrow2 0.17.0", + "atoi", "chrono", - "lexical", "now", "once_cell", - "polars-arrow", - "polars-core", - "polars-ops", - "polars-utils", + "polars-arrow 0.28.0", + "polars-core 0.28.0", + "polars-ops 0.28.0", + "polars-utils 0.28.0", "regex", + "smartstring", ] [[package]] @@ -1544,6 +1699,17 @@ checksum = "a741a3325c544c97c7a9ff57d857f089b60041bd92b06c41582df6940ffaa05b" dependencies = [ "once_cell", "rayon", +] + +[[package]] +name = "polars-utils" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1823141ed08322d17e9717ddf652c42df92f0d9b0c52cc5a242c96bc845144" +dependencies = [ + "once_cell", + "rayon", + "smartstring", "sysinfo", ] @@ -1561,9 +1727,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -1631,13 +1797,13 @@ dependencies = [ [[package]] name = "pyo3-polars" version = "0.2.0" -source = "git+https://github.com/benjaminrwilson/pyo3-polars#101be638680305e384ee47066576aaddc7941833" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e443aa7f65ffda121ab16099e34075cf532ac6a1e7da9f687d4c2691694ea151" dependencies = [ - "arrow2", - "polars", - "polars-core", + "arrow2 0.16.0", + "polars 0.27.2", + "polars-core 0.27.2", "pyo3", - "serde", "thiserror", ] @@ -1832,7 +1998,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.13", ] [[package]] @@ -1914,6 +2080,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1973,9 +2149,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -1984,9 +2160,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.27.8" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33" +checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ "cfg-if", "core-foundation-sys", @@ -1996,6 +2172,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "target-features" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24840de800c1707d75c800893dbd727a5e1501ce921944e602f0698167491e36" + [[package]] name = "target-lexicon" version = "0.12.6" @@ -2034,7 +2216,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.13", ] [[package]] @@ -2046,17 +2228,6 @@ dependencies = [ "crossbeam-channel", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -2076,6 +2247,20 @@ dependencies = [ "serde_json", ] +[[package]] +name = "tokio" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +dependencies = [ + "autocfg", + "libc", + "mio", + "pin-project-lite", + "socket2", + "windows-sys", +] + [[package]] name = "unicode-ident" version = "1.0.8" @@ -2110,12 +2295,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2246,11 +2425,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.0", ] [[package]] @@ -2259,7 +2438,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", ] [[package]] @@ -2268,13 +2447,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2283,42 +2477,84 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "xxhash-rust" version = "0.8.6" @@ -2331,7 +2567,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.3+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +dependencies = [ + "zstd-safe 6.0.4+zstd.1.5.4", ] [[package]] @@ -2344,6 +2589,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.4+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.7+zstd.1.5.4" diff --git a/conda/environment.yml b/conda/environment.yml index 09805a98..c6dc5d72 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -1,6 +1,5 @@ name: av2 channels: - - pytorch - conda-forge dependencies: - av diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 83eb0cca..21d20e5a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -19,7 +19,7 @@ ndarray = { version = "0.15.6", features = [ ] } numpy = { version = "0.18.0" } once_cell = "1.17.1" -polars = { version = "0.27.2", features = [ +polars = { version = "0.28.0", features = [ "dtype-u8", "lazy", "ndarray", @@ -27,8 +27,8 @@ polars = { version = "0.27.2", features = [ "ipc", "serde", ] } -pyo3 = { version = "0.18.1", features = ["extension-module"] } -pyo3-polars = { git = "https://github.com/benjaminrwilson/pyo3-polars" } +pyo3 = { version = "0.18.2", features = ["extension-module"] } +pyo3-polars = "0.2.0" rayon = "1.6.1" serde = "1.0.155" From 68a8f89a50d0d3b2988f4a4264effc62a3ef105f Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 4 Apr 2023 11:15:14 -0700 Subject: [PATCH 2/6] Fix serde issue. --- Cargo.lock | 291 +++++++----------------------------------------- rust/Cargo.toml | 2 +- 2 files changed, 44 insertions(+), 249 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8bead253..5d731bca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "const-random", "getrandom", "once_cell", "version_check", @@ -82,29 +81,6 @@ dependencies = [ "serde", ] -[[package]] -name = "arrow2" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4c5b03335bc1cb0fd9f5297f8fd3bbfd6fb04f3cb0bc7d6c91b7128cb8336a" -dependencies = [ - "ahash", - "bytemuck", - "chrono", - "dyn-clone", - "either", - "ethnum", - "foreign_vec", - "getrandom", - "hash_hasher", - "lexical-core", - "multiversion 0.6.1", - "num-traits", - "rustc_version", - "simdutf8", - "strength_reduce", -] - [[package]] name = "arrow2" version = "0.17.0" @@ -126,7 +102,7 @@ dependencies = [ "hash_hasher", "lexical-core", "lz4", - "multiversion 0.7.1", + "multiversion", "num-traits", "parquet2", "rustc_version", @@ -207,7 +183,7 @@ dependencies = [ "ndarray", "numpy", "once_cell", - "polars 0.28.0", + "polars", "pyo3", "pyo3-polars", "rayon", @@ -391,28 +367,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", -] - [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -532,12 +486,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "cxx" version = "1.0.94" @@ -1098,36 +1046,16 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "multiversion" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373" -dependencies = [ - "multiversion-macros 0.6.1", -] - [[package]] name = "multiversion" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6a87eede2251ca235e5573086d01d2ab6b59dfaea54c2be10f9320980f7e8f7" dependencies = [ - "multiversion-macros 0.7.1", + "multiversion-macros", "target-features", ] -[[package]] -name = "multiversion-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "multiversion-macros" version = "0.7.1" @@ -1172,31 +1100,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-complex" version = "0.4.3" @@ -1216,29 +1119,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -1423,18 +1303,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "polars" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8918f4add49e6244bae2fe91cac89be339f2d6a77c59a4df3d7348bd40f98d1e" -dependencies = [ - "getrandom", - "polars-core 0.27.2", - "polars-ops 0.27.2", - "version_check", -] - [[package]] name = "polars" version = "0.28.0" @@ -1442,63 +1310,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8f04742abbadbd348d73a803617e6df61464485a410361e9c6634e55a4bc01c" dependencies = [ "getrandom", - "polars-core 0.28.0", + "polars-core", "polars-io", "polars-lazy", - "polars-ops 0.28.0", + "polars-ops", "polars-time", "version_check", ] -[[package]] -name = "polars-arrow" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e57a7b929edf6c73475dbc3f63d35152f14f4a9455476acc6127d770daa0f6" -dependencies = [ - "arrow2 0.16.0", - "hashbrown 0.13.2", - "num", - "thiserror", -] - [[package]] name = "polars-arrow" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eacd179fe0cc7cf18e12a80cfda3e6d15ce907655203cc69277e883a925f9bd8" dependencies = [ - "arrow2 0.17.0", + "arrow2", "hashbrown 0.13.2", - "multiversion 0.7.1", + "multiversion", "num-traits", "polars-error", "thiserror", ] -[[package]] -name = "polars-core" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a440cd53916f1a87fac1fda36cd7cc2d226247b4d4570d96242da5fa7f07b2a" -dependencies = [ - "ahash", - "anyhow", - "arrow2 0.16.0", - "bitflags", - "hashbrown 0.13.2", - "indexmap", - "num", - "once_cell", - "polars-arrow 0.27.2", - "polars-utils 0.27.2", - "rayon", - "smartstring", - "thiserror", - "wasm-timer", - "xxhash-rust", -] - [[package]] name = "polars-core" version = "0.28.0" @@ -1506,7 +1339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04145d95791f31a0df3b2d3d600cbb5d0d43ccc105d74e871ffe7351a5e70cbe" dependencies = [ "ahash", - "arrow2 0.17.0", + "arrow2", "bitflags", "chrono", "comfy-table", @@ -1516,10 +1349,10 @@ dependencies = [ "ndarray", "num-traits", "once_cell", - "polars-arrow 0.28.0", + "polars-arrow", "polars-error", "polars-row", - "polars-utils 0.28.0", + "polars-utils", "rand", "rand_distr", "rayon", @@ -1537,7 +1370,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc2fb4ff74f7224b4096b3551b309c50bfd49bb0b66fb3948e70feffb1a8e51" dependencies = [ - "arrow2 0.17.0", + "arrow2", "regex", "thiserror", ] @@ -1549,7 +1382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d186157d427b39085f812e74eefb04608b7bd033ef3a7f848b93a5939c396d" dependencies = [ "ahash", - "arrow2 0.17.0", + "arrow2", "async-trait", "bytes", "chrono", @@ -1562,11 +1395,11 @@ dependencies = [ "memmap2", "num-traits", "once_cell", - "polars-arrow 0.28.0", - "polars-core 0.28.0", + "polars-arrow", + "polars-core", "polars-error", "polars-time", - "polars-utils 0.28.0", + "polars-utils", "rayon", "regex", "simdutf8", @@ -1582,42 +1415,30 @@ dependencies = [ "ahash", "bitflags", "glob", - "polars-arrow 0.28.0", - "polars-core 0.28.0", + "polars-arrow", + "polars-core", "polars-io", - "polars-ops 0.28.0", + "polars-ops", "polars-pipe", "polars-plan", "polars-time", - "polars-utils 0.28.0", + "polars-utils", "rayon", "smartstring", ] -[[package]] -name = "polars-ops" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36638340fd9f4377dab11f307877ebb5bdac3bc9b25ea32a771584de76e5280a" -dependencies = [ - "arrow2 0.16.0", - "polars-arrow 0.27.2", - "polars-core 0.27.2", - "polars-utils 0.27.2", -] - [[package]] name = "polars-ops" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8beae89044ad6f5a2237103852d2650c7a52e7b339e356c1d707b9427b48ba7" dependencies = [ - "arrow2 0.17.0", + "arrow2", "either", "memchr", - "polars-arrow 0.28.0", - "polars-core 0.28.0", - "polars-utils 0.28.0", + "polars-arrow", + "polars-core", + "polars-utils", "smartstring", ] @@ -1631,13 +1452,13 @@ dependencies = [ "enum_dispatch", "hashbrown 0.13.2", "num-traits", - "polars-arrow 0.28.0", - "polars-core 0.28.0", + "polars-arrow", + "polars-core", "polars-io", - "polars-ops 0.28.0", + "polars-ops", "polars-plan", "polars-row", - "polars-utils 0.28.0", + "polars-utils", "rayon", "smartstring", ] @@ -1649,14 +1470,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11b788cb03c651c9b92c2293b0adc07cb89ae64d7f187310cb7d62d688ccd9d8" dependencies = [ "ahash", - "arrow2 0.17.0", + "arrow2", "once_cell", - "polars-arrow 0.28.0", - "polars-core 0.28.0", + "polars-arrow", + "polars-core", "polars-io", - "polars-ops 0.28.0", + "polars-ops", "polars-time", - "polars-utils 0.28.0", + "polars-utils", "rayon", "smartstring", ] @@ -1667,9 +1488,9 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bfcd216b7953321a6946c38d352fdfa67260a4d2125cbb4a1c3b46f03d0bebb" dependencies = [ - "arrow2 0.17.0", + "arrow2", "polars-error", - "polars-utils 0.28.0", + "polars-utils", ] [[package]] @@ -1678,29 +1499,19 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5384945cc104ba99683455760dcfe1048e4025bfaf78043e14450cc8c988a745" dependencies = [ - "arrow2 0.17.0", + "arrow2", "atoi", "chrono", "now", "once_cell", - "polars-arrow 0.28.0", - "polars-core 0.28.0", - "polars-ops 0.28.0", - "polars-utils 0.28.0", + "polars-arrow", + "polars-core", + "polars-ops", + "polars-utils", "regex", "smartstring", ] -[[package]] -name = "polars-utils" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a741a3325c544c97c7a9ff57d857f089b60041bd92b06c41582df6940ffaa05b" -dependencies = [ - "once_cell", - "rayon", -] - [[package]] name = "polars-utils" version = "0.28.0" @@ -1719,12 +1530,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" version = "1.0.56" @@ -1797,12 +1602,11 @@ dependencies = [ [[package]] name = "pyo3-polars" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e443aa7f65ffda121ab16099e34075cf532ac6a1e7da9f687d4c2691694ea151" +source = "git+https://github.com/benjaminrwilson/pyo3-polars#993d22a6bf54ceb8f93c5ed9082621330b186a52" dependencies = [ - "arrow2 0.16.0", - "polars 0.27.2", - "polars-core 0.27.2", + "arrow2", + "polars", + "polars-core", "pyo3", "thiserror", ] @@ -2228,15 +2032,6 @@ dependencies = [ "crossbeam-channel", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 21d20e5a..16aff333 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -28,7 +28,7 @@ polars = { version = "0.28.0", features = [ "serde", ] } pyo3 = { version = "0.18.2", features = ["extension-module"] } -pyo3-polars = "0.2.0" +pyo3-polars = { git = "https://github.com/benjaminrwilson/pyo3-polars" } rayon = "1.6.1" serde = "1.0.155" From 1185fa860c09490d0bc706cc61584595143b8054 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 4 Apr 2023 11:18:59 -0700 Subject: [PATCH 3/6] Enable serde. --- Cargo.lock | 1 + rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 5d731bca..819a3b35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1608,6 +1608,7 @@ dependencies = [ "polars", "polars-core", "pyo3", + "serde", "thiserror", ] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 16aff333..521e6f94 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -28,7 +28,7 @@ polars = { version = "0.28.0", features = [ "serde", ] } pyo3 = { version = "0.18.2", features = ["extension-module"] } -pyo3-polars = { git = "https://github.com/benjaminrwilson/pyo3-polars" } +pyo3-polars = { git = "https://github.com/benjaminrwilson/pyo3-polars", features = ["serde"] } rayon = "1.6.1" serde = "1.0.155" From b9d3eb9b90e3fa1ebbc1b92c23d09a087e25f49b Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 4 Apr 2023 11:41:18 -0700 Subject: [PATCH 4/6] Fix pytest issues. --- src/av2/datasets/motion_forecasting/eval/submission.py | 4 ++-- src/av2/rendering/rasterize.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/av2/datasets/motion_forecasting/eval/submission.py b/src/av2/datasets/motion_forecasting/eval/submission.py index a04dd471..230eb4e5 100644 --- a/src/av2/datasets/motion_forecasting/eval/submission.py +++ b/src/av2/datasets/motion_forecasting/eval/submission.py @@ -91,9 +91,9 @@ def from_parquet(cls, submission_file_path: Path) -> ChallengeSubmission: # From serialized data, build scenario-track mapping for predictions submission_dict: Dict[str, ScenarioPredictions] = {} - for scenario_id, scenario_df in submission_df.groupby(["scenario_id"]): + for scenario_id, scenario_df in submission_df.groupby("scenario_id"): scenario_trajectories: ScenarioTrajectories = {} - for track_id, track_df in scenario_df.groupby(["track_id"]): + for track_id, track_df in scenario_df.groupby("track_id"): predicted_trajectories_x = np.stack(track_df.loc[:, "predicted_trajectory_x"].values.tolist()) predicted_trajectories_y = np.stack(track_df.loc[:, "predicted_trajectory_y"].values.tolist()) predicted_trajectories = np.stack((predicted_trajectories_x, predicted_trajectories_y), axis=-1) diff --git a/src/av2/rendering/rasterize.py b/src/av2/rendering/rasterize.py index c1d4c117..9ecdddbd 100644 --- a/src/av2/rendering/rasterize.py +++ b/src/av2/rendering/rasterize.py @@ -100,8 +100,10 @@ def xyz_to_bev( img[u, v, :3] = cmap[i] img[u, v, 3:4] += intensity[i] - # Normalize the intensity. - img[..., -1] = img[..., -1] / img[..., -1].max() + normalization = img[..., -1].max() + if normalization != 0: + # Normalize the intensity. + img[..., -1] = img[..., -1] / normalization # Gamma correction. img[..., -1] = np.power(img[..., -1], 0.05) From 1c24b5fcfedd6b45f6ff3414319a2f9ba7554ded Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 4 Apr 2023 11:56:04 -0700 Subject: [PATCH 5/6] Revert pytorch channel. --- conda/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/environment.yml b/conda/environment.yml index c6dc5d72..09805a98 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -1,5 +1,6 @@ name: av2 channels: + - pytorch - conda-forge dependencies: - av From 9c317444e2c8827d5cddece2982e0d2b0fb254aa Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 4 Apr 2023 13:15:58 -0700 Subject: [PATCH 6/6] Remove redundant jobs. --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 669a79bf..f74b6574 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,15 +4,13 @@ on: [push, pull_request] jobs: test_and_build: - name: ${{ matrix.os }}_${{ matrix.venv_backend }}_py${{ matrix.python_version }} + name: ${{ matrix.os }}_py${{ matrix.python_version }} runs-on: ${{ matrix.os }} strategy: matrix: os: [macos-latest, ubuntu-latest] python_version: ["3.8", "3.9", "3.10"] - venv_backend: - ["mamba", "virtualenv"] defaults: run: shell: bash -l {0}