Revert " apache#13813 examples with opencv4/origami (apache#13813)"

This reverts commit 754ff76.

contrib/clojure-package/examples/gan/.gitignore

@@ -9,4 +9,3 @@ pom.xml.asc
 /.nrepl-port
 .hgignore
 .hg/
-results

contrib/clojure-package/examples/gan/project.clj

@@ -15,12 +15,11 @@
 ;; limitations under the License.
 ;;
 
-(defproject gan-origami "0.1.0-SNAPSHOT"
+(defproject gan "0.1.0-SNAPSHOT"
   :description "GAN MNIST with MXNet"
   :plugins [[lein-cljfmt "0.5.7"]]
-  :repositories [["vendredi" {:url "https://repository.hellonico.info/repository/hellonico/"}]]
   :dependencies [[org.clojure/clojure "1.9.0"]
                  [org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]
-                 [origami "4.0.0-3"]
+                 [org.openpnp/opencv "3.4.2-1"]
                  ]
-  :main gan.gan-mnist)
+  :main gan.gan-mnist)

contrib/clojure-package/examples/gan/src/gan/viz.clj

@@ -18,9 +18,14 @@
 (ns gan.viz
   (:require [org.apache.clojure-mxnet.ndarray :as ndarray]
             [org.apache.clojure-mxnet.shape :as mx-shape]
-            [org.apache.clojure-mxnet.io :as mx-io]
-            [opencv4.utils :as cvu]
-            [opencv4.core :as cv :refer [CV_8UC1 new-matofbyte flip! imwrite new-size hconcat! vconcat! new-mat merge!]]))
+            [org.apache.clojure-mxnet.io :as mx-io])
+  (:import (nu.pattern OpenCV)
+           (org.opencv.core Core CvType Mat Size)
+           (org.opencv.imgproc Imgproc)
+           (org.opencv.imgcodecs Imgcodecs)))
+
+;;; Viz stuff
+(OpenCV/loadShared)
 
 (defn clip [x]
   (->> x
@@ -32,11 +37,29 @@
        (mapv #(.byteValue %))))
 
 (defn get-img [raw-data channels height width flip]
-  (let [img (if (> channels 1)
-              (throw (Exception. "Image with 3 channels (RGB) not supported"))
+  (let [totals (* height width)
+        img (if (> channels 1)
+              ;; rgb image
+              (let [[ra ga ba] (byte-array (partition totals raw-data))
+                    rr (new Mat height width (CvType/CV_8U))
+                    gg (new Mat height width (CvType/CV_8U))
+                    bb (new Mat height width (CvType/CV_8U))
+                    result (new Mat)]
+                (.put rr (int 0) (int 0) ra)
+                (.put gg (int 0) (int 0) ga)
+                (.put bb (int 0) (int 0) ba)
+                (Core/merge (java.util.ArrayList. [bb gg rr]) result)
+                result)
               ;; gray image
-              (cv/>> (new-mat height width CV_8UC1) (byte-array raw-data)))]
-    (if flip (flip! img 0) img)))
+              (let [result (new Mat height width (CvType/CV_8U))
+                    _ (.put result (int 0) (int 0) (byte-array raw-data))]
+                result))]
+    (do
+      (if flip
+        (let [result (new Mat)
+              _ (Core/flip img result (int 0))]
+          result)
+        img))))
 
 (defn im-sav [{:keys [title output-path x flip]
                :or {flip false} :as g-mod}]
@@ -50,10 +73,15 @@
         line-arrs (into [] (partition (* col c totals) raw-data))
         line-mats (mapv (fn [line]
                           (let [img-arr (into [] (partition (* c totals) line))
-                                src (mapv (fn [arr] (get-img (into [] arr) c h w flip)) img-arr)]
-                            (hconcat! src)))
-                        line-arrs)]
-    (-> line-mats
-        (vconcat!)
-        (cvu/resize-by 1.5)
-        (imwrite (str output-path title ".jpg")))))
+                                col-mats (new Mat)
+                                src (mapv (fn [arr] (get-img (into [] arr) c h w flip)) img-arr)
+                                _ (Core/hconcat (java.util.ArrayList. src) col-mats)]
+                            col-mats))
+                        line-arrs)
+        result (new Mat)
+        resized-img (new Mat)
+        _ (Core/vconcat (java.util.ArrayList. line-mats) result)]
+    (do
+      (Imgproc/resize result resized-img (new Size (* (.width result) 1.5) (* (.height result) 1.5)))
+      (Imgcodecs/imwrite (str output-path title ".jpg") resized-img)
+      (Thread/sleep 1000))))

contrib/clojure-package/examples/infer/objectdetector/.gitignore

@@ -10,4 +10,3 @@ pom.xml.asc
 /.nrepl-port
 .hgignore
 .hg/
-results

contrib/clojure-package/examples/infer/objectdetector/README.md

@@ -16,9 +16,6 @@ $ ./scripts/get_ssd_data.sh
 $
 $ lein run -- --help
 $ lein run -- -m models/resnet50_ssd/resnet50_ssd_model -i images/dog.jpg -d images/
-$ 
-$ # or the available lein alias
-$ lein run-detector
 $
 $ lein uberjar
 $ java -jar target/objectdetector-0.1.0-SNAPSHOT-standalone.jar --help

contrib/clojure-package/examples/infer/objectdetector/project.clj

