working prototype of SIMD float32x4 using dart backend.

hartsantler · hartsantler · commit c08bda9aef6a · 2014-06-12T22:53:03.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -343,6 +343,8 @@ def visit_Import(self, node):
 				pass  ## pythonjs/fakelibs/sys.py
 			elif alias.name == 'subprocess':
 				pass  ## pythonjs/fakelibs/subprocess.py
+			elif alias.name == 'numpy':
+				pass
 
 			elif alias.name == 'json' or alias.name == 'os':
 				pass  ## part of builtins.py
@@ -1911,7 +1913,15 @@ def visit_Call(self, node):
 			return '__js_typed_array(%s)' %','.join(args)
 
 		#########################################
-		if isinstance(node.func, ast.Attribute) and isinstance(node.func.value, Name) and node.func.value.id == 'pythonjs' and node.func.attr == 'configure':
+		if isinstance(node.func, ast.Attribute) and isinstance(node.func.value, Name) and node.func.value.id == 'numpy' and node.func.attr == 'array':
+			args = [self.visit(arg) for arg in node.args]
+			if node.keywords:
+				kwargs = [ '%s=%s' %(x.arg, self.visit(x.value)) for x in node.keywords]
+				return 'numpy.array(%s, %s)' %( ','.join(args), ','.join(kwargs) )
+			else:
+				return 'numpy.array(%s)' %','.join(args)
+
+		elif isinstance(node.func, ast.Attribute) and isinstance(node.func.value, Name) and node.func.value.id == 'pythonjs' and node.func.attr == 'configure':
 			for kw in node.keywords:
 				if kw.arg == 'javascript':
 					if kw.value.id == 'True':
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -297,6 +297,9 @@ def visit_Call(self, node):
 			else:
 				raise SyntaxError( args )
 
+		elif name == 'numpy.array':
+			return self._visit_call_helper_numpy_array(node)
+
 		elif name == 'JSObject':
 			return self._visit_call_helper_JSObject( node )
 
@@ -345,6 +348,8 @@ def inline_helper_remap_names(self, remap):
 	def inline_helper_return_id(self, return_id):
 		return "var __returns__%s = null;"%return_id
 
+	def _visit_call_helper_numpy_array(self, node):
+		return self.visit(node.args[0])  ## TODO typed arrays
 
 	def _visit_call_helper_list(self, node):
 		name = self.visit(node.func)
diff --git a/pythonjs/pythonjs_to_dart.py b/pythonjs/pythonjs_to_dart.py
@@ -485,6 +485,19 @@ def _visit_call_helper_list(self, node):
 		return '%s(%s)' % (name, args)
 
 
+	def _visit_call_helper_numpy_array(self, node):
+		simd = {
+			'float32': 'Float32x4'
+		}
+		args = ','.join( [self.visit(a) for a in node.args[0].elts] )
+		if node.keywords:
+			for key in node.keywords:
+				if key.arg == 'dtype':
+					if isinstance(key.value, ast.Attribute) and key.value.attr in simd:
+						return 'new %s(%s)' %(simd[key.value.attr] ,args)
+		return '[%s]' %args  ## TODO
+
+
 	def _visit_call_helper_instanceof(self, node):
 		args = map(self.visit, node.args)
 		if len(args) == 2:
diff --git a/regtests/typed/float32x4.py b/regtests/typed/float32x4.py
@@ -0,0 +1,21 @@
+"""simd float32x4"""
+import numpy
+
+def main():
+	float32x4 a = numpy.array( [1.1, 1.2, 1.3, 0.4], dtype=numpy.float32 )
+	float32x4 b = numpy.array( [1.9, 1.8, 1.7, 0.6], dtype=numpy.float32 )
+
+	c = a + b
+	print(c)
+
+	if PYTHON == 'PYTHONJS':
+		TestError( c.x==3.0 )
+		TestError( c.y==3.0 )
+		TestError( c.z==3.0 )
+		TestError( c.w==1.0 )
+
+	else:
+		TestError( c[0]==3.0 )
+		TestError( c[1]==3.0 )
+		TestError( c[2]==3.0 )
+		TestError( c[3]==1.0 )
