remove LRU cache support

Author: poly000

.github/workflows/release.yml

@@ -58,6 +58,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: ${{ matrix.target }}.tar
-          tag_name: v0.3.1
+          tag_name: v0.4.0
           prerelease: true
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "fibnacci"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/poly000/fibonacci"
@@ -19,9 +19,6 @@ name = "fibonacci"
 rayon = "1.5.3"
 rust-gmp = "0.5.0"
 clap = { version = "3.2.20", features = ["derive"] }
-cache-macro = "0.4.1"
-lru-cache = "0.1.2"
-lazy_static = "1.4.0"
 
 [profile.release]
 panic = "abort"

Cargo.toml

@@ -1,13 +1,12 @@
 use clap::Parser;
+use fibonacci::fib;
 use fibonacci::IndexType;
-use fibonacci::{_fib, fib};
 
 fn main() {
     let Args {
         n,
         r: range,
         print_result,
-        lru_cache: no_parralel,
     } = Args::parse();
 
     match (n, range) {
@@ -28,15 +27,15 @@ fn main() {
                 }
             }) {
                 for i in r {
-                    let result = if no_parralel { _fib(i) } else { fib(i) };
+                    let result = fib(i);
                     if print_result {
                         println!("{i}: {result}");
                     }
                 }
             }
         }
         (Some(n), _) => {
-            let result = if no_parralel { _fib(n) } else { fib(n) };
+            let result = fib(n);
             if print_result {
                 println!("{result}");
             }
@@ -65,8 +64,4 @@ struct Args {
     /// whether should we print the result or only perform calculation.
     #[clap(short = 'p', long = "print", value_parser)]
     print_result: bool,
-
-    /// lru_cache version
-    #[clap(long, value_parser)]
-    lru_cache: bool,
 }

src/bin/fibonacci.rs

@@ -1,34 +1,10 @@
-use cache_macro::cache;
-use lru_cache::LruCache;
-
 pub type IndexType = u64; // this is currently much larger than your mem/cpu limitation
 
 use std::ops::Mul;
 
 use gmp::mpz::Mpz;
 use rayon::join;
 
-#[cache(LruCache : LruCache::new(1000000))]
-fn no_parralel_fib(x: IndexType) -> (Mpz, Mpz) {
-    if x < 3 {
-        (Mpz::from(0), Mpz::from(1))
-    } else {
-        if x % 2 == 1 {
-            let n = (x + 1) / 2;
-            (fib(n).pow(2), fib(n - 1).pow(2))
-        } else {
-            let n = x / 2;
-            let (a, b) = (fib(n), fib(n - 1));
-            (b.mul(Mpz::from(2)) * &a, a.pow(2))
-        }
-    }
-}
-
-pub fn _fib(x: IndexType) -> Mpz {
-    let (a, b) = no_parralel_fib(x);
-    a + b
-}
-
 pub fn fib(x: IndexType) -> Mpz {
     if x < 3 {
         Mpz::from(1)