fix: Upgrade gpu-mock.js to latest 100% code coverage tested

robertleeplummerjr · robertleeplummerjr · commit 5605504d92aa · 2019-07-11T13:18:33.000-04:00
fix: Added tests for building kernels with "dev" mode
feat: Added a `.toArray()` method on `Input`, for usage with "dev" mode
fix: `Input.size` to reflect exactly what was sent in, rather than make up dimensions that aren't there
fix: `KernelArgument.dimensions` to fill in missing dimensions from size
fix: Only safe declarations when using a literal
diff --git a/dist/gpu-browser-core.js b/dist/gpu-browser-core.js
diff --git a/dist/gpu-browser-core.min.js b/dist/gpu-browser-core.min.js
diff --git a/dist/gpu-browser.js b/dist/gpu-browser.js
diff --git a/dist/gpu-browser.min.js b/dist/gpu-browser.min.js
diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
   "name": "gpu.js",
-  "version": "2.0.0-rc.20",
+  "version": "2.0.0-rc.21",
   "description": "GPU Accelerated JavaScript",
   "engines": {
     "node": ">=10.0.0"
   },
   "main": "./src/index.js",
   "files": [
-    "src", "dist"
+    "src",
+    "dist"
   ],
   "unpkg": "./dist/gpu-browser.min.js",
   "jsdelivr": "./dist/gpu-browser.min.js",
@@ -19,7 +20,7 @@
     "acorn": "^5.1.1",
     "gl": "^4.3.3",
     "gl-wiretap": "^0.6.0",
-    "gpu-mock.js": "^1.0.1"
+    "gpu-mock.js": "^1.1.0"
   },
   "devDependencies": {
     "benchmark": "^2.1.4",
diff --git a/src/backend/web-gl/function-node.js b/src/backend/web-gl/function-node.js
@@ -593,11 +593,19 @@ class WebGLFunctionNode extends FunctionNode {
     if (forNode.init) {
       this.pushState('in-for-loop-init');
       this.astGeneric(forNode.init, initArr);
-      for (let i = 0; i < initArr.length; i++) {
-        if (initArr[i].includes && initArr[i].includes(',')) {
+      const { declarations } = forNode.init;
+      for (let i = 0; i < declarations.length; i++) {
+        if (declarations[i].init && declarations[i].init.type !== 'Literal') {
           isSafe = false;
         }
       }
+      if (isSafe) {
+        for (let i = 0; i < initArr.length; i++) {
+          if (initArr[i].includes && initArr[i].includes(',')) {
+            isSafe = false;
+          }
+        }
+      }
       this.popState('in-for-loop-init');
     } else {
       isSafe = false;
diff --git a/src/backend/web-gl/kernel-value/dynamic-single-input.js b/src/backend/web-gl/kernel-value/dynamic-single-input.js
@@ -11,7 +11,8 @@ class WebGLKernelValueDynamicSingleInput extends WebGLKernelValueSingleInput {
   }
 
   updateValue(value) {
-    this.dimensions = value.size;
+    let [w, h, d] = value.size;
+    this.dimensions = new Int32Array([w || 1, h || 1, d || 1]);
     this.textureSize = utils.getMemoryOptimizedFloatTextureSize(this.dimensions, this.bitRatio);
     this.uploadArrayLength = this.textureSize[0] * this.textureSize[1] * this.bitRatio;
     this.uploadValue = new Float32Array(this.uploadArrayLength);
diff --git a/src/backend/web-gl/kernel-value/dynamic-unsigned-input.js b/src/backend/web-gl/kernel-value/dynamic-unsigned-input.js
@@ -11,7 +11,8 @@ class WebGLKernelValueDynamicUnsignedInput extends WebGLKernelValueUnsignedInput
   }
 
   updateValue(value) {
-    this.dimensions = value.size;
+    let [w, h, d] = value.size;
+    this.dimensions = new Int32Array([w || 1, h || 1, d || 1]);
     this.textureSize = utils.getMemoryOptimizedPackedTextureSize(this.dimensions, this.bitRatio);
     this.uploadArrayLength = this.textureSize[0] * this.textureSize[1] * (4 / this.bitRatio);
     const Type = this.getTransferArrayType(value.value);
diff --git a/src/backend/web-gl/kernel-value/single-input.js b/src/backend/web-gl/kernel-value/single-input.js
@@ -6,7 +6,8 @@ class WebGLKernelValueSingleInput extends WebGLKernelValue {
     super(value, settings);
     this.requestTexture();
     this.bitRatio = 4;
-    this.dimensions = value.size;
+    let [w, h, d] = value.size;
+    this.dimensions = new Int32Array([w || 1, h || 1, d || 1]);
     this.textureSize = utils.getMemoryOptimizedFloatTextureSize(this.dimensions, this.bitRatio);
     this.uploadArrayLength = this.textureSize[0] * this.textureSize[1] * this.bitRatio;
     this.uploadValue = new Float32Array(this.uploadArrayLength);
diff --git a/src/backend/web-gl/kernel-value/unsigned-input.js b/src/backend/web-gl/kernel-value/unsigned-input.js
@@ -6,7 +6,8 @@ class WebGLKernelValueUnsignedInput extends WebGLKernelValue {
     super(value, settings);
     this.requestTexture();
     this.bitRatio = this.getBitRatio(value);
-    this.dimensions = value.size;
+    const [w, h, d] = value.size;
+    this.dimensions = new Int32Array([w || 1, h || 1, d || 1]);
     this.textureSize = utils.getMemoryOptimizedPackedTextureSize(this.dimensions, this.bitRatio);
     this.uploadArrayLength = this.textureSize[0] * this.textureSize[1] * (4 / this.bitRatio);
     this.TranserArrayType = this.getTransferArrayType(value.value);
diff --git a/src/backend/web-gl2/kernel-value/dynamic-single-input.js b/src/backend/web-gl2/kernel-value/dynamic-single-input.js
@@ -11,7 +11,8 @@ class WebGL2KernelValueDynamicSingleInput extends WebGL2KernelValueSingleInput {
   }
 
   updateValue(value) {
-    this.dimensions = value.size;
+    let [w, h, d] = value.size;
+    this.dimensions = new Int32Array([w || 1, h || 1, d || 1]);
     this.textureSize = utils.getMemoryOptimizedFloatTextureSize(this.dimensions, this.bitRatio);
     this.uploadArrayLength = this.textureSize[0] * this.textureSize[1] * this.bitRatio;
     this.uploadValue = new Float32Array(this.uploadArrayLength);
diff --git a/src/gpu.js b/src/gpu.js
@@ -1,4 +1,4 @@
-const gpuMock = require('gpu-mock.js');
+const { gpuMock } = require('gpu-mock.js');
 const { utils } = require('./utils');
 const { CPUKernel } = require('./backend/cpu/kernel');
 const { HeadlessGLKernel } = require('./backend/headless-gl/kernel');
@@ -477,6 +477,7 @@ class GPU {
    * @desc Destroys all memory associated with gpu.js & the webGl if we created it
    */
   destroy() {
+    if (!this.kernels) return;
     // perform on next run loop - for some reason we dont get lose context events
     // if webGl is created and destroyed in the same run loop.
     setTimeout(() => {
diff --git a/src/input.js b/src/input.js
@@ -1,24 +1,45 @@
 class Input {
   constructor(value, size) {
     this.value = value;
-    this.size = new Int32Array(3);
     if (Array.isArray(size)) {
-      for (let i = 0; i < this.size.length; i++) {
-        this.size[i] = size[i] || 1;
-      }
+      this.size = size;
     } else {
+      this.size = new Int32Array(3);
       if (size.z) {
         this.size = new Int32Array([size.x, size.y, size.z]);
       } else if (size.y) {
-        this.size = new Int32Array([size.x, size.y, 1]);
+        this.size = new Int32Array([size.x, size.y]);
       } else {
-        this.size = new Int32Array([size.x, 1, 1]);
+        this.size = new Int32Array([size.x]);
+      }
+    }
+
+    const [w, h, d] = this.size;
+    if (d) {
+      if (this.value.length !== (w * h * d)) {
+        throw new Error(`Input size ${this.value.length} does not match ${w} * ${h} * ${d} = ${(h * w * d)}`);
+      }
+    } else if (h) {
+      if (this.value.length !== (w * h)) {
+        throw new Error(`Input size ${this.value.length} does not match ${w} * ${h} = ${(h * w)}`);
+      }
+    } else {
+      if (this.value.length !== w) {
+        throw new Error(`Input size ${this.value.length} does not match ${w}`);
       }
     }
 
-    const [h, w, d] = this.size;
-    if (this.value.length !== (h * w * d)) {
-      throw new Error(`Input size ${this.value.length} does not match ${w} * ${h} * ${d} = ${(h * w * d)}`);
+  }
+
+  toArray() {
+    const { utils } = require('./utils');
+    const [w, h, d] = this.size;
+    if (d) {
+      return utils.erectMemoryOptimized3DFloat(this.value.subarray ? this.value : new Float32Array(this.value), w, h, d);
+    } else if (h) {
+      return utils.erectMemoryOptimized2DFloat(this.value.subarray ? this.value : new Float32Array(this.value), w, h);
+    } else {
+      return this.value;
     }
   }
 }
diff --git a/test/all.html b/test/all.html
@@ -159,6 +159,7 @@
 <script type="module" src="features/cpu-with-textures.js"></script>
 <script type="module" src="features/create-kernel-map.js"></script>
 <script type="module" src="features/demo.js"></script>
+<script type="module" src="features/dev-mode.js"></script>
 <script type="module" src="features/dynamic-arguments.js"></script>
 <script type="module" src="features/dynamic-output.js"></script>
 <script type="module" src="features/function-return.js"></script>
diff --git a/test/features/dev-mode.js b/test/features/dev-mode.js
@@ -0,0 +1,147 @@
+const { assert, skip, test, module: describe, only } = require('qunit');
+const { GPU, input } = require('../../src');
+
+describe('features: dev mode');
+
+test('works with integer', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value;
+  }, { output: [1] });
+  assert.deepEqual(kernel(1), new Float32Array([1]));
+  gpu.destroy();
+});
+
+test('works with float', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value;
+  }, { output: [1] });
+  assert.deepEqual(kernel(1.5), new Float32Array([1.5]));
+  gpu.destroy();
+});
+
+test('works with array', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.x];
+  }, { output: [4] });
+  assert.deepEqual(kernel([1,2,3,4]), new Float32Array([1,2,3,4]));
+  gpu.destroy();
+});
+
+test('works with matrix', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.y][this.thread.x];
+  }, { output: [4, 2] });
+  assert.deepEqual(kernel(
+    [
+      [1,2,3,4],
+      [5,6,7,8]
+    ]
+  ), [
+    new Float32Array([1,2,3,4]),
+    new Float32Array([5,6,7,8]),
+  ]);
+  gpu.destroy();
+});
+
+test('works with cube', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.z][this.thread.y][this.thread.x];
+  }, { output: [4, 2, 2] });
+  assert.deepEqual(kernel(
+    [
+      [
+        [1,2,3,4],
+        [5,6,7,8]
+      ],
+      [
+        [9,10,11,12],
+        [13,14,15,16]
+      ]
+    ]
+  ), [
+    [
+      new Float32Array([1,2,3,4]),
+      new Float32Array([5,6,7,8]),
+    ],[
+      new Float32Array([9,10,11,12]),
+      new Float32Array([13,14,15,16]),
+    ]
+  ]);
+  gpu.destroy();
+});
+
+test('works with input array', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.x];
+  }, { output: [4] });
+  assert.deepEqual(kernel(input([1,2,3,4], [4])), new Float32Array([1,2,3,4]));
+  gpu.destroy();
+});
+
+test('works with input matrix', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.y][this.thread.x];
+  }, { output: [4, 2] });
+  assert.deepEqual(kernel(input([1,2,3,4,5,6,7,8], [4, 2])), [
+    new Float32Array([1,2,3,4]),
+    new Float32Array([5,6,7,8]),
+  ]);
+  gpu.destroy();
+});
+
+test('works with input cube', () => {
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.z][this.thread.y][this.thread.x];
+  }, { output: [4, 2, 2] });
+  assert.deepEqual(kernel(
+    input([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16], [4,2,2])
+  ), [
+    [
+      new Float32Array([1,2,3,4]),
+      new Float32Array([5,6,7,8]),
+    ],[
+      new Float32Array([9,10,11,12]),
+      new Float32Array([13,14,15,16]),
+    ]
+  ]);
+  gpu.destroy();
+});
+
+test('works with texture', () => {
+  const texture = ((new GPU()).createKernel(function (cube) {
+    return cube[this.thread.z][this.thread.y][this.thread.x];
+  }, { output: [4,2,2], pipeline: true }))([
+    [
+      new Float32Array([1,2,3,4]),
+      new Float32Array([5,6,7,8]),
+    ],[
+      new Float32Array([9,10,11,12]),
+      new Float32Array([13,14,15,16]),
+    ]
+  ]);
+  assert.ok(texture.constructor.name.match('Texture'));
+  const gpu = new GPU({ mode: 'dev' });
+  const kernel = gpu.createKernel(function(value) {
+    return value[this.thread.z][this.thread.y][this.thread.x];
+  }, { output: [4, 2, 2] });
+  assert.deepEqual(kernel(
+    texture
+  ), [
+    [
+      new Float32Array([1,2,3,4]),
+      new Float32Array([5,6,7,8]),
+    ],[
+      new Float32Array([9,10,11,12]),
+      new Float32Array([13,14,15,16]),
+    ]
+  ]);
+  gpu.destroy();
+});
diff --git a/test/features/input.js b/test/features/input.js
@@ -312,3 +312,25 @@ test("inputInt32ArrayX gpu", () => {
 test("inputInt32ArrayX cpu", () => {
   inputInt32ArrayX('cpu');
 });
+
+test('.toArray() with array', () => {
+  assert.deepEqual(input([1,2,3,4], [4]).toArray(), [1,2,3,4]);
+});
+test('.toArray() with matrix', () => {
+  assert.deepEqual(input([1,2,3,4,5,6,7,8], [4,2]).toArray(), [new Float32Array([1,2,3,4]), new Float32Array([5,6,7,8])]);
+});
+test('.toArray() with grid', () => {
+  assert.deepEqual(
+    input([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16], [4,2,2]).toArray(),
+    [
+      [
+        new Float32Array([1,2,3,4]),
+        new Float32Array([5,6,7,8]),
+      ],
+      [
+        new Float32Array([9,10,11,12]),
+        new Float32Array([13,14,15,16])
+      ]
+    ]
+  );
+});
diff --git a/test/internal/math.random.js b/test/internal/math.random.js
@@ -83,22 +83,22 @@ test('never above 1 every time auto', () => {
   mathRandomNeverAboveOne();
 });
 
-test('never above 1 every time  gpu', () => {
+test('never above 1 every time gpu', () => {
   mathRandomNeverAboveOne('gpu');
 });
 
-(GPU.isWebGLSupported ? test : skip)('never above 1 every time  webgl', () => {
+(GPU.isWebGLSupported ? test : skip)('never above 1 every time webgl', () => {
   mathRandomNeverAboveOne('webgl');
 });
 
-(GPU.isWebGL2Supported ? test : skip)('never above 1 every time  webgl2', () => {
+(GPU.isWebGL2Supported ? test : skip)('never above 1 every time webgl2', () => {
   mathRandomNeverAboveOne('webgl2');
 });
 
-(GPU.isHeadlessGLSupported ? test : skip)('never above 1 every time  headlessgl', () => {
+(GPU.isHeadlessGLSupported ? test : skip)('never above 1 every time headlessgl', () => {
   mathRandomNeverAboveOne('headlessgl');
 });
 
-test('never above 1 every time  cpu', () => {
+test('never above 1 every time cpu', () => {
   mathRandomNeverAboveOne('cpu');
 });

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ class WebGLKernelValueDynamicSingleInput extends WebGLKernelValueSingleInput {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`updateValue(value) {`
`14`		`- this.dimensions = value.size;`
	`14`	`+ let [w, h, d] = value.size;`
	`15`	`+ this.dimensions = new Int32Array([w \|\| 1, h \|\| 1, d \|\| 1]);`
`15`	`16`	`this.textureSize = utils.getMemoryOptimizedFloatTextureSize(this.dimensions, this.bitRatio);`
`16`	`17`	`this.uploadArrayLength = this.textureSize[0] * this.textureSize[1] * this.bitRatio;`
`17`	`18`	`this.uploadValue = new Float32Array(this.uploadArrayLength);`