@thi.ng/tensors 0.10.14 → 0.11.2

package/tensor.d.ts

@@ -1,5 +1,5 @@
 import type { NumericArray } from "@thi.ng/api";
-import type { ITensor, ITensorStorage, Nested, NestedTensor, NumType, Shape, ShapeTensor, TensorCtor, TensorData, TensorFromArrayOpts, TensorOpts, Type, TypeMap } from "./api.js";
+import type { ITensor, ITensor0, ITensor1, ITensor2, ITensor3, ITensor4, ITensorStorage, Nested, NestedTensor, NumType, Shape, ShapeTensor, TensorCtor, TensorData, TensorFromArrayOpts, TensorOpts, Type, TypeMap } from "./api.js";
 export declare abstract class ATensor<T = number> implements ITensor<T> {
     type: Type;
     storage: ITensorStorage<T>;
@@ -8,12 +8,13 @@ export declare abstract class ATensor<T = number> implements ITensor<T> {
     stride: number[];
     offset: number;
     constructor(type: Type, storage: ITensorStorage<T>, data: TensorData<T>, shape: number[], stride: number[], offset?: number);
+    protected _n: number;
     abstract get dim(): number;
     abstract get length(): number;
     get order(): number[];
     get orderedShape(): number[];
     get orderedStride(): number[];
-    abstract [Symbol.iterator](): IterableIterator<T>;
+    [Symbol.iterator](): IterableIterator<T>;
     broadcast<S extends Shape>(shape: S, stride: S): ShapeTensor<S, T>;
     copy(): typeof this;
     empty(storage?: ITensorStorage<T>): typeof this;
@@ -23,7 +24,9 @@ export declare abstract class ATensor<T = number> implements ITensor<T> {
     release(): boolean;
     equiv(o: any): boolean;
     eqDelta(o: ITensor<T>, eps?: number): boolean;
+    fill(value: T): this;
     abstract index(pos: NumericArray): number;
+    abstract indices(): IterableIterator<number>;
     position(index: number): number[];
     abstract get(pos: NumericArray): T;
     abstract set(pos: NumericArray, v: T): this;
@@ -43,12 +46,13 @@ export declare abstract class ATensor<T = number> implements ITensor<T> {
         stride: number[];
     };
 }
-export declare class Tensor0<T = number> extends ATensor<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-    get dim(): number;
+export declare class Tensor0<T = number> extends ATensor<T> implements ITensor0<T> {
+    get dim(): 0;
     get order(): number[];
     get length(): number;
+    fill(x: T): this;
     index(): number;
+    indices(): Generator<number, void, unknown>;
     position(): number[];
     get(): T;
     set(_: NumericArray, v: T): this;
@@ -57,12 +61,12 @@ export declare class Tensor0<T = number> extends ATensor<T> {
     transpose(_: number[]): this;
     toString(): string;
 }
-export declare class Tensor1<T = number> extends ATensor<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-    get dim(): number;
+export declare class Tensor1<T = number> extends ATensor<T> implements ITensor1<T> {
+    get dim(): 1;
     get order(): number[];
     get length(): number;
     index([x]: NumericArray): number;
+    indices(): Generator<number, void, unknown>;
     position(index: number): number[];
     get([x]: NumericArray): T;
     set([x]: NumericArray, v: T): this;
@@ -71,35 +75,32 @@ export declare class Tensor1<T = number> extends ATensor<T> {
     transpose(_: number[]): this;
     toString(): string;
 }
-export declare class Tensor2<T = number> extends ATensor<T> {
-    protected _n: number;
-    [Symbol.iterator](): Generator<T, void, unknown>;
+export declare class Tensor2<T = number> extends ATensor<T> implements ITensor2<T> {
     get length(): number;
-    get dim(): number;
+    get dim(): 2;
     get order(): number[];
     index(pos: NumericArray): number;
+    indices(): Generator<number, void, unknown>;
     get(pos: NumericArray): T;
     set(pos: NumericArray, v: T): this;
     resize<S extends Shape>(newShape: S, fill?: T, storage?: ITensorStorage<T>): ShapeTensor<S, T>;
     toString(): string;
 }
-export declare class Tensor3<T = number> extends ATensor<T> {
-    protected _n: number;
-    [Symbol.iterator](): Generator<T, void, unknown>;
+export declare class Tensor3<T = number> extends ATensor<T> implements ITensor3<T> {
     get length(): number;
-    get dim(): number;
+    get dim(): 3;
     index(pos: NumericArray): number;
+    indices(): Generator<number, void, unknown>;
     get(pos: NumericArray): T;
     set(pos: NumericArray, v: T): this;
     resize<S extends Shape>(newShape: S, fill?: T, storage?: ITensorStorage<T>): ShapeTensor<S, T>;
     toString(): string;
 }
-export declare class Tensor4<T = number> extends ATensor<T> {
-    protected _n: number;
-    [Symbol.iterator](): Generator<T, void, unknown>;
+export declare class Tensor4<T = number> extends ATensor<T> implements ITensor4<T> {
     get length(): number;
-    get dim(): number;
+    get dim(): 4;
     index(pos: NumericArray): number;
+    indices(): Generator<number, void, unknown>;
     get(pos: NumericArray): T;
     set(pos: NumericArray, v: T): this;
     resize<S extends Shape>(newShape: S, fill?: T, storage?: ITensorStorage<T>): ShapeTensor<S, T>;

package/tensor.js

@@ -20,6 +20,7 @@ class ATensor {
     this.stride = stride;
     this.offset = offset;
   }
+  _n;
   get order() {
     return strideOrder(this.stride);
   }
@@ -29,6 +30,10 @@ class ATensor {
   get orderedStride() {
     return swizzle(this.order)(this.stride);
   }
+  *[Symbol.iterator]() {
+    const { data } = this;
+    for (let i of this.indices()) yield data[i];
+  }
   broadcast(shape, stride) {
     return new TENSOR_IMPLS[shape.length](
       this.type,
@@ -70,6 +75,11 @@ class ATensor {
   eqDelta(o, eps = 1e-6) {
     return this === o || equiv(this.shape, o.shape) && _eqDelta([...this], [...o], this.length, eps);
   }
+  fill(value) {
+    const { data } = this;
+    for (let i of this.indices()) data[i] = value;
+    return this;
+  }
   position(index) {
     const { order, stride } = this;
     index |= 0;
@@ -174,9 +184,6 @@ class ATensor {
   }
 }
 class Tensor0 extends ATensor {
-  *[Symbol.iterator]() {
-    yield this.data[this.offset];
-  }
   get dim() {
     return 0;
   }
@@ -186,9 +193,16 @@ class Tensor0 extends ATensor {
   get length() {
     return 1;
   }
+  fill(x) {
+    this.data[this.offset] = x;
+    return this;
+  }
   index() {
     return this.offset;
   }
+  *indices() {
+    yield this.offset;
+  }
   position() {
     return [0];
   }
@@ -229,15 +243,6 @@ class Tensor0 extends ATensor {
   }
 }
 class Tensor1 extends ATensor {
-  *[Symbol.iterator]() {
-    let {
-      data,
-      shape: [sx],
-      stride: [tx],
-      offset
-    } = this;
-    for (; sx-- > 0; offset += tx) yield data[offset];
-  }
   get dim() {
     return 1;
   }
@@ -250,6 +255,14 @@ class Tensor1 extends ATensor {
   index([x]) {
     return this.offset + x * this.stride[0];
   }
+  *indices() {
+    let {
+      shape: [sx],
+      stride: [tx],
+      offset
+    } = this;
+    for (; sx-- > 0; offset += tx) yield offset;
+  }
   position(index) {
     return [~~(((index | 0) - this.offset) / this.stride[0])];
   }
@@ -300,22 +313,8 @@ class Tensor1 extends ATensor {
   }
 }
 class Tensor2 extends ATensor {
-  _n;
-  *[Symbol.iterator]() {
-    const {
-      data,
-      shape: [sx, sy],
-      stride: [tx, ty]
-    } = this;
-    let ox, x, y;
-    for (ox = this.offset, x = 0; x < sx; x++, ox += tx) {
-      for (y = 0; y < sy; y++) {
-        yield data[ox + y * ty];
-      }
-    }
-  }
   get length() {
-    return this._n || (this._n = product2(this.shape));
+    return this._n ?? (this._n = product2(this.shape));
   }
   get dim() {
     return 2;
@@ -326,6 +325,18 @@ class Tensor2 extends ATensor {
   index(pos) {
     return this.offset + dot2(pos, this.stride);
   }
+  *indices() {
+    const {
+      shape: [sx, sy],
+      stride: [tx, ty]
+    } = this;
+    let ox, x, y;
+    for (ox = this.offset, x = 0; x < sx; x++, ox += tx) {
+      for (y = 0; y < sy; y++) {
+        yield ox + y * ty;
+      }
+    }
+  }
   get(pos) {
     return this.data[this.offset + dot2(pos, this.stride)];
   }
@@ -364,10 +375,17 @@ class Tensor2 extends ATensor {
   }
 }
 class Tensor3 extends ATensor {
-  _n;
-  *[Symbol.iterator]() {
+  get length() {
+    return this._n ?? (this._n = product3(this.shape));
+  }
+  get dim() {
+    return 3;
+  }
+  index(pos) {
+    return this.offset + dot3(pos, this.stride);
+  }
+  *indices() {
     const {
-      data,
       shape: [sx, sy, sz],
       stride: [tx, ty, tz]
     } = this;
@@ -375,20 +393,11 @@ class Tensor3 extends ATensor {
     for (ox = this.offset, x = 0; x < sx; x++, ox += tx) {
       for (oy = ox, y = 0; y < sy; y++, oy += ty) {
         for (z = 0; z < sz; z++) {
-          yield data[oy + z * tz];
+          yield oy + z * tz;
         }
       }
     }
   }
-  get length() {
-    return this._n || (this._n = product3(this.shape));
-  }
-  get dim() {
-    return 3;
-  }
-  index(pos) {
-    return this.offset + dot3(pos, this.stride);
-  }
   get(pos) {
     return this.data[this.offset + dot3(pos, this.stride)];
   }
@@ -429,10 +438,17 @@ class Tensor3 extends ATensor {
   }
 }
 class Tensor4 extends ATensor {
-  _n;
-  *[Symbol.iterator]() {
+  get length() {
+    return this._n ?? (this._n = product4(this.shape));
+  }
+  get dim() {
+    return 4;
+  }
+  index(pos) {
+    return this.offset + dot4(pos, this.stride);
+  }
+  *indices() {
     const {
-      data,
       shape: [sx, sy, sz, sw],
       stride: [tx, ty, tz, tw],
       offset
@@ -442,21 +458,12 @@ class Tensor4 extends ATensor {
       for (oy = ox, y = 0; y < sy; y++, oy += ty) {
         for (oz = oy, z = 0; z < sz; z++, oz += tz) {
           for (w = 0; w < sw; w++) {
-            yield data[oz + w * tw];
+            yield oz + w * tw;
           }
         }
       }
     }
   }
-  get length() {
-    return this._n || (this._n = product4(this.shape));
-  }
-  get dim() {
-    return 4;
-  }
-  index(pos) {
-    return this.offset + dot4(pos, this.stride);
-  }
   get(pos) {
     return this.data[this.offset + dot4(pos, this.stride)];
   }