test runner now inserts WebCLGL into runtime when running tests under nodewebkit.

hartsantler · hartsantler · commit 67c786d25f85 · 2014-06-14T20:05:43.000-07:00
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -234,16 +234,19 @@ def _visit_function(self, node):
 				lines.append('function %s( %s, __offset ) {' %(glsl_wrapper_name, ','.join(args)) )
 				lines.append('	__offset =  __offset || 0')  ## note by default: 0 allows 0-1.0
 				lines.append('  var __webclgl = new WebCLGL()')
-				lines.append('  var __kernel = __webclgl.createKernel( __shader__ );')
+				lines.append('  var __kernel = __webclgl.createKernel( "\\n".join(__shader__) );')
+				lines.append('  var __return_length = 1')
 
-				lines.append('  var return_buffer = __webclgl.createBuffer(1, "FLOAT", __offset)')  ## TODO length of return buffer
 				for i,arg in enumerate(args):
 					lines.append('  if (%s instanceof Array) {' %arg)
+					lines.append('    __return_length = %s.length' %arg)
 					lines.append('    var %s_buffer = __webclgl.createBuffer(%s.length, "FLOAT", __offset)' %(arg,arg))
 					lines.append('    __webclgl.enqueueWriteBuffer(%s_buffer, %s)' %(arg, arg))
 					lines.append('  __kernel.setKernelArg(%s, %s_buffer)' %(i, arg))
 					lines.append('  } else { __kernel.setKernelArg(%s, %s) }' %(i, arg))
 
+				lines.append('  var return_buffer = __webclgl.createBuffer(__return_length, "FLOAT", __offset)')
+
 				lines.append('	__kernel.compile()')
 				lines.append('	__webclgl.enqueueNDRangeKernel(__kernel, return_buffer)')
 				lines.append('	return __webclgl.enqueueReadBuffer_Float( return_buffer )')
@@ -430,7 +433,7 @@ def inline_helper_return_id(self, return_id):
 		return "var __returns__%s = null;"%return_id
 
 	def _visit_call_helper_numpy_array(self, node):
-		raise NotImplementedError('TODO numpy.array')
+		#raise NotImplementedError('TODO numpy.array')
 		return self.visit(node.args[0])  ## TODO typed arrays
 
 	def _visit_call_helper_list(self, node):
diff --git a/regtests/run.py b/regtests/run.py
@@ -138,11 +138,13 @@ def run_old_pypy_test_on(filename):
     pypy_runnable = True
     pypy_exe = 'pypy'
 
-if os.path.isfile( os.path.expanduser('~/pypy-1.9/bin/pypy') ):
+if os.path.isfile( os.path.expanduser('~/pypy-1.9/bin/pypy') ) and '--old-pypy' in sys.argv:
     old_pypy_runnable = True
     old_pypy_exe = os.path.expanduser('~/pypy-1.9/bin/pypy')
 
-
+webclgl = None
+if os.path.isfile( os.path.expanduser('~/webclgl/WebCLGL_2.0.Min.class.js') ):
+    webclgl = open( os.path.expanduser('~/webclgl/WebCLGL_2.0.Min.class.js'), 'rb').read().decode('utf-8')
 
 ## rhino is not run by default because it simply freezes up on maximum callstack errors
 rhino_runnable = '--rhino' in sys.argv and runnable("rhino -e 'quit()'")
@@ -631,7 +633,19 @@ def run_js_nodewebkit(content):
         "main()",
         "__nw.App.quit()"
     ]
-    write("/tmp/test.html", '<html><script>%s</script></html>' %'\n'.join(lines))
+
+    html = ['<html>']
+    if webclgl:
+        html.append('<script>')
+        html.append( webclgl )
+        html.append('</script>')
+
+    html.append('<script>')
+    html.extend( lines )
+    html.append('</script>')
+
+    html.append('</html>')
+    write("/tmp/test.html", '\n'.join(html))
 
     #write("%s.js" % tmpname, '\n'.join(lines))
     #return run_command("node %s.js" % tmpname)
