Ensure single row datasets work - fix was in dtype.

techascent · Dec 10, 2022 · 62eb876 · 62eb876
1 parent 69b3035
commit 62eb876
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/neanderthal/tech/v3/dataset/neanderthal_test.clj b/neanderthal/tech/v3/dataset/neanderthal_test.clj
@@ -33,3 +33,34 @@
                     (map vector
                          (ds/columns test-ds)
                          (ds/columns res-ds))))))))
+
+
+(deftest single-row-test
+  (let [test-ds (ds/->dataset {:a [1]
+                               :b [6]
+                               :c [11]})]
+    (testing "Column major conversion"
+      (let [n-mat (ds-neanderthal/dataset->dense test-ds :column)
+            res-ds (ds-neanderthal/dense->dataset n-mat)]
+        (is (= 3 (ds/column-count res-ds)))
+        (is (every? #(dfn/equals (first %) (second %))
+                    (map vector
+                         (ds/columns test-ds)
+                         (ds/columns res-ds))))))
+    (testing "Row major conversion"
+      (let [n-mat (ds-neanderthal/dataset->dense test-ds :row)
+            res-ds (ds-neanderthal/dense->dataset n-mat)]
+        (is (= 3 (ds/column-count res-ds)))
+        (is (every? #(dfn/equals (first %) (second %))
+                    (map vector
+                         (ds/columns test-ds)
+                         (ds/columns res-ds))))))
+    (testing "Column major conversion - float32"
+      (let [n-mat (ds-neanderthal/dataset->dense test-ds :column :float32)
+            res-ds (ds-neanderthal/dense->dataset n-mat)]
+        (is (= 3 (ds/column-count res-ds)))
+        (is (every? #(dfn/equals (first %) (second %))
+                    (map vector
+                         (ds/columns test-ds)
+                         (ds/columns res-ds)))))))
+  )
diff --git a/project.clj b/project.clj
@@ -4,7 +4,7 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure              "1.11.1" :scope "provided"]
-                 [cnuernber/dtype-next             "10.000-beta-5"]
+                 [cnuernber/dtype-next             "10.000-beta-6"]
                  [techascent/tech.io               "4.23"
                   :exclusions [org.apache.commons/commons-compress]]
                  ;;[com.cnuernber/charred            "1.011"]