Removed GSL dependency

Cargo.toml

@@ -6,7 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-GSL = "4.0" # GNU Stats Library, for psi function
 statrs = "0.16.0" # For betaln function
 mongodb = "2.1"
 bson = { version = "2", features = ["chrono-0_4"] } # Needed for using chrono datetime in doc

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 0: Statically build node client
-FROM node as client-builder
+FROM node:lts-hydrogen as client-builder
 WORKDIR /client
 COPY client/public public
 COPY client/src src
@@ -14,11 +14,13 @@ RUN yarn install
 RUN yarn build
 
 # STEP 1: Compile backend
-FROM rust as builder
+FROM rust:1-alpine3.18 as builder
 WORKDIR /usr/src/jury
 
-RUN apt update
-RUN apt install libgsl-dev -y
+# This is important, see https://github.com/rust-lang/docker-rust/issues/85
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+
+RUN apk add --no-cache musl-dev
 
 # Jank way to cache built rust dependencies
 RUN mkdir src
@@ -36,16 +38,21 @@ ARG JURY_ADMIN_PASSWORD=$JURY_ADMIN_PASSWORD
 ARG FILESERVER="/public"
 
 RUN cargo install --locked --path .
+RUN ls -la /usr/local/cargo/bin
 
 # STEP 2: Main running container
-FROM debian:bullseye-slim
+FROM alpine:3.18
+
+# Extra dependencies needed
+RUN apk add --no-cache ca-certificates openssl-dev bash openssl libgcc libstdc++
 
 ENV FILESERVER="/public"
 ENV ROCKET_ADDRESS=0.0.0.0
 
 EXPOSE $PORT
 
-RUN apt-get update && apt-get install -y libgsl-dev && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local/cargo/bin/jury /usr/local/bin/jury
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=client-builder /client/build /public
+
 CMD ["jury"]

client/dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM node as client-builder
+FROM node:lts-hydrogen as client-builder
 WORKDIR /client
 
 ENV REACT_APP_JURY_NAME=$REACT_APP_JURY_NAME

dev.Dockerfile

@@ -1,8 +1,6 @@
-FROM rust
+FROM rust:1.70
 WORKDIR /jury
 
-RUN apt update
-RUN apt install libgsl-dev -y
 RUN cargo install cargo-watch
 
 COPY public /public

src/util/crowd_bt.rs

@@ -1,5 +1,5 @@
-use rgsl::psi::diagamma::psi;
 use statrs::function::beta;
+use crate::util::digamma::psi;
 
 pub const GAMMA: f64 = 0.1;
 // const LAMBDA: f64 = 1.0; // regularization parameter - not used??

src/util/digamma.rs

@@ -0,0 +1,46 @@
+/**
+ * Bernardo, J. M. (1976). Algorithm AS 103: Psi (Digamma) Function. 
+ * Journal of the Royal Statistical Society. 
+ * Series C (Applied Statistics), 25(3), 315-317. 
+ * https://doi.org/10.2307/2347257
+ */
+
+pub fn psi(x: f64) -> f64 {
+    let euler_mascheroni = 0.57721566490153286060;
+    let mut r: f64;
+    let mut value: f64;
+    let mut x2: f64;
+
+    // Make sure input is greater than 0
+    if x <= 0.0 {
+        eprintln!("Error: Digamma psi function called with argument <= 0");
+        return 0.0;
+    }
+
+    // Approximate for small values
+    if x <= 0.000001 {
+        return - euler_mascheroni - 1.0 / x + 1.6449340668482264365 * x;
+    }
+
+    // Reduce to DIGAMMA(X + N)
+    value = 0.0;
+    x2 = x;
+    while x2 < 8.5 {
+        value -= 1.0 / x2;
+        x2 += 1.0;
+    }
+
+    // Use Stirling's (actually de Moivre's) expansion.
+    r = 1.0 / x2;
+    value += f64::ln(x2) - 0.5 * r;
+
+    r *= r;
+    value = value
+        - r * (1.0 / 12.0
+        - r * (1.0 / 120.0
+        - r * (1.0 / 252.0
+        - r * (1.0 / 240.0
+        - r * (1.0 / 132.0)))));
+
+    return value;
+}

src/util/mod.rs

@@ -3,3 +3,4 @@ pub mod crowd_bt;
 pub mod parse_csv;
 pub mod types;
 pub mod tasks;
+pub mod digamma;

tests/util_tests.rs

@@ -1,3 +1,4 @@
+use jury::util;
 use jury::util::crowd_bt;
 
 #[test]
@@ -10,3 +11,25 @@ fn math_test() {
     assert_eq!(e, 3.057070240002119);
     assert_eq!(f, 0.6301076201202875);
 }
+
+#[test]
+fn diagamma_test() {
+    let tests : [[f64; 2]; 11] = [
+        [1.0E+00, -0.5772156649E+00],
+        [1.1E+00, -0.4237549404E+00],
+        [1.2E+00, -0.2890398965E+00],
+        [1.3E+00, -0.1691908888E+00],
+        [1.4E+00, -0.6138454458E-01],
+        [1.5E+00, 0.3648997397E-01],
+        [1.6E+00, 0.1260474527E+00],
+        [1.7E+00, 0.2085478748E+00],
+        [1.8E+00, 0.2849914332E+00],
+        [1.9E+00, 0.3561841611E+00],
+        [2.0E+00, 0.4227843350E+00],
+    ];
+
+    for i in 0..11 {
+        let res = util::digamma::psi(tests[i][0]);
+        assert!(res - tests[i][1] < 1.0E-10);
+    }
+}