From 95a8e76894685a26722cf11a50d1a6e9718ed361 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 08:03:50 +0000 Subject: [PATCH] Update ndarray-npy requirement from 0.8 to 0.9 Updates the requirements on [ndarray-npy](https://github.com/jturner314/ndarray-npy) to permit the latest version. - [Changelog](https://github.com/jturner314/ndarray-npy/blob/master/RELEASES.md) - [Commits](https://github.com/jturner314/ndarray-npy/compare/0.8.0...0.9.1) --- updated-dependencies: - dependency-name: ndarray-npy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 160 +++++++++++++++++++++++++++++++++++++++++-------- ego/Cargo.toml | 2 +- gp/Cargo.toml | 2 +- moe/Cargo.toml | 4 +- 4 files changed, 138 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77037d2c..957b9a39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,6 +87,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -479,6 +488,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "digest" version = "0.10.7" @@ -510,6 +530,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + [[package]] name = "dyn-clonable" version = "0.9.0" @@ -555,7 +586,7 @@ dependencies = [ "libm", "linfa", "log", - "ndarray", + "ndarray 0.15.6", "ndarray-rand", "numpy", "pyo3", @@ -573,7 +604,7 @@ dependencies = [ "approx", "criterion", "linfa", - "ndarray", + "ndarray 0.15.6", "ndarray-rand", "ndarray-stats", "num-traits", @@ -605,7 +636,7 @@ dependencies = [ "linfa-linalg", "linfa-pls", "log", - "ndarray", + "ndarray 0.15.6", "ndarray-linalg", "ndarray-npy", "ndarray-rand", @@ -637,7 +668,7 @@ dependencies = [ "linfa-linalg", "linfa-pls", "log", - "ndarray", + "ndarray 0.15.6", "ndarray-linalg", "ndarray-npy", "ndarray-rand", @@ -671,7 +702,7 @@ dependencies = [ "linfa-linalg", "linfa-pls", "log", - "ndarray", + "ndarray 0.15.6", "ndarray-csv", "ndarray-linalg", "ndarray-npy", @@ -715,6 +746,12 @@ dependencies = [ "log", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "erased-serde" version = "0.4.5" @@ -731,7 +768,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29b3f2b07b398985f495a66466e0a1fd105e022c25e1fd7042b60402cba765a" dependencies = [ - "ndarray", + "ndarray 0.15.6", ] [[package]] @@ -858,6 +895,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.5.0" @@ -883,7 +926,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown 0.15.0", ] [[package]] @@ -1024,7 +1077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cab423110bc374e4cfa915da88952e2c6a4a5a6300ac0a0e68022bff2ace0b3" dependencies = [ "approx", - "ndarray", + "ndarray 0.15.6", "ndarray-linalg", "num-traits", "rand", @@ -1042,7 +1095,7 @@ dependencies = [ "linfa", "linfa-linalg", "linfa-nn", - "ndarray", + "ndarray 0.15.6", "ndarray-rand", "ndarray-stats", "noisy_float", @@ -1059,7 +1112,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56e7562b41c8876d3367897067013bb2884cc78e6893f092ecd26b305176ac82" dependencies = [ - "ndarray", + "ndarray 0.15.6", "num-traits", "thiserror", ] @@ -1072,7 +1125,7 @@ checksum = "c1945b1a1435e885b4743dad94f9676c0bf65d6cce102e96c753f93b4cfe68d0" dependencies = [ "kdtree", "linfa", - "ndarray", + "ndarray 0.15.6", "ndarray-stats", "noisy_float", "num-traits", @@ -1089,7 +1142,7 @@ checksum = "4bd9bc190667ad5c4b6a529e3fec5b47979dcd9a58f935a5c3d47ad099deb3b0" dependencies = [ "linfa", "linfa-linalg", - "ndarray", + "ndarray 0.15.6", "ndarray-linalg", "ndarray-rand", "ndarray-stats", @@ -1108,6 +1161,12 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.22" @@ -1166,6 +1225,21 @@ dependencies = [ "serde", ] +[[package]] +name = "ndarray" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "portable-atomic", + "portable-atomic-util", + "rawpointer", +] + [[package]] name = "ndarray-csv" version = "0.5.2" @@ -1174,7 +1248,7 @@ checksum = "2956dbaf15d46593bfddfdb88901cb35299f3a58390c7328ac4f58932800b8f8" dependencies = [ "csv", "either", - "ndarray", + "ndarray 0.15.6", "serde", ] @@ -1186,7 +1260,7 @@ checksum = "8f87ff36428f228c6056204d0f5cb8c5165f0db0a065429faace3edbc2718f1f" dependencies = [ "cauchy", "lax", - "ndarray", + "ndarray 0.15.6", "num-complex", "num-traits", "rand", @@ -1195,12 +1269,12 @@ dependencies = [ [[package]] name = "ndarray-npy" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f85776816e34becd8bd9540818d7dc77bf28307f3b3dcc51cc82403c6931680c" +checksum = "7b313788c468c49141a9d9b6131fc15f403e6ef4e8446a0b2e18f664ddb278a9" dependencies = [ "byteorder", - "ndarray", + "ndarray 0.16.1", "num-complex", "num-traits", "py_literal", @@ -1213,7 +1287,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65608f937acc725f5b164dcf40f4f0bc5d67dc268ab8a649d3002606718c4588" dependencies = [ - "ndarray", + "ndarray 0.15.6", "rand", "rand_distr", ] @@ -1224,9 +1298,9 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af5a8477ac96877b5bd1fd67e0c28736c12943aba24eda92b127e036b0c8f400" dependencies = [ - "indexmap", + "indexmap 1.9.3", "itertools", - "ndarray", + "ndarray 0.15.6", "noisy_float", "num-integer", "num-traits", @@ -1240,7 +1314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668b3abeae3e0637740340e0e32a9bf9308380e146ea6797950f9ff16e88d88a" dependencies = [ "lazy_static", - "ndarray", + "ndarray 0.15.6", "num-traits", "regex", ] @@ -1364,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf314fca279e6e6ac2126a4ff98f26d88aa4ad06bc68fb6ae5cf4bd706758311" dependencies = [ "libc", - "ndarray", + "ndarray 0.15.6", "num-complex", "num-integer", "num-traits", @@ -1510,6 +1584,15 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +[[package]] +name = "portable-atomic-util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d" +dependencies = [ + "portable-atomic", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1886,6 +1969,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "slab" version = "0.4.9" @@ -1953,7 +2042,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "704ef26d974e8a452313ed629828cd9d4e4fa34667ca1ad9d6b1fffa43c6e166" dependencies = [ - "ndarray", + "ndarray 0.15.6", "num-complex", "num-traits", "smallvec", @@ -2374,12 +2463,31 @@ dependencies = [ [[package]] name = "zip" -version = "0.5.13" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", + "crossbeam-utils", + "displaydoc", "flate2", + "indexmap 2.6.0", + "memchr", "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] diff --git a/ego/Cargo.toml b/ego/Cargo.toml index 621c4850..ff5b8a2e 100644 --- a/ego/Cargo.toml +++ b/ego/Cargo.toml @@ -32,7 +32,7 @@ ndarray = { version = "0.15", features = ["rayon", "approx"] } ndarray-linalg = { version = "0.15", optional = true } ndarray-stats = "0.5" ndarray-rand = "0.14" -ndarray-npy = "0.8" +ndarray-npy = "0.9" rayon = "1" cobyla = { version = "0.6" } diff --git a/gp/Cargo.toml b/gp/Cargo.toml index bff703f1..f9c9c625 100644 --- a/gp/Cargo.toml +++ b/gp/Cargo.toml @@ -29,7 +29,7 @@ ndarray-linalg = { version = "0.15", optional = true } ndarray-stats = "0.5" ndarray_einsum_beta = "0.7" ndarray-rand = "0.14" -ndarray-npy = "0.8" +ndarray-npy = "0.9" nlopt = { version = "0.7.0", optional = true } cobyla = { version = "0.6" } rand_xoshiro = "0.6" diff --git a/moe/Cargo.toml b/moe/Cargo.toml index 9984c160..3cdb8175 100644 --- a/moe/Cargo.toml +++ b/moe/Cargo.toml @@ -41,7 +41,7 @@ ndarray = { version = "0.15", features = ["rayon", "approx"] } ndarray-linalg = { version = "0.15", optional = true } ndarray-stats = "0.5" ndarray-rand = "0.14" -ndarray-npy = "0.8" +ndarray-npy = "0.9" rand_xoshiro = "0.6" paste = "1.0" bitflags = { version = "2.4.1", features = ["serde"] } @@ -56,7 +56,7 @@ typetag = { version = "0.2", optional = true } [dev-dependencies] criterion = "0.5" approx = "0.4" -ndarray-npy = "0.8" +ndarray-npy = "0.9" ndarray-csv = "0.5" csv = "1.1" argmin_testfunctions = "0.2"