Merge branch 'devel' into wrap

jcosborn · Dec 8, 2023 · 27aa6a3 · 27aa6a3
2 parents 951ef2b + 756b49f
commit 27aa6a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/build/buildTasks.nims b/build/buildTasks.nims
@@ -159,7 +159,7 @@ build options:
 let nimOptionsHelp = """
 Nim options:
   -<option>   Passes '-<option>' to Nim compiler
-              (may need to proceed with '--' so make doesn't parse it).
+              (may need to precede with '--' so make doesn't parse it).
   :-<option>  Passes '-<option>' to Nim compiler
               (avoids issues with make trying to parse it).
   :foo        Sets Nim define 'foo'

diff --git a/src/gauge/gaugeAction.nim b/src/gauge/gaugeAction.nim
@@ -365,7 +365,7 @@ proc gaugeAction2*(c: GaugeActionCoeffs, g: array|seq): auto =
   threads:
     tic()
     toc("gaugeAction2 zero")
-    var ip = 0
+    #var ip = 0
     for mu in 1..<nd:
       for nu in 0..<mu:
         tic()

diff --git a/src/maths/complexProxy.nim b/src/maths/complexProxy.nim
@@ -203,11 +203,14 @@ template `im=`*(x: ImagProxy, y: typed) = x[] = y
 template `re=`*(x: ComplexProxy, y: typed) = x[].re = y
 template `im=`*(x: ComplexProxy, y: typed) = x[].im = y
 
-template setU*(r: ComplexProxy, x: typed, y: typed) =
-  r[].re = x
-  r[].im = y
-template set*(r: ComplexProxy, x: typed, y: typed) =
-  flattenCallArgs(setU, r, x, y)
+#template setU*(r: ComplexProxy, x: typed, y: typed) =
+#  r[].re = x
+#  r[].im = y
+#template set*(r: ComplexProxy, x: typed, y: typed) =
+#  flattenCallArgs(setU, r, x, y)
+proc set*(r: var ComplexProxy, x: auto, y: auto) {.alwaysInline.} =
+  r.re = x
+  r.im = y
 
 template assign*(x: RealProxy, y: RealProxy2): untyped =
   x[] = y[]

diff --git a/src/observables/conn4d.nim b/src/observables/conn4d.nim
@@ -59,7 +59,7 @@ let
 var
   lo = lat.newLayout
   g = lo.newGauge
-  r = newRNGField(RngMilc6, lo, seed)
+  #r = newRNGField(RngMilc6, lo, seed)
   R: RngMilc6  # global RNG
   nc = g[0][0].nrows
 R.seed(seed, 987654321)
@@ -79,7 +79,7 @@ qexLog "Finished loading conifguration."
 var spatv = 1
 for i in 0..<lat.len-1: spatv *= lat[i]
 
-proc printPlaq(g: any) =
+proc printPlaq(g: auto) =
   let
     p = g.plaq
     sp = 2.0*(p[0]+p[1]+p[2])
@@ -101,7 +101,7 @@ g.printPlaq
 
 qexLog "Finished re-unitarization."
 
-proc smear(sg,g:any) =
+proc smear(sg,g: auto) =
   var
     info: PerfInfo
     coef = HypCoefs(alpha1:0.4, alpha2:0.5, alpha3:0.5)