Skip to content

Commit

Permalink
Greeedy for most CCSDT opt
Browse files Browse the repository at this point in the history
  • Loading branch information
@obackhouse
obackhouse committed Oct 21, 2024
1 parent 6603b87 commit 7dfc1ca
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions ebcc/codegen/bootstrap_CCSDT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
expr.extend(expr_n)
output.extend(output_n)
returns.extend(returns_n)
output, expr = optimise(output, expr, spin, strategy="opt" if spin != "uhf" else "greedy")
output, expr = optimise(output, expr, spin, strategy="greedy")

# Generate the L amplitude code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -296,7 +296,7 @@
expr.extend(expr_n)
output.extend(output_n)
returns.extend(returns_n)
output, expr = optimise(output, expr, spin, strategy="trav")
output, expr = optimise(output, expr, spin, strategy="greedy")

# Generate the 2RDM code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -363,7 +363,7 @@
output.extend(output_n)
returns.extend(returns_n)

(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="trav" if spin != "uhf" else "greedy")
(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="greedy")

# Generate the R amplitude intermediates code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -451,7 +451,7 @@
output.extend(output_n)
returns.extend(returns_n)

(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="trav" if spin != "uhf" else "greedy")
(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="greedy")

# Generate the R amplitude intermediates code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -540,7 +540,7 @@
output.extend(output_n)
returns.extend(returns_n)

(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="trav" if spin != "uhf" else "greedy")
(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="greedy")

# Generate the R amplitude intermediates code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -629,7 +629,7 @@
output.extend(output_n)
returns.extend(returns_n)

(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="trav" if spin != "uhf" else "greedy")
(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="greedy")

# Generate the L amplitude intermediates code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -717,7 +717,7 @@
output.extend(output_n)
returns.extend(returns_n)

(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="trav" if spin != "uhf" else "greedy")
(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="greedy")

# Generate the L amplitude intermediates code
for name, codegen in code_generators.items():
Expand Down Expand Up @@ -806,7 +806,7 @@
output.extend(output_n)
returns.extend(returns_n)

(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="trav" if spin != "uhf" else "greedy")
(returns_nr, output_nr, expr_nr), (returns_r, output_r, expr_r) = optimise_eom(returns, output, expr, spin, strategy="greedy")

# Generate the L amplitude intermediates code
for name, codegen in code_generators.items():
Expand Down

0 comments on commit 7dfc1ca

Please sign in to comment.