Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[Clojure] package infer tweaks #13864

Merged
merged 11 commits into from
Jan 13, 2019
Merged

[Clojure] package infer tweaks #13864

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
488843e
change object detection prediction to be a map
gigasquid Jan 11, 2019
e8e55a9
change predictions to a map for image-classifiers
gigasquid Jan 11, 2019
3ec2817
change return types of the classifiers to be a map
gigasquid Jan 11, 2019
c265ab1
tweak return types and inputs for predict
gigasquid Jan 11, 2019
14b9c99
updated infer-classify examples
gigasquid Jan 12, 2019
a336910
adjust the infer/object detections tests
gigasquid Jan 12, 2019
455c6fc
tweak predictor test
gigasquid Jan 12, 2019
8fe433c
Feedback from @kedarbellare review
gigasquid Jan 12, 2019
563ee1e
put scaling back in
gigasquid Jan 12, 2019
676f313
put back predict so it can handle multiple inputs
gigasquid Jan 12, 2019
dab1641
restore original functions signatures (remove first)
gigasquid Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions contrib/clojure-package/examples/infer/objectdetector/src/infer/objectdetector_example.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,15 @@
"Print image detector predictions for the given input file"
[predictions width height]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

width and height aren't used anymore. remove?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I add the w and h back into the print method it should be good and resolve it

(println (apply str (repeat 80 "=")))
(doseq [p predictions]
(println p))
(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))))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

(println (apply str (repeat 80 "="))))

(defn detect-single-image
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/infer/predictor/src/infer/predictor_example.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"Run inference using given predictor"
[predictor image]
(let [predictions (infer/predict-with-ndarray predictor [image])]
predictions))
(first predictions)))

(defn postprocess
[model-path-prefix predictions]
Expand Down
10 changes: 4 additions & 6 deletions contrib/clojure-package/src/org/apache/clojure_mxnet/infer.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,17 @@
(util/validate! ::vvec-of-numbers inputs
"Invalid inputs")
(->> (.predict (:predictor wrapped-predictor)
(util/vec->indexed-seq [(float-array (first inputs))]))
(util/coerce-return-recursive)
(first)
(mapv float)))
(util/vec->indexed-seq (mapv float-array inputs)))
(util/coerce-return-recursive)
(mapv #(mapv float %))))
(predict-with-ndarray [wrapped-predictor input-arrays]
(util/validate! ::wrapped-predictor wrapped-predictor
"Invalid predictor")
(util/validate! ::vec-of-ndarrays input-arrays
"Invalid input arrays")
(-> (.predictWithNDArray (:predictor wrapped-predictor)
(util/vec->indexed-seq input-arrays))
(util/coerce-return-recursive)
(first))))
(util/coerce-return-recursive))))

(s/def ::nil-or-int (s/nilable int?))

Expand Down
15 changes: 8 additions & 7 deletions contrib/clojure-package/test/org/apache/clojure_mxnet/infer/predictor_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
[clojure.java.io :as io]
[clojure.java.shell :refer [sh]]
[clojure.string :refer [split]]
[clojure.test :refer :all]))
[clojure.test :refer :all]
[org.apache.clojure-mxnet.util :as util]))

(def model-dir "data/")
(def model-path-prefix (str model-dir "resnet-18/resnet-18"))
Expand All @@ -45,16 +46,16 @@
(deftest predictor-test-with-ndarray
(let [predictor (create-predictor)
image-ndarray (-> "test/test-images/kitten.jpg"
infer/load-image-from-file
(infer/reshape-image width height)
(infer/buffered-image-to-pixels [3 width height])
(ndarray/expand-dims 0))
infer/load-image-from-file
(infer/reshape-image width height)
(infer/buffered-image-to-pixels [3 width height])
(ndarray/expand-dims 0))
predictions (infer/predict-with-ndarray predictor [image-ndarray])
synset-file (-> (io/file model-path-prefix)
(.getParent)
(io/file "synset.txt"))
synset-names (split (slurp synset-file) #"\n")
[best-index] (ndarray/->int-vec (ndarray/argmax predictions 1))
[best-index] (ndarray/->int-vec (ndarray/argmax (first predictions) 1))
best-prediction (synset-names best-index)]
(is (= "n02123159 tiger cat" best-prediction))))

Expand All @@ -70,7 +71,7 @@
(.getParent)
(io/file "synset.txt"))
synset-names (split (slurp synset-file) #"\n")
ndarray-preds (ndarray/array predictions [1 1000])
ndarray-preds (ndarray/array (first predictions) [1 1000])
[best-index] (ndarray/->int-vec (ndarray/argmax ndarray-preds 1))
best-prediction (synset-names best-index)]
(is (= "n02123159 tiger cat" best-prediction))))