@@ -17,12 +17,9 @@
 
 (defproject objectdetector "0.1.0-SNAPSHOT"
   :description "Object detection using infer with MXNet"
-  :repositories [["vendredi" "https://repository.hellonico.info/repository/hellonico/"]]
   :plugins [[lein-cljfmt "0.5.7"]]
-  :aliases {"run-detector" ["run" "--" "-m" "models/resnet50_ssd/resnet50_ssd_model" "-i" "images/dog.jpg" "-d" "images/"]}
   :dependencies [[org.clojure/clojure "1.9.0"]
                  [org.clojure/tools.cli "0.4.1"]
-                 [origami "4.0.0-3"]
                  [org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]]
   :main ^:skip-aot infer.objectdetector-example
   :profiles {:uberjar {:aot :all}})

contrib/clojure-package/examples/infer/objectdetector/src/infer/objectdetector_example.clj

@@ -20,7 +20,6 @@
             [org.apache.clojure-mxnet.infer :as infer]
             [org.apache.clojure-mxnet.layout :as layout]
             [clojure.java.io :as io]
-            [infer.draw :as draw]
             [clojure.string :refer [join]]
             [clojure.tools.cli :refer [parse-opts]])
   (:gen-class))
@@ -46,49 +45,37 @@
    ["-i" "--input-image IMAGE" "Input image"
     :default "images/dog.jpg"
     :validate [check-valid-file "Input file not found"]]
-   ["-o" "--output-dir IMAGE_DIR" "Output directory. Defaults to results"
-    :default "results/"
-    :validate [check-valid-dir "Output directory not found"]]
    ["-d" "--input-dir IMAGE_DIR" "Input directory"
     :default "images/"
     :validate [check-valid-dir "Input directory not found"]]
    ["-h" "--help"]])
 
-(defn result->map [{:keys [class prob x-min y-min x-max y-max]}]
-  (hash-map
-   :label class
-   :confidence (int (* 100 prob))
-   :top-left [x-min y-min]
-   :bottom-right [x-max y-max]))
-
-(defn print-results [results]
-  (doseq [_r results]
-    (println (format "Class: %s Confidence=%s Coords=(%s, %s)"
-                     (_r :label)
-                     (_r :confidence)
-                     (_r :top-left)
-                     (_r :bottom-right)))))
-
-(defn process-results [images results output-dir]
-  (dotimes [i (count images)]
-    (let [image (nth images i) _results (map result->map (nth results i))]
-      (println "processing: " image)
-      (print-results _results)
-      (draw/draw-bounds image _results output-dir))))
+(defn print-predictions
+  "Print image detector predictions for the given input file"
+  [predictions width height]
+  (println (apply str (repeat 80 "=")))
+  (doseq [{:keys [class prob x-min y-min x-max y-max]} predictions]
+    (println (format
+              "Class: %s Prob=%.5f Coords=(%.3f, %.3f, %.3f, %.3f)"
+              class
+              prob
+              (* x-min width)
+              (* y-min height)
+              (* x-max width)
+              (* y-max height))))
+  (println (apply str (repeat 80 "="))))
 
 (defn detect-single-image
   "Detect objects in a single image and print top-5 predictions"
-  [detector input-image output-dir]
+  [detector input-image]
   (let [image (infer/load-image-from-file input-image)
-        topk 5]
-    (process-results
-     [input-image]
-     (infer/detect-objects detector image topk)
-     output-dir)))
+        topk 5
+        [predictions] (infer/detect-objects detector image topk)]
+    predictions))
 
 (defn detect-images-in-dir
   "Detect objects in all jpg images in the directory"
-  [detector input-dir output-dir]
+  [detector input-dir]
   (let [batch-size 20
         image-file-batches (->> input-dir
                                 io/file
@@ -97,18 +84,15 @@
                                 (filter #(re-matches #".*\.jpg$" (.getPath %)))
                                 (mapv #(.getPath %))
                                 (partition-all batch-size))]
-    (doall
-     (for [image-files image-file-batches]
-       (let [image-batch (infer/load-image-paths image-files) topk 5]
-         (process-results
-          image-files
-          (infer/detect-objects-batch detector image-batch topk)
-          output-dir))))))
+    (apply concat (for [image-files image-file-batches]
+                    (let [image-batch (infer/load-image-paths image-files)
+                          topk 5]
+                      (infer/detect-objects-batch detector image-batch topk))))))
 
 (defn run-detector
   "Runs an image detector based on options provided"
   [options]
-  (let [{:keys [model-path-prefix input-image input-dir output-dir
+  (let [{:keys [model-path-prefix input-image input-dir
                 device device-id]} options
         width 512 height 512
         descriptors [{:name "data"
@@ -119,11 +103,12 @@
         detector (infer/create-object-detector
                   factory
                   {:contexts [(context/default-context)]})]
-    (println "Output results to:" output-dir ":" (.mkdir (io/file output-dir)))
     (println "Object detection on a single image")
-    (detect-single-image detector input-image output-dir)
+    (print-predictions (detect-single-image detector input-image) width height)
+    (println "\n")
     (println "Object detection on images in a directory")
-    (detect-images-in-dir detector input-dir output-dir)))
+    (doseq [predictions (detect-images-in-dir detector input-dir)]
+      (print-predictions predictions width height))))
 
 (defn -main
   [& args]

contrib/clojure-package/examples/neural-style/project.clj

@@ -18,8 +18,8 @@
 (defproject neural-style "0.1.0-SNAPSHOT"
   :description "Neural Style Transfer with MXNet"
   :plugins [[lein-cljfmt "0.5.7"]]
-  :repositories [["vendredi" {:url "https://repository.hellonico.info/repository/hellonico/"}]]
   :dependencies [[org.clojure/clojure "1.9.0"]
                  [org.apache.mxnet.contrib.clojure/clojure-mxnet "1.5.0-SNAPSHOT"]
-                 [origami "4.0.0-3"]]
-  :main neural-style.core)
+                 [net.mikera/imagez "0.12.0"]
+                 [thinktopic/think.image "0.4.16"]]
+  :main neural-style.core)