From 08544a4008b96e9f90b70f1fcc415ac21f043eb2 Mon Sep 17 00:00:00 2001
From: d3v-null <dev.aleph.null@gmail.com>
Date: Wed, 14 Aug 2024 20:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20marlu0.13=20rubbl0.8=20cas?=
 =?UTF-8?q?acore3.5=20ndarray0.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock | 72 ++++++++++++++++++++++++++++++------------------------
 Cargo.toml |  8 +++---
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fe8c4ae..e3fa08a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,16 +244,6 @@ dependencies = [
  "itertools",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.3"
@@ -508,7 +498,7 @@ dependencies = [
  "hdf5-types",
  "lazy_static",
  "libc",
- "ndarray",
+ "ndarray 0.15.6",
  "parking_lot 0.11.2",
  "paste",
 ]
@@ -822,9 +812,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "marlu"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e611f77c79511e2d3f22dda0ef8ebe311b40cf6abffa4dbe10484f18a9377eb"
+checksum = "6271f1b61a6dcfd248b1c3a2f8c49bd5b425abe2d2c970263a14390369eab6a6"
 dependencies = [
  "approx",
  "built",
@@ -834,7 +824,7 @@ dependencies = [
  "itertools",
  "lazy_static",
  "log",
- "ndarray",
+ "ndarray 0.16.0",
  "num-complex",
  "num-traits",
  "rayon",
@@ -881,7 +871,7 @@ dependencies = [
  "hdf5-sys",
  "hip-sys",
  "marlu",
- "ndarray",
+ "ndarray 0.16.0",
  "num-complex",
  "numpy",
  "panic-message",
@@ -897,12 +887,27 @@ name = "ndarray"
 version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
+dependencies = [
+ "matrixmultiply",
+ "num-complex",
+ "num-integer",
+ "num-traits",
+ "rawpointer",
+]
+
+[[package]]
+name = "ndarray"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "087ee1ca8a7c22830c2bba4a96ed8e72ce0968ae944349324d52522f66aa3944"
 dependencies = [
  "approx",
  "matrixmultiply",
  "num-complex",
  "num-integer",
  "num-traits",
+ "portable-atomic",
+ "portable-atomic-util",
  "rawpointer",
  "rayon",
 ]
@@ -936,16 +941,6 @@ dependencies = [
  "libm",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "numpy"
 version = "0.19.0"
@@ -953,7 +948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389"
 dependencies = [
  "libc",
- "ndarray",
+ "ndarray 0.15.6",
  "num-complex",
  "num-integer",
  "num-traits",
@@ -1085,6 +1080,21 @@ dependencies = [
  "plotters-backend",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+
+[[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 = "proc-macro2"
 version = "1.0.66"
@@ -1171,9 +1181,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -1181,14 +1191,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 3222363..42e36eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,8 +44,8 @@ codegen-units = 1 # Set this to 1 in Cargo.toml to allow for maximum size reduct
 [dependencies]
 cfg-if = "1.0.0"
 hdf5 = "0.8.0"
-marlu = { version = "0.11.0", default-features = false }
-ndarray = "0.15.4"
+marlu = { version = "0.13.0", default-features = false }
+ndarray = "0.16.0"
 num-complex = "0.4.1"
 panic-message = "0.3.0"
 parking_lot = "0.12.0"
@@ -67,10 +67,10 @@ numpy = { version = "0.19.0", optional = true }
 [dev-dependencies]
 approx = { version = "0.5.0", features = ["num-complex"] }
 criterion = "0.5.1"
-marlu = { version = "0.11.0", default-features = false, features = ["approx"] }
+marlu = { version = "0.13.0", default-features = false, features = ["approx"] }
 serial_test = "2.0.0"
 
-ndarray = { version = "0.15.4", features = ["approx-0_5"] }
+ndarray = { version = "0.16.0", features = ["approx"] }
 
 [build-dependencies]
 cbindgen = { version = "0.25.0", default-features = false }