Release 10.120

cnuernber · Nov 16, 2024 · cc4630f · cc4630f
1 parent c4fbd8e
commit cc4630f
Show file tree

Hide file tree

Showing 41 changed files with 107 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 10.120
+ * Fixed sub-buffer of indexed buffers throwing exception.
+
 ## 10.114
  * [issue-100](https://github.com/cnuernber/dtype-next/issues/100) - Support latest neanderthal.
 

diff --git a/deps.edn b/deps.edn
@@ -21,7 +21,7 @@
    :exec-fn codox.main/-main
    :exec-args {:group-id "cnuernber"
                :artifact-id "dtype-next"
-               :version "10.119"
+               :version "10.120"
                :name "DType Next"
                :description "High Performance Clojure Primitives"
                :metadata {:doc/format :markdown}

diff --git a/docs/buffered-image.html b/docs/buffered-image.html
diff --git a/docs/cheatsheet.html b/docs/cheatsheet.html
diff --git a/docs/datatype-to-dtype-next.html b/docs/datatype-to-dtype-next.html
diff --git a/docs/dimensions-bytecode-gen.html b/docs/dimensions-bytecode-gen.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/overview.html b/docs/overview.html
diff --git a/docs/tech.v3.datatype.argops.html b/docs/tech.v3.datatype.argops.html
diff --git a/docs/tech.v3.datatype.bitmap.html b/docs/tech.v3.datatype.bitmap.html
diff --git a/docs/tech.v3.datatype.convolve.html b/docs/tech.v3.datatype.convolve.html
diff --git a/docs/tech.v3.datatype.datetime.html b/docs/tech.v3.datatype.datetime.html
diff --git a/docs/tech.v3.datatype.errors.html b/docs/tech.v3.datatype.errors.html
diff --git a/docs/tech.v3.datatype.ffi.clang.html b/docs/tech.v3.datatype.ffi.clang.html
diff --git a/docs/tech.v3.datatype.ffi.graalvm.html b/docs/tech.v3.datatype.ffi.graalvm.html
diff --git a/docs/tech.v3.datatype.ffi.html b/docs/tech.v3.datatype.ffi.html
diff --git a/docs/tech.v3.datatype.ffi.size-t.html b/docs/tech.v3.datatype.ffi.size-t.html
diff --git a/docs/tech.v3.datatype.functional.html b/docs/tech.v3.datatype.functional.html
diff --git a/docs/tech.v3.datatype.gradient.html b/docs/tech.v3.datatype.gradient.html
diff --git a/docs/tech.v3.datatype.html b/docs/tech.v3.datatype.html
diff --git a/docs/tech.v3.datatype.list.html b/docs/tech.v3.datatype.list.html
diff --git a/docs/tech.v3.datatype.mmap-writer.html b/docs/tech.v3.datatype.mmap-writer.html
diff --git a/docs/tech.v3.datatype.mmap.html b/docs/tech.v3.datatype.mmap.html
diff --git a/docs/tech.v3.datatype.native-buffer.html b/docs/tech.v3.datatype.native-buffer.html
diff --git a/docs/tech.v3.datatype.nippy.html b/docs/tech.v3.datatype.nippy.html
diff --git a/docs/tech.v3.datatype.packing.html b/docs/tech.v3.datatype.packing.html
diff --git a/docs/tech.v3.datatype.reductions.html b/docs/tech.v3.datatype.reductions.html
diff --git a/docs/tech.v3.datatype.rolling.html b/docs/tech.v3.datatype.rolling.html
diff --git a/docs/tech.v3.datatype.sampling.html b/docs/tech.v3.datatype.sampling.html
diff --git a/docs/tech.v3.datatype.statistics.html b/docs/tech.v3.datatype.statistics.html
diff --git a/docs/tech.v3.datatype.struct.html b/docs/tech.v3.datatype.struct.html
diff --git a/docs/tech.v3.datatype.wavelet.html b/docs/tech.v3.datatype.wavelet.html
diff --git a/docs/tech.v3.libs.buffered-image.html b/docs/tech.v3.libs.buffered-image.html
diff --git a/docs/tech.v3.parallel.for.html b/docs/tech.v3.parallel.for.html
diff --git a/docs/tech.v3.parallel.queue-iter.html b/docs/tech.v3.parallel.queue-iter.html
diff --git a/docs/tech.v3.tensor.color-gradients.html b/docs/tech.v3.tensor.color-gradients.html
diff --git a/docs/tech.v3.tensor.dimensions.html b/docs/tech.v3.tensor.dimensions.html
diff --git a/docs/tech.v3.tensor.html b/docs/tech.v3.tensor.html
diff --git a/src/tech/v3/datatype.clj b/src/tech/v3/datatype.clj
@@ -500,23 +500,25 @@ user> (dtype/make-reader :float32 5 (* idx 2))
 
 (defn malloc
   "Malloc memory.  If a desired buffer type is needed follow up with set-native-datatype.
+  
+  * n-bytes - the number of bytes to malloc
+  * opts - Either a keyword datatype or an options map.
 
   Options:
 
   * `:resource-type` - defaults to `:gc` - maps to `:track-type` in `tech.v3.resource/track`
      but can also be set to nil in which case the data is not tracked this library will
      not clean it up.
+  * `:datatype` - Datatype - defaults to :int8.  Datatype byte width must evenly divide n-bytes.
   * `:uninitialized?` - do not initialize to zero.  Use for perf in very very rare cases.
   * `:endianness` - Either `:little-endian` or `:big-endian` - defaults to platform.
   * `:log-level` - one of `#{:debug :trace :info :warn :error :fatal}` or nil if no logging
      is desired.  When enabled allocations and frees will be logged in the same manner as
      `tech.jna`."
-  (^{:tag tech.v3.datatype.native_buffer.NativeBuffer} [n-bytes opts]
-  (tech.v3.datatype.native-buffer/malloc n-bytes opts))
+  (^{:tag tech.v3.datatype.native_buffer.NativeBuffer} [n-bytes dtype-or-opts]
+  (tech.v3.datatype.native-buffer/malloc n-bytes dtype-or-opts))
   (^{:tag tech.v3.datatype.native_buffer.NativeBuffer} [n-bytes]
-  (tech.v3.datatype.native-buffer/malloc n-bytes))
-  (^{:tag tech.v3.datatype.native_buffer.NativeBuffer} [n-bytes dtype opts]
-  (tech.v3.datatype.native-buffer/malloc n-bytes dtype opts)))
+  (tech.v3.datatype.native-buffer/malloc n-bytes)))
 
 
 (defn prealloc-list

diff --git a/src/tech/v3/datatype_api.clj b/src/tech/v3/datatype_api.clj
@@ -176,7 +176,7 @@
             (.invokePrim ^IFn$LO read-fn idx))
           (subBuffer [rdr sidx eidx]
             (ChunkedList/sublistCheck sidx eidx n-elems)
-            (make-reader-fn advertised-datatype (- eidx sidx)
+            (make-reader-fn datatype advertised-datatype (- eidx sidx)
                             (reify IFnDef$LO
                               (invokePrim [this idx]
                                 (.invokePrim ^IFn$LO read-fn (+ sidx idx))))))

diff --git a/test/tech/v3/datatype_test.clj b/test/tech/v3/datatype_test.clj
@@ -12,6 +12,7 @@
             [tech.v3.datatype.gradient :as dt-grad]
             [tech.v3.datatype.wavelet]
             [tech.v3.datatype.datetime]
+            [tech.v3.datatype.io-indexed-buffer :as idxbuf]
             [ham-fisted.lazy-noncaching :as lznc]
             [ham-fisted.api :as hamf]
             [ham-fisted.protocols :as hamf-proto]
@@ -867,6 +868,12 @@
   (is (= [false false true true] (dfn/> [1.0 2.0 3.0 4.0] 2))))
 
 
+(deftest indexed-sub-buffer
+  (let [data (vec (range 10))
+        idxbuf (idxbuf/indexed-buffer [2 4 6 8] data)]
+    (is (= [6 8] (dtype/sub-buffer idxbuf 2 2)))))
+
+
 (comment
   (defn bench-sum
     []