Parallelize all recursive functions

README.md

@@ -307,3 +307,6 @@ pd.DataFrame, Results dataframe, giving complexity, MSE, and equations
 - [ ] Create flexible way of providing "simplification recipes." I.e., plus(plus(T, C), C) => plus(T, +(C, C)). The user could pass these.
 - [ ] Can we cache calculations, or does the compiler do that? E.g., I should only have to run exp(x0) once; after that it should be read from memory.
     - Maybe I could store the result of calculations in a tree (or an index to a massive array that does this). And only when something in the subtree updates, does the rest of the tree update!
+- [ ] Try Memoize.jl instead of manually caching.
+- [ ] Try threading over population. Do random sort, compute mutation for each, then replace 10% oldest.
+

julia/sr.jl

@@ -72,8 +72,9 @@ function copyNode(tree::Node)::Node
        return Node(tree.val)
    elseif tree.degree == 1
        return Node(tree.op, copyNode(tree.l))
-   else
-       return Node(tree.op, copyNode(tree.l), copyNode(tree.r))
+    else
+        right = Threads.@spawn copyNode(tree.r)
+        return Node(tree.op, copyNode(tree.l), fetch(right))
    end
 end
 
@@ -88,7 +89,8 @@ function evalTree(tree::Node, x::Array{Float32, 1}=Float32[])::Float32
     elseif tree.degree == 1
         return tree.op(evalTree(tree.l, x))
     else
-        return tree.op(evalTree(tree.l, x), evalTree(tree.r, x))
+        right = Threads.@spawn evalTree(tree.r, x)
+        return tree.op(evalTree(tree.l, x), fetch(right))
     end
 end
 
@@ -99,7 +101,8 @@ function countNodes(tree::Node)::Integer
     elseif tree.degree == 1
         return 1 + countNodes(tree.l)
     else
-        return 1 + countNodes(tree.l) + countNodes(tree.r)
+        right = Threads.@spawn countNodes(tree.r)
+        return 1 + countNodes(tree.l) + fetch(right)
     end
 end
 
@@ -114,7 +117,8 @@ function stringTree(tree::Node)::String
     elseif tree.degree == 1
         return "$(tree.op)($(stringTree(tree.l)))"
     else
-        return "$(tree.op)($(stringTree(tree.l)), $(stringTree(tree.r)))"
+        right = Threads.@spawn stringTree(tree.r)
+        return "$(tree.op)($(stringTree(tree.l)), $(fetch(right)))"
     end
 end
 
@@ -155,7 +159,8 @@ function countUnaryOperators(tree::Node)::Integer
     elseif tree.degree == 1
         return 1 + countUnaryOperators(tree.l)
     else
-        return 0 + countUnaryOperators(tree.l) + countUnaryOperators(tree.r)
+        right = Threads.@spawn countUnaryOperators(tree.r)
+        return 0 + countUnaryOperators(tree.l) + fetch(right)
     end
 end
 
@@ -166,7 +171,8 @@ function countBinaryOperators(tree::Node)::Integer
     elseif tree.degree == 1
         return 0 + countBinaryOperators(tree.l)
     else
-        return 1 + countBinaryOperators(tree.l) + countBinaryOperators(tree.r)
+        right = Threads.@spawn countBinaryOperators(tree.r)
+        return 1 + countBinaryOperators(tree.l) + fetch(right)
     end
 end
 
@@ -200,7 +206,8 @@ function countConstants(tree::Node)::Integer
     elseif tree.degree == 1
         return 0 + countConstants(tree.l)
     else
-        return 0 + countConstants(tree.l) + countConstants(tree.r)
+        right = Threads.@spawn countConstants(tree.r)
+        return 0 + countConstants(tree.l) + fetch(right)
     end
 end
 
@@ -247,7 +254,8 @@ function evalTreeArray(tree::Node)::Array{Float32, 1}
     elseif tree.degree == 1
         return tree.op.(evalTreeArray(tree.l))
     else
-        return tree.op.(evalTreeArray(tree.l), evalTreeArray(tree.r))
+        right = Threads.@spawn evalTreeArray(tree.r)
+        return tree.op.(evalTreeArray(tree.l), fetch(right))
     end
 end
 
@@ -486,8 +494,9 @@ function simplifyTree(tree::Node)::Node
             return Node(tree.op(tree.l.val))
         end
     elseif tree.degree == 2
-        tree.r = simplifyTree(tree.r)
+        right = Threads.@spawn simplifyTree(tree.r)
         tree.l = simplifyTree(tree.l)
+        tree.r = fetch(right)
         constantsBelow = (
              tree.l.degree == 0 && tree.l.constant &&
              tree.r.degree == 0 && tree.r.constant

pysr/sr.py

@@ -213,6 +213,7 @@ const weights = convert(Array{Float32, 1}, """f"{weight_str})"
     command = [
         f'julia -O{julia_optimization:d}',
         f'-p {procs}',
+        f'--threads auto',
         f'/tmp/.runfile_{rand_string}.jl',
         ]
     if timeout is not None: