Clojure/solution_3: build executable jar (PlummersSoftwareLLC#825)

Author: PEZ

PrimeClojure/solution_3/.dockerignore

@@ -0,0 +1,5 @@
+Dockerfile
+README.md
+.gitignore
+classes
+target

PrimeClojure/solution_3/.gitignore

@@ -5,4 +5,5 @@
 classes/
 .lsp/.cache/
 .clj-condo/.cache/
-decompiled*.java
+decompiled*.java
+target/

PrimeClojure/solution_3/Dockerfile

@@ -1,4 +1,8 @@
 FROM clojure:openjdk-18-tools-deps
+
 WORKDIR /primes
-COPY deps.edn sieve.clj run.sh ./
+
+COPY . ./
+RUN ./build.sh
+
 ENTRYPOINT ["./run.sh"]

PrimeClojure/solution_3/README.md

@@ -26,15 +26,25 @@ The other implementations either start with all numbers, even and odd, or use so
 The runner infrastructure is built from Alex Vear's [Clojure Solution 2](https://github.com/PlummersSoftwareLLC/Primes/tree/drag-race/PrimeClojure/solution_2).
 
 1. Install a JDK.
-2. Install the [Clojure CLI tools](https://clojure.org/guides/getting_started#_clojure_installer_and_cli_tools).
-3. Run with `clojure -X sieve/run :warm-up? true`
+1. Install the [Clojure CLI tools](https://clojure.org/guides/getting_started#_clojure_installer_and_cli_tools).
+1. Run with `clojure -X sieve/run :variant :boolean-array ':warm-up?' true`
 
 The warm-up makes the runner start with a silent run, before running one that is reported, giving slightly more consistent results. (But, really, you should use [Criterium](https://github.com/hugoduncan/criterium) for benchmarking while developing, see below.)
 
-Running the four ”main” solutions via Docker:
+You can also build an executable jar and run that:
+
+1. clojure -T:build uber
+1. java -jar target/primes.jar '{:variant :boolean-array :warm-up? true}'
+
+To run the four ”main” solutions:
+
+```sh
+./build.sh && ./run.sh
+```
+
+Using Docker:
 
 ```sh
-$ docker pull clojure:openjdk-18-tools-deps-1.10.3.1040
 $ docker build -t pez-primes-clojure .
 $ docker run --rm -it pez-primes-clojure
 ```
@@ -61,7 +71,7 @@ If you have experience with Clojure: It's just a regular tools/deps project. Sta
 If not, I suggest using [Calva](https://calva.io) (yes, partly because I created it 😄):
 
 1. Open the project root in in VS Code.
-1. Open `sieve.clj`
+1. Open `src/sieve.clj`
 1. Issue the command **Calva: Start a Clojure REPL in your Project and Connect (aka Jack-in)**
 1. When the REPL has started, issue **Calva: Load current file and its dependencies**
 

PrimeClojure/solution_3/build.clj

@@ -0,0 +1,20 @@
+(ns build
+  (:require [clojure.tools.build.api :as b]))
+
+(def class-dir "classes")
+(def basis (b/create-basis {:project "deps.edn"}))
+
+(defn clean [_]
+  (b/delete {:path "target"}))
+
+(defn uber [_]
+  (clean nil)
+  (b/copy-dir {:src-dirs ["src"]
+               :target-dir class-dir})
+  (b/compile-clj {:basis basis
+                  :src-dirs ["src"]
+                  :class-dir class-dir})
+  (b/uber {:class-dir class-dir
+           :uber-file "target/primes.jar"
+           :basis basis
+           :main 'sieve}))

PrimeClojure/solution_3/build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+clojure -T:build uber

PrimeClojure/solution_3/deps.edn

@@ -1,3 +1,8 @@
-{:paths ["."]
- :deps {org.clojure/clojure {:mvn/version "1.10.3"}
-        criterium/criterium {:mvn/version "0.4.6"}}}
+{:paths ["src"]
+ :deps {org.clojure/clojure {:mvn/version "1.10.3"}}
+ :aliases {:benchmark {:extra-deps {criterium/criterium {:mvn/version "0.4.6"}}}
+           :decompiler {:extra-deps {com.clojure-goes-fast/clj-java-decompiler {:mvn/version "0.3.1"}}}
+           :profiler {:extra-deps {com.clojure-goes-fast/clj-async-profiler {:mvn/version "0.5.1"}}
+                      :jvm-opts ["-Djdk.attach.allowAttachSelf" "-XX:+UnlockDiagnosticVMOptions" "-XX:+DebugNonSafepoints"]}
+           :build {:deps {io.github.clojure/tools.build {:git/tag "v0.7.5" :git/sha "34727f7"}}
+                   :ns-default build}}}

PrimeClojure/solution_3/run.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
 
 RUNS=$(if [ -z "$1" ]; then echo 1; else echo $1; fi)
-for ((i=0;i<${RUNS};i++))
+for ((i = 0; i < RUNS; i++))
 do
   #echo $i
-  clojure -X sieve/run :variant :vector :warm-up? false
-  clojure -X sieve/run :variant :vector-transient :warm-up? false
-  clojure -X sieve/run :variant :bitset :warm-up? true
-  #clojure -X sieve/run :variant :bitset-shroedinger :warm-up? true
-  #clojure -X sieve/run :variant :bitset-all :warm-up? false
-  #clojure -X sieve/run :variant :bitset-pre :warm-up? false
-  clojure -X sieve/run :variant :boolean-array :warm-up? true
-  #clojure -X sieve/run :variant :boolean-array-all :warm-up? false
-  #clojure -X sieve/run :variant :boolean-array-pre :warm-up? false
-  #clojure -X sieve/run :variant :boolean-array-pre-futures :warm-up? false
-  #clojure -X sieve/run :variant :boolean-array-to-vector-futures :warm-up? false
+  java -jar target/primes.jar '{:variant :vector :warm-up? false}'
+  java -jar target/primes.jar '{:variant :vector-transient :warm-up? false}'
+  java -jar target/primes.jar '{:variant :bitset :warm-up? true}'
+  #java -jar target/primes.jar '{:variant :bitset-shroedinger :warm-up? true}'
+  #java -jar target/primes.jar '{:variant :bitset-all :warm-up? false}'
+  #java -jar target/primes.jar '{:variant :bitset-pre :warm-up? false}'
+  java -jar target/primes.jar '{:variant :boolean-array :warm-up? true}'
+  #java -jar target/primes.jar '{:variant :boolean-array-all :warm-up? false}'
+  #java -jar target/primes.jar '{:variant :boolean-array-pre :warm-up? false}'
+  #java -jar target/primes.jar '{:variant :boolean-array-pre-futures :warm-up? false}'
+  #java -jar target/primes.jar '{:variant :boolean-array-to-vector-futures :warm-up? false}'
 done

PrimeClojure/solution_3/sieve.clj PrimeClojure/solution_3/src/sieve.clj

@@ -1,7 +1,8 @@
 (ns sieve
   "Clojure implementations of The Sieve of Eratosthenes by Peter Strömberg (a.k.a. PEZ)"
-  (:require [criterium.core :refer [bench quick-bench with-progress-reporting]])
-  (:import [java.time Instant Duration]))
+  (:require [clojure.edn])
+  (:import [java.time Instant Duration])
+  (:gen-class))
 
 ;; Disable overflow checks on mathematical ops and warn when compiler is unable
 ;; to optimise correctly.
@@ -58,7 +59,8 @@
   (loot (sieve 1))
   (loot (sieve 10))
   (loot (sieve 100))
-  (time (count (loot (sieve 1000000))))
+  (time (count (loot (sieve 1000000))))'
+  (require '[criterium.core :refer [bench quick-bench with-progress-reporting]])
   (with-progress-reporting (quick-bench (sieve 1000000))))
 
 (set! *unchecked-math* true)
@@ -96,7 +98,6 @@
   (count (loot (sieve-ba 1000)))
   (count (loot (sieve-ba 1000000)))
   (with-progress-reporting (quick-bench (sieve-ba 1000000)))
-  (with-progress-reporting (bench (sieve-ba 1000000)))
   (time (do (sieve-ba 1000000) nil)))
 
 (defn sieve-bs
@@ -105,17 +106,17 @@
   [^long n]
   (if (< n 2)
     (java.util.BitSet. 0)
-    (let [half-n (int (bit-shift-right n 1))
-          primes (doto (java.util.BitSet. n) (.set 0 half-n))
-          sqrt-n (long (Math/ceil (Math/sqrt (double n))))]
+    (let [sqrt-n (unchecked-long (Math/ceil (Math/sqrt (double n))))
+          half-n (unchecked-int (bit-shift-right n 1))
+          primes (doto (java.util.BitSet. half-n) (.set (unchecked-int 0) half-n))]
       (loop [p 3]
         (when (< p sqrt-n)
-          (when (.get primes (unchecked-int (bit-shift-right p (unchecked-int 1))))
-            (loop [i (bit-shift-right (unchecked-multiply p p) 1)]
+          (when (.get primes (unchecked-int (bit-shift-right p 1)))
+            (loop [i (bit-shift-right (* p p) 1)]
               (when (< i half-n)
                 (.clear primes (unchecked-int i))
-                (recur (unchecked-add-int i p)))))
-          (recur (unchecked-add-int p 2))))
+                (recur (+ i p)))))
+          (recur (+ p 2))))
       primes)))
 
 (defn sieve-bs-shroedinger
@@ -543,6 +544,9 @@
       (format-results (merge conf (benchmark sieve) {:variant variant})))
     (println (format-results (merge conf (benchmark sieve) {:variant variant})))))
 
+(defn -main [& args]
+  (run (clojure.edn/read-string (first args))))
+
 (comment
   (run {:warm-up? true})
   (run {:warm-up? false})