Moving to hamf protocols

Author: cnuernber

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+# 8.001
+ * Moved to new hamf,dtype using the hamf protocols.  See hamf's defprotocol namespace for reasons.  If you are
+   extending dataset protocols via extend, extend-type or extend-protocol you need to use defprotocol's drop-in
+   replacements as opposed to clojure's default implementations.
+ 
 # 7.067
  * :disable-na-as-missing for fixed types too
  * new `maximum` reducer for reductions namespace

src/tech/v3/dataset/categorical.clj

@@ -15,7 +15,9 @@
             [tech.v3.datatype.errors :as errors]
             [tech.v3.datatype.bitmap :as bitmap]
             [ham-fisted.lazy-noncaching :as lznc]
-            [ham-fisted.set :as set]))
+            [ham-fisted.set :as set]
+            [ham-fisted.defprotocol :refer [extend-type]])
+  (:refer-clojure :exclude [extend-type]))
 
 
 (defn- indiscrete-mapping

src/tech/v3/dataset/math.clj

@@ -21,12 +21,14 @@
             [ham-fisted.set :as set]
             [ham-fisted.api :as hamf]
             [ham-fisted.function :as hamf-fn]
+            [ham-fisted.defprotocol :refer [extend-type]]
             [clj-commons.primitive-math :as pmath]
             [clojure.tools.logging :as log]
             [clojure.set :as c-set])
   (:import [org.apache.commons.math3.analysis.interpolation LoessInterpolator]
            [tech.v3.datatype DoubleReader]
-           [org.roaringbitmap RoaringBitmap]))
+           [org.roaringbitmap RoaringBitmap])
+  (:refer-clojure :exclude [extend-type]))
 
 (set! *warn-on-reflection* true)
 (set! *unchecked-math* true)

src/tech/v3/dataset/neanderthal.clj

@@ -25,7 +25,9 @@
             [tech.v3.datatype.functional :as dfn]
             [tech.v3.tensor :as dtt]
             [tech.v3.parallel.for :as pfor]
-            [clojure.tools.logging :as log]))
+            [ham-fisted.defprotocol :refer [extend-type]]
+            [clojure.tools.logging :as log])
+  (:refer-clojure :exclude [extend-type]))
 
 
 (defn dataset->dense

src/tech/v3/dataset/protocols.clj

@@ -1,10 +1,11 @@
 (ns tech.v3.dataset.protocols
   (:require [tech.v3.datatype.protocols :as dtype-proto]
-            [ham-fisted.protocols :as hamf-proto])
+            [ham-fisted.protocols :as hamf-proto]
+            [ham-fisted.defprotocol :refer [defprotocol extend-type extend-protocol]])
   (:import [org.roaringbitmap RoaringBitmap]
            [tech.v3.datatype Buffer]
            [clojure.lang IDeref])
-  (:refer-clojure :exclude [merge]))
+  (:refer-clojure :exclude [merge defprotocol extend-type extend-protocol]))
 
 
 (defprotocol PRowCount
@@ -128,11 +129,7 @@
 
 (extend-type Object
   PDatasetReducer
-  (ds->reducer [this ds] this)
-  (finalize-ds-reduced [this ctx]
-    (if (instance? IDeref ctx)
-      (.deref ^IDeref ctx)
-      ctx)))
+  (ds->reducer [this ds] this))
 
 ;;For large reductions we may want to combine reducers on a single column when
 ;;possible.