diff --git a/contrib/clojure-package/test/dev/generator_test.clj b/contrib/clojure-package/test/dev/generator_test.clj index 7551bc1edb64..05b4a741bc7c 100644 --- a/contrib/clojure-package/test/dev/generator_test.clj +++ b/contrib/clojure-package/test/dev/generator_test.clj @@ -86,19 +86,17 @@ (is (= "LRN" (-> lrn-info vals ffirst :name str))))) (deftest test-symbol-vector-args - ;; FIXME - #_(is (= `(if (clojure.core/map? kwargs-map-or-vec-or-sym) + (is (= '(if (clojure.core/map? kwargs-map-or-vec-or-sym) (util/empty-list) (util/coerce-param - kwargs-map-or-vec-or-sym - #{"scala.collection.Seq"})) + kwargs-map-or-vec-or-sym + #{"scala.collection.Seq"})) (gen/symbol-vector-args)))) (deftest test-symbol-map-args - ;; FIXME - #_(is (= `(if (clojure.core/map? kwargs-map-or-vec-or-sym) + (is (= '(if (clojure.core/map? kwargs-map-or-vec-or-sym) (org.apache.clojure-mxnet.util/convert-symbol-map - kwargs-map-or-vec-or-sym) + kwargs-map-or-vec-or-sym) nil) (gen/symbol-map-args)))) @@ -160,14 +158,13 @@ :exception-types [], :flags #{:public}}]} function-name (symbol "div")] - ;; FIXME - #_(is (= '(([sym sym-or-Object] + (is (= '(([sym sym-or-object] (util/coerce-return - (.$div - sym - (util/nil-or-coerce-param - sym-or-Object - #{"org.apache.mxnet.Symbol" "java.lang.Object"}))))) + (.$div + sym + (util/nil-or-coerce-param + sym-or-object + #{"org.apache.mxnet.Symbol" "java.lang.Object"}))))) (gen/gen-symbol-function-arity op-name op-values function-name))))) (deftest test-gen-ndarray-function-arity @@ -210,5 +207,4 @@ fname) good-contents (slurp "test/good-test-ndarray.clj") contents (slurp fname)] - ;; FIXME - #_(is (= good-contents contents))))) + (is (= good-contents contents))))) diff --git a/contrib/clojure-package/test/good-test-ndarray.clj b/contrib/clojure-package/test/good-test-ndarray.clj index 5e7131a8a033..b048a819c642 100644 --- a/contrib/clojure-package/test/good-test-ndarray.clj +++ b/contrib/clojure-package/test/good-test-ndarray.clj @@ -35,3 +35,4 @@ ndarray-or-double-or-float #{"org.apache.mxnet.MX_PRIMITIVES$MX_PRIMITIVE_TYPE" "org.apache.mxnet.NDArray"}))))) + diff --git a/contrib/clojure-package/test/org/apache/clojure_mxnet/module_test.clj b/contrib/clojure-package/test/org/apache/clojure_mxnet/module_test.clj index 44b984b6925f..e03c43848332 100644 --- a/contrib/clojure-package/test/org/apache/clojure_mxnet/module_test.clj +++ b/contrib/clojure-package/test/org/apache/clojure_mxnet/module_test.clj @@ -246,6 +246,7 @@ d-shape1 [10 3 64 64] d-shape2 [10 3 32 32] l-shape [10] + mod (m/module my-sym {:data-names ["data1" "data2"]}) data-batch {:data [(ndarray/random-uniform 0 9 (str (mx-shape/->shape d-shape1))) (ndarray/random-uniform 5 15 (str (mx-shape/->shape d-shape2)))] @@ -280,9 +281,8 @@ :index nil :pad 0}] (-> mod - (m/forward data-batch)) - ;; FIXME - #_(is (= [(first l-shape) num-class] + (m/forward data-batch-2)) + (is (= [(first l-shape) num-class] (-> mod (m/outputs-merged) (first) @@ -301,9 +301,8 @@ :index nil :pad 0}] (-> mod - (m/forward data-batch)) - ;; FIXME - #_(is (= [(first l-shape) num-class] + (m/forward data-batch-2)) + (is (= [(first l-shape) num-class] (-> mod (m/outputs-merged) (first)