webgpu-computed 0.0.17 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgpu-computed",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "对webgpu的封装，处理了繁琐的前置工作，只关注wgsl本身逻辑",
   "main": "./src/index.js",
   "scripts": {

package/src/index.js

@@ -40,8 +40,8 @@ function U(f) {
   const e = Object.keys(f), r = e.map((c) => {
     const l = f[c];
     if (Array.isArray(l)) {
-      for (const d of ["vec2", "vec3", "vec4", "mat3x3", "mat4x4"])
-        if ($[d] === l.length) return d;
+      for (const y of ["vec2", "vec3", "vec4", "mat3x3", "mat4x4"])
+        if ($[y] === l.length) return y;
       throw new Error(`${c} 不支持的数组长度 ${l.length}`);
     }
     if (typeof l == "number") return "f32";
@@ -50,15 +50,15 @@ function U(f) {
   if (e.length !== r.length) throw new Error("keys 与 types 长度不一致");
   let s = 0;
   const u = e.map((c, l) => {
-    const d = r[l];
-    s += _(s, d);
+    const y = r[l];
+    s += _(s, y);
     const a = {
       name: c,
-      type: d,
+      type: y,
       offset: s,
-      size: $[d]
+      size: $[y]
     };
-    return s += $[d], a;
+    return s += $[y], a;
   }), t = Math.max(...r.map((c) => E[c]));
   return {
     stride: s + (t - s % t) % t,
@@ -111,7 +111,7 @@ class T {
       r(t.layout);
       const n = t.layout[t.layout.length - 1], c = n.offset + n.size;
       let l = 1;
-      for (const d of t.layout) l = Math.max(l, E[d.type]);
+      for (const y of t.layout) l = Math.max(l, E[y.type]);
       t.stride = P(c, l);
     };
     Object.keys(e).forEach((t) => {
@@ -133,9 +133,9 @@ class T {
     if (!this.template) throw new Error("初始化计算管线错误，未找到可用数据模版");
     await T.init();
     const e = this.template, { device: r } = await this.getDevice(), s = [], u = [], t = [];
-    this.device = r, Object.keys(e).forEach((i, y) => {
+    this.device = r, Object.keys(e).forEach((i, d) => {
       if (t.push({
-        binding: y,
+        binding: d,
         // 绑定到组里的0号位插槽
         visibility: GPUShaderStage.COMPUTE,
         // 数据在哪些阶段可以使用, 计算着色器、片元着色器、顶点着色器
@@ -144,20 +144,20 @@ class T {
         }
       }), m(e[i])) {
         const g = e[i], h = g.map((b) => `${b.name}:${b.type === "f32" ? "f32" : b.type + "<f32>"}`).join(","), v = `${S(i)}Struct`;
-        s.push(`struct ${S(i)}Struct {${h}};`), u.push(`@group(0) @binding(${y}) var<storage, read_write> ${i}: ${v};`);
+        s.push(`struct ${S(i)}Struct {${h}};`), u.push(`@group(0) @binding(${d}) var<storage, read_write> ${i}: ${v};`);
       } else if (B(e[i])) {
         const g = e[i], h = g.layout.map((b) => `${b.name}:${b.type === "f32" ? "f32" : b.type + "<f32>"}`).join(","), v = `${S(i)}Struct`;
-        s.push(`struct ${v} {${h}};`), u.push(`@group(0) @binding(${y}) var<storage, read_write> ${i}: array<${v}>;`);
+        s.push(`struct ${v} {${h}};`), u.push(`@group(0) @binding(${d}) var<storage, read_write> ${i}: array<${v}>;`);
       } else if (ArrayBuffer.isView(e[i]) && !(e[i] instanceof DataView)) {
         const g = e[i], h = q(g);
-        g instanceof D ? u.push(`@group(0) @binding(${y}) var<storage, read_write> ${i}: array<atomic<${h}>>;`) : u.push(`@group(0) @binding(${y}) var<storage, read_write> ${i}: array<${h}>;`);
+        g instanceof D ? u.push(`@group(0) @binding(${d}) var<storage, read_write> ${i}: array<atomic<${h}>>;`) : u.push(`@group(0) @binding(${d}) var<storage, read_write> ${i}: array<${h}>;`);
       }
     });
     const {
       beforeCodes: n = [],
       workgroupSize: c = [32, 1, 1],
       globalInvocationIdName: l = "grid",
-      workgroupIndexName: d = "index",
+      workgroupIndexName: y = "index",
       code: a = ""
     } = this.option ?? {}, o = (
       /*wgsl*/
@@ -168,7 +168,7 @@ ${u.join("")}
 
             @compute @workgroup_size(${c.join(",")})
             fn main(@builtin(global_invocation_id) ${l}: vec3<u32>) {
-                var ${d} = ${l}.x;
+                var ${y} = ${l}.x;
                 ${a}
             }
         `
@@ -200,23 +200,23 @@ ${u.join("")}
     function c(a, o, p = 0, i) {
       if (ArrayBuffer.isView(a) || Array.isArray(a)) return a;
       if (!i) {
-        const y = o[o.length - 1], g = y.offset + y.size;
+        const d = o[o.length - 1], g = d.offset + d.size;
         let h = 1;
         for (const v of o) h = Math.max(h, E[v.type]);
         i = i ?? new Float32Array(P(g, h)).fill(0);
       }
-      return o.forEach((y) => {
-        let g = a[y.name];
+      return o.forEach((d) => {
+        let g = a[d.name];
         Array.isArray(g) || (g = [g]);
-        for (let h = 0; h < y.size; h++)
-          i[p + y.offset + h] = Number(g[h] ?? 0);
+        for (let h = 0; h < d.size; h++)
+          i[p + d.offset + h] = Number(g[h] ?? 0);
       }), i;
     }
     function l(a, o) {
       if (ArrayBuffer.isView(a) || typeof a[0] == "number") return a;
       const p = new Float32Array(o.stride * a.length).fill(0);
-      return a.forEach((i, y) => {
-        const g = y * o.stride;
+      return a.forEach((i, d) => {
+        const g = d * o.stride;
         c(i, o.layout, g, p);
       }), p;
     }
@@ -229,13 +229,13 @@ ${u.join("")}
       const o = u[a], p = e[a];
       let i = [];
       m(o) ? i = c(p, o) : B(o) ? i = l(p, o) : (Array.isArray(p) || ArrayBuffer.isView(p)) && (i = p);
-      let y = null;
-      if (o instanceof Float32Array ? y = new Float32Array(i) : o instanceof Uint32Array ? y = new Uint32Array(i) : o instanceof Int32Array ? y = new Int32Array(i) : y = new Float32Array(i), !y) throw new Error("不支持的数组类型" + o);
+      let d = null;
+      if (o instanceof Float32Array ? d = new Float32Array(i) : o instanceof Uint32Array ? d = new Uint32Array(i) : o instanceof Int32Array ? d = new Int32Array(i) : d = new Float32Array(i), !d) throw new Error("不支持的数组类型" + o);
       const g = s.createBuffer({
-        size: y.byteLength,
+        size: d.byteLength,
         usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.COPY_SRC | GPUBufferUsage.STORAGE
       });
-      s.queue.writeBuffer(g, 0, y), t.push({ name: a, buffer: g });
+      s.queue.writeBuffer(g, 0, d), t.push({ name: a, buffer: g });
     }), {
       group: s.createBindGroup({
         layout: this.groupLayout,
@@ -257,9 +257,9 @@ ${u.join("")}
       const s = this.template[r], u = e.length / s.stride, t = [];
       for (let n = 0; n < u; n++) {
         const c = n * s.stride, l = {};
-        s.layout.forEach((d) => {
-          const a = e.slice(c + d.offset, c + d.offset + d.size);
-          l[d.name] = a.length === 1 ? a[0] : a;
+        s.layout.forEach((y) => {
+          const a = e.slice(c + y.offset, c + y.offset + y.size);
+          l[y.name] = a.length === 1 ? a[0] : [...a];
         }), t.push(l);
       }
       return t;
@@ -268,7 +268,7 @@ ${u.join("")}
       const s = this.template[r], u = {};
       return s.forEach((t) => {
         const n = e.slice(t.offset, t.offset + t.size);
-        u[t.name] = n.length === 1 ? n[0] : n;
+        u[t.name] = n.length === 1 ? n[0] : [...n];
       }), u;
     }
     return e;
@@ -293,17 +293,15 @@ ${u.join("")}
       }
     }).filter((o) => !!o);
     u.queue.submit([n.finish()]), await u.queue.onSubmittedWorkDone();
-    const d = /* @__PURE__ */ new Map();
+    const y = /* @__PURE__ */ new Map();
     return await Promise.all(
       l.map(async (o) => {
         await o.buffer.mapAsync(GPUMapMode.READ);
         const p = o.buffer.getMappedRange();
         let i = null;
-        this.template[o.name] instanceof Float32Array ? i = new Float32Array(p) : this.template[o.name] instanceof Uint32Array ? i = new Uint32Array(p) : this.template[o.name] instanceof Int32Array ? i = new Int32Array(p) : i = new Float32Array(p);
-        const y = [...i];
-        d.set(o.name, y);
+        this.template[o.name] instanceof Float32Array ? i = new Float32Array(p) : this.template[o.name] instanceof Uint32Array ? i = new Uint32Array(p) : this.template[o.name] instanceof Int32Array ? i = new Int32Array(p) : i = new Float32Array(p), y.set(o.name, i);
       })
-    ), s.map((o) => d.get(o));
+    ), s.map((o) => y.get(o));
   }
   /** 初始化gpu设备
    * @returns 
@@ -359,8 +357,8 @@ ${u.join("")}
    */
   static async computed(e) {
     let { data: r, map: s = !1, workgroupCount: u, synchronize: t, onSuccess: n, ...c } = e;
-    const l = await this.fromByData({ data: r, ...c }), d = l.createBindGroup(r), a = await l.computed(d, u, t);
-    return n && n({ gpuComputed: l, group: d, results: a }), s ? a.map((o, p) => l.dataMap(o, t[p])) : a;
+    const l = await this.fromByData({ data: r, ...c }), y = l.createBindGroup(r), a = await l.computed(y, u, t);
+    return n && n({ gpuComputed: l, group: y, results: a }), s ? a.map((o, p) => l.dataMap(o, t[p])) : a;
   }
 }
 const M = (

package/src/utils/GpuComputed.d.ts

@@ -74,14 +74,14 @@ export declare class GpuComputed {
      * @param array
      * @param key
      */
-    dataMap(array: number[], key: string): number[] | Record<string, number | number[]> | Record<string, number | number[]>[];
+    dataMap(array: Float32Array | Uint32Array | Int32Array, key: string): Float32Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint32Array<ArrayBufferLike> | Record<string, number | number[]> | Record<string, number | number[]>[];
     /** 开始计算
      * @param group 数据组
      * @param workgroupCount 工作组大小
      * @param synchronize 需要同步的数据字段
      * @returns
      */
-    computed(group: BufferGroup, workgroupCount: [number, number?, number?], synchronize?: string[]): Promise<number[][]>;
+    computed(group: BufferGroup, workgroupCount: [number, number?, number?], synchronize?: string[]): Promise<(Float32Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint32Array<ArrayBufferLike>)[]>;
     /** 初始化gpu设备
      * @returns
      */
@@ -112,8 +112,8 @@ export declare class GpuComputed {
         onSuccess?: (opt: {
             gpuComputed: GpuComputed;
             group: BufferGroup;
-            results: number[][];
+            results: (Float32Array | Uint32Array | Int32Array)[];
         }) => void;
-    } & GpuComputedOption): Promise<(number[] | Record<string, number | number[]> | Record<string, number | number[]>[])[]>;
+    } & GpuComputedOption): Promise<(Float32Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint32Array<ArrayBufferLike> | Record<string, number | number[]> | Record<string, number | number[]>[])[]>;
 }
 export {};