Merge pull request #222 from MineralsCloud:operators

Rename operators as in MineralsCloud/SimpleWorkflows.jl#129
MineralsCloud · Jul 8, 2022 · 487c596 · 487c596
2 parents a53f6f7 + eeddf0f
commit 487c596
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 43 deletions.
diff --git a/Project.toml b/Project.toml
@@ -23,7 +23,7 @@ EquationsOfStateOfSolids = "0.2, 0.3, 0.4"
 Formatting = "0.4"
 Pseudopotentials = "0.8"
 PyQHA = "0.1"
-SimpleWorkflows = "0.14, 0.15, 0.16"
+SimpleWorkflows = "0.16"
 Unitful = "0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 1"
 julia = "1"
 

diff --git a/src/ConvergenceTestWorkflow/Recipes.jl b/src/ConvergenceTestWorkflow/Recipes.jl
@@ -2,7 +2,7 @@ module Recipes
 
 using AbInitioSoftwareBase: load
 using Serialization: deserialize
-using SimpleWorkflows: Job, Workflow, run!, ▷, ⋲, ⋺
+using SimpleWorkflows: Job, Workflow, run!, →, ⇉, ⇶, ⭃
 
 using ..ConvergenceTestWorkflow:
     Scf, DownloadPotentials, LogMsg, MakeInput, RunCmd, TestConvergence, buildjob
@@ -22,8 +22,8 @@ function buildworkflow(cfgfile)
         c = buildjob(RunCmd{Scf}(), cfgfile)
         d = buildjob(TestConvergence{Scf}(), cfgfile)
         e = Job(() -> LogMsg{Scf}()(; start = false))
-        ((((a0 ▷ a) ⋲ b) ▷ c) ⋺ d) ▷ e
-        return Workflow(a0, a, b..., c..., d, e)
+        a0 → a ⇉ b ⇶ c ⭃ d → e
+        return Workflow(a0)
     end
 end
 

diff --git a/src/EquationOfStateWorkflow/Recipes.jl b/src/EquationOfStateWorkflow/Recipes.jl
@@ -2,7 +2,7 @@ module Recipes
 
 using AbInitioSoftwareBase: load
 using Serialization: deserialize
-using SimpleWorkflows: Job, Workflow, run!, ▷, ⋲, ⋺
+using SimpleWorkflows: Job, Workflow, run!, →, ⇉, ⇶, ⭃
 
 using ..Config: ExpandConfig
 using ..EquationOfStateWorkflow:
@@ -32,8 +32,8 @@ function buildworkflow(cfgfile)
         j0 = buildjob(GetData{stage}(), cfgfile)
         j = buildjob(FitEos{stage}(), cfgfile)
         l = Job(() -> LogMsg{stage}()(; start = false))
-        ((((((((((a0 ▷ a) ⋲ b) ▷ c) ⋺ d0) ▷ d) ▷ f) ▷ g ⋲ h) ▷ i) ⋺ j0) ▷ j) ▷ l
-        return Workflow(a0, a, b..., c..., d0, d, f, g, h..., i..., j0, j, l)
+        a0 → a ⇉ b ⇶ c ⭃ d0 → d → f → g ⇉ h ⇶ i ⭃ j0 → j → l
+        return Workflow(a0)
     end
 end
 

diff --git a/src/PhononWorkflow/PhononWorkflow.jl b/src/PhononWorkflow/PhononWorkflow.jl
@@ -3,7 +3,7 @@ module PhononWorkflow
 using AbInitioSoftwareBase: load
 using AbInitioSoftwareBase.Inputs: Input
 using Serialization: deserialize
-using SimpleWorkflows: Workflow, run!, ▷
+using SimpleWorkflows: Workflow, run!, →
 using Unitful: ustrip, @u_str
 
 using ..Express:

diff --git a/src/PhononWorkflow/Recipes.jl b/src/PhononWorkflow/Recipes.jl
@@ -2,7 +2,7 @@ module Recipes
 
 using AbInitioSoftwareBase: load
 using Serialization: deserialize
-using SimpleWorkflows: Job, Workflow, run!, ▷, ⋲, ⋺
+using SimpleWorkflows: Job, Workflow, run!, →, ⇉, ⇶, ⭃
 using ..PhononWorkflow:
     Scf,
     Dfpt,
@@ -48,37 +48,8 @@ function buildworkflow(cfgfile)
         n = buildjob(MakeInput{x}(), cfgfile)
         o = buildjob(RunCmd{x}(), cfgfile)
         p = Job(() -> LogMsg{x}()(; start = false))
-        (
-            (
-                (
-                    (
-                        (
-                            ((((((((((a0 ▷ a) ⋲ b) ▷ c) ⋺ d) ▷ e) ⋲ f) ▷ g) ⋺ h) ▷ i) ⋲ j) ▷
-                            k
-                        ) ⋺ l
-                    ) ▷ m
-                ) ⋲ n
-            ) ▷ o
-        ) ⋺ p
-        return Workflow(
-            a0,
-            a,
-            b...,
-            c...,
-            d,
-            e,
-            f...,
-            g...,
-            h,
-            i,
-            j...,
-            k...,
-            l,
-            m,
-            n...,
-            o...,
-            p,
-        )
+        a0 → a ⇉ b ⇶ c ⭃ d → e ⇉ f ⇶ g ⭃ h → i ⇉ j ⇶ k ⭃ l → m ⇉ n ⇶ o ⭃ p
+        return Workflow(a0)
     end
 end
 

diff --git a/src/QuasiHarmonicApproxWorkflow/Recipes.jl b/src/QuasiHarmonicApproxWorkflow/Recipes.jl
@@ -1,6 +1,6 @@
 module Recipes
 
-using SimpleWorkflows: Job, Workflow, run!, ▷
+using SimpleWorkflows: Job, Workflow, run!, →
 using ..QuasiHarmonicApproxWorkflow:
     QuasiHarmonicApprox, MakeInput, CalculateThermodyn, Plot, buildjob
 
@@ -10,8 +10,8 @@ function buildworkflow(cfgfile)
     a = buildjob(MakeInput{QuasiHarmonicApprox}(), cfgfile)
     b = buildjob(CalculateThermodyn{QuasiHarmonicApprox}(), cfgfile)
     c = buildjob(Plot{QuasiHarmonicApprox}(), cfgfile)
-    a ▷ b ▷ c
-    return Workflow(a, b, c)
+    a → b → c
+    return Workflow(a)
 end
 
 end