Merge pull request #266 from gpujs/259-intercept-atan2

fix #259 by handling when atan2 is used directly in the interpreter
gpujs · Feb 27, 2018 · 8a88552 · 8a88552
2 parents 225946b + 01299be
commit 8a88552
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 8 deletions.
diff --git a/bin/gpu-core.js b/bin/gpu-core.js
@@ -5,7 +5,7 @@
  * GPU Accelerated JavaScript
  *
  * @version 1.0.1
- * @date Sun Feb 25 2018 19:14:46 GMT-0500 (EST)
+ * @date Tue Feb 27 2018 13:04:39 GMT-0500 (EST)
  *
  * @license MIT
  * The MIT License

diff --git a/bin/gpu-core.min.js b/bin/gpu-core.min.js
diff --git a/bin/gpu.js b/bin/gpu.js
@@ -5,7 +5,7 @@
  * GPU Accelerated JavaScript
  *
  * @version 1.0.1
- * @date Sun Feb 25 2018 19:14:47 GMT-0500 (EST)
+ * @date Tue Feb 27 2018 13:04:40 GMT-0500 (EST)
  *
  * @license MIT
  * The MIT License
@@ -2634,6 +2634,10 @@ module.exports = function (_FunctionNodeBase) {
 					funcName = funcName.slice(localPrefix.length);
 				}
 
+				if (funcName === 'atan2') {
+					funcName = 'atan';
+				}
+
 				if (funcParam.calledFunctions.indexOf(funcName) < 0) {
 					funcParam.calledFunctions.push(funcName);
 				}

diff --git a/bin/gpu.min.js b/bin/gpu.min.js
diff --git a/dist/backend/web-gl/function-node.js b/dist/backend/web-gl/function-node.js
@@ -1040,6 +1040,11 @@ module.exports = function (_FunctionNodeBase) {
 					funcName = funcName.slice(localPrefix.length);
 				}
 
+				// if this if grows to more than one, lets use a switch
+				if (funcName === 'atan2') {
+					funcName = 'atan';
+				}
+
 				// Register the function into the called registry
 				if (funcParam.calledFunctions.indexOf(funcName) < 0) {
 					funcParam.calledFunctions.push(funcName);

diff --git a/src/backend/web-gl/function-node.js b/src/backend/web-gl/function-node.js
@@ -995,6 +995,11 @@ module.exports = class WebGLFunctionNode extends FunctionNodeBase {
 				funcName = funcName.slice(localPrefix.length);
 			}
 
+			// if this if grows to more than one, lets use a switch
+			if (funcName === 'atan2') {
+				funcName = 'atan';
+			}
+
 			// Register the function into the called registry
 			if (funcParam.calledFunctions.indexOf(funcName) < 0) {
 				funcParam.calledFunctions.push(funcName);

diff --git a/test/html/issues/259-atan2.html b/test/html/issues/259-atan2.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>GPU.JS: createKernelMap with floatOutput</title>
+  <link rel="stylesheet" href="../../../node_modules/qunitjs/qunit/qunit.css">
+
+  <!-- gpu.js scripts -->
+  <script src="../../../bin/gpu.js"></script>
+</head>
+<body>
+<div id="qunit"></div>
+<div id="qunit-fixture"></div>
+<script src="../../../node_modules/qunitjs/qunit/qunit.js"></script>
+<script src="../../src/issues/259.js"></script>
+</body>
+</html>
diff --git a/test/html/test-all.html b/test/html/test-all.html
@@ -54,6 +54,7 @@
   <script src="../src/issues/207-same-function-reuse.js"></script>
 	<script src="../src/issues/212-funky-function-support.js"></script>
   <script src="../src/issues/233-kernel-map-float-output.js"></script>
+  <script src="../src/issues/259-atan2.js"></script>
   <script src="../src/issues/263-to-string.js"></script>
 </body>
 </html>
diff --git a/test/src/issues/259-atan2.js b/test/src/issues/259-atan2.js
@@ -0,0 +1,21 @@
+function buildAtan2KernelResult(mode) {
+  const gpu = new GPU({ mode });
+  const kernel = gpu.createKernel(function() {
+    return Math.atan2(1, 2);
+  }, {
+    output: [1]
+  });
+  return kernel();
+}
+
+QUnit.test('Issue #259 atan2 - auto', () => {
+  QUnit.assert.equal(buildAtan2KernelResult()[0].toFixed(7), 0.4636476);
+});
+
+QUnit.test('Issue #259 atan2 - gpu', () => {
+  QUnit.assert.equal(buildAtan2KernelResult('gpu')[0].toFixed(7), 0.4636476);
+});
+
+QUnit.test('Issue #259 atan2 - cpu', () => {
+  QUnit.assert.equal(buildAtan2KernelResult('cpu')[0].toFixed(7), 0.4636476);
+});