Merge branch 'master' of https://github.com/mcneel/ghpython

Author: piac

GhPython.csproj

@@ -155,6 +155,7 @@
   <ItemGroup>
     <EmbeddedResource Include="package\components.py" />
     <EmbeddedResource Include="package\__init__.py" />
+    <EmbeddedResource Include="package\parallel.py" />
     <Content Include="Samples\sampleCommon.py" />
     <None Include="Samples\helpText.html" />
     <Content Include="Samples\sampleScript.py" />

package/__init__.py

@@ -1,2 +1,2 @@
 # GhPython package
-__all__ = ["components"]
+__all__ = ["components", "parallel"]

package/components.py

@@ -5,7 +5,7 @@
 
 def __make_function__(helper):
     def component_function(*args, **kwargs):
-        comp = helper.comp
+        comp = helper.proxy.CreateInstance()
         comp.ClearData()
         if args:
             for i, arg in enumerate(args):
@@ -30,7 +30,10 @@ def component_function(*args, **kwargs):
         doc.AddObject(comp, False, 0)
         comp.CollectData()
         comp.ComputeData()
-        return helper.create_output(comp.Params)
+        output = helper.create_output(comp.Params)
+        comp.ClearData()
+        doc.Dispose()
+        return output
     return component_function
 
 
@@ -42,15 +45,15 @@ def __init__(self):
 class function_helper(object):
     def __init__(self, proxy):
         self.proxy = proxy
-        self.comp = proxy.CreateInstance()
         self.return_type = None
 
     def create_output(self, params):
-        import collections
+        from collections import namedtuple
         output_values = []
         for output in params.Output:
             data = output.VolatileData.AllData(True)
-            v = [x.Value for x in data]
+            #We could call Value, but ScriptVariable seems to do a better job
+            v = [x.ScriptVariable() for x in data]
             if len(v)<1:
                 output_values.append(None)
             elif len(v)==1:
@@ -61,8 +64,7 @@ def create_output(self, params):
         if self.return_type is None:
             names = [output.Name.lower() for output in params.Output]
             try:
-                t = collections.namedtuple('Output', names, rename=True)
-                self.return_type = t
+                self.return_type = namedtuple('Output', names, rename=True)
             except:
                 self.return_type = False
         if not self.return_type: return output_values

package/parallel.py

@@ -0,0 +1,36 @@
+import System.Threading.Tasks as tasks
+from System import Exception, AggregateException
+
+def run(function, data_list, flatten_results = False):
+    """for each item in data_list execute the input function. Execution is
+    done on as many threads as there are CPUs on the computer.
+    Parameters:
+        function: function to execute for each item in the data_list
+        data_list: list, tuple, or other enumerable data structure
+        flatten_list [opt]: if True, when results are lists of lists the
+          results are flattened into a single list of results. If this is True,
+          you cannot depend on the result list being the same size as the input list
+    Returns:
+        list of results containing the return from each call to the input function
+    """
+    pieces = [(i,data) for i,data in enumerate(data_list)]
+    results = range(len(pieces))
+
+    def helper(piece):
+        i, data = piece
+        local_result = function(data)
+        results[i] = local_result
+    # Run first piece serial in case there is "set up" code in the function
+    # that needs to be done once. All other iterations are done parallel
+    helper(pieces[0])
+    pieces = pieces[1:]
+    if pieces: tasks.Parallel.ForEach(pieces, helper)
+    if flatten_results:
+        temp = []
+        for result in results:
+            if type(result) is list:
+                for r in result: temp.append(r)
+            else:
+                temp.append(result)
+        results = temp
+    return results