prep for announced release

go.mod

@@ -5,7 +5,7 @@ go 1.22.7
 require (
 	github.com/iti/evt/evtm v0.1.4
 	github.com/iti/evt/vrtime v0.1.5
-	github.com/iti/pces v0.0.15
+	github.com/iti/pces v0.0.16
 )
 
 require (

go.sum

@@ -8,8 +8,8 @@ github.com/iti/evt/vrtime v0.1.5 h1:5d2O3ZGb9OruBkBxZ1PzyXBlHkAUmW27jz9fUXHc6MI=
 github.com/iti/evt/vrtime v0.1.5/go.mod h1:NtgQQ20CSeaLxWNsAROKuHtAdeXNZ86Wg6ox2l5LtrU=
 github.com/iti/mrnes v0.0.16 h1:TiyBzSFo4teG0EvKjbdOPHhvC6HywDmGmVRRtD06wkI=
 github.com/iti/mrnes v0.0.16/go.mod h1:1P8kC384qaei5i84ZK42VYDrXmRLiYZHmx52yeLL37E=
-github.com/iti/pces v0.0.15 h1:wut3GAFRS3Ks8uKhdA/d2w6dqDfD/SD55zgXoLTZqxA=
-github.com/iti/pces v0.0.15/go.mod h1:puOlSzKF8W6wXiK6IwSGOjR7S3gGGKpC0fn9JjakXeA=
+github.com/iti/pces v0.0.16 h1:+PEhCkaqA2HlBnz+aw1u/Yax/BzxveWicFuQozutd7U=
+github.com/iti/pces v0.0.16/go.mod h1:puOlSzKF8W6wXiK6IwSGOjR7S3gGGKpC0fn9JjakXeA=
 github.com/iti/rngstream v0.2.2 h1:9cfSikwWPW1Yie+RjdJ23uUuMryLu+Ou38/TChYLPZ8=
 github.com/iti/rngstream v0.2.2/go.mod h1:sf9vdWtEjVW4dxOocgIqbivkNIrfcl10H8jEeeqFNnQ=
 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=

simulator/args-run

@@ -2,5 +2,5 @@
 -input ./input
 -output ./output
 -sim ./sim-dir
--container pces/sim
--extern ./
+#-container pces/sim
+#-extern ./

simulator/args/args-sim

@@ -1,14 +1,13 @@
 -exprmnt exp-4
--container
--inputLib ./input
--outputLib ./output
 -cp cp.yaml
 -cpInit cpInit.yaml
 -funcExec funcExec.yaml
 -devExec devExec.yaml
--map map.yaml
 -exp exp.yaml
+-map map.yaml
 -topo topo.yaml
+-inputLib ./input
+-outputLib ./output
 -trace trace.yaml
 -stop 100.0
 -msr msr.yaml

simulator/args/args-sim-template

@@ -1,14 +1,4 @@
--inputLib ./input
--outputLib ./output
--cp cp.yaml
--cpInit cpInit.yaml
--funcExec funcExec.yaml
--devExec devExec.yaml
--map map.yaml
--exp exp.yaml
--topo topo.yaml
 -trace trace.yaml
 -stop 100.0
--msr msr.yaml
 -rngseed 234545
 -tunits msec

simulator/output/results.yaml

@@ -1,21 +1,25 @@
-experiment set run at time 2024-12-14 07:40:59.906740
+pces evaluation run at time 2024-12-16 04:52:05.546541
 - exprmnt: exp-1
   measurements:
-  - latency: 1.0840000000007421 (msec)
+  - index: 1
+    latency: 1.0840000000007421 (msec)
     measurename: end2end
     waypoints: []
 - exprmnt: exp-2
   measurements:
-  - latency: 24.84399999999914 (msec)
+  - index: 1
+    latency: 24.84399999999914 (msec)
     measurename: end2end
     waypoints: []
 - exprmnt: exp-3
   measurements:
-  - latency: 1.0790000000015425 (msec)
+  - index: 1
+    latency: 1.0790000000015425 (msec)
     measurename: end2end
     waypoints: []
 - exprmnt: exp-4
   measurements:
-  - latency: 24.838999999999942 (msec)
+  - index: 1
+    latency: 24.838999999999942 (msec)
     measurename: end2end
     waypoints: []

simulator/run.py

@@ -15,8 +15,6 @@
 import os
 import glob
 
-sheetNames = ('cp', 'topo', 'execTime', 'netParams', 'mapping')
-
 def main():
     global workingDir, csvDir
 
@@ -84,7 +82,7 @@ def main():
         for fileName in fList:
             filePath = os.path.join(templateDir, fileName)
             if not os.path.isfile(filePath):
-                print('expected file {} does not exist'.format(filePath))
+                print('expected file {} does not exist in templates directory'.format(filePath))
                 errs += 1
 
     if errs > 0:
@@ -150,7 +148,7 @@ def main():
 
     aggOutFile = os.path.join(outputDir, 'results.yaml')
     with open(aggOutFile, 'w') as wf:
-        print('experiment set run at time {}'.format(datetime.datetime.now()), file=wf) 
+        print('pces evaluation run at time {}'.format(datetime.datetime.now()), file=wf) 
 
     allMsr = []
 
@@ -161,11 +159,43 @@ def main():
         with open(os.path.join(argsDir,'args-sim-template'), 'r') as tf, open(os.path.join(argsDir,'args-sim'), 'w') as wf:
             wf.write('-exprmnt {}\n'.format(exprmntName))
 
+            tagPairs = [('-inputDir', './input'), ('-outputDir', './output'), ('-cp', 'cp.yaml'), ('-cpInit', 'cpInit.yaml'),
+                    ('-funcExec', 'funcExec.yaml'), ('-devExec', 'devExec.yaml'), ('-exp', 'exp.yaml'),('-map', 'map.yaml'),
+                        ('-topo', 'topo.yaml'), ('-msr', 'msrFile')]
+
             if containerTag is not None:
-                wf.write('-container\n')
+                tagPairs.append(('-container', ''))
+
+            for tag, value in tagPairs:
+                wf.write(tag+' '+value+'\n')
 
             for line in tf:
-                wf.write(line)
+                # hard wire the input file names
+                if line.startswith('#'):
+                    continue
+                pieces = line.split()
+                if pieces[0] == '-container':
+                    continue
+                if pieces[0] == '-cp':
+                    continue
+                if pieces[0] == '-cpInit':
+                    continue
+                elif pieces[0] == '-funcExec':
+                    continue
+                elif pieces[0] == '-devExec':
+                    continue
+                elif pieces[0] == '-map':
+                    continue 
+                elif pieces[0] == '-exp':
+                    continue
+                elif pieces[0] == '-topo':
+                    continue
+                elif pieces[0] == 'inputDir':
+                    continue
+                elif pieces[0] == 'outputDir':
+                    continue
+                else:      
+                    wf.write(line)
 
         sheetFlag = {}
         # get the files to be modified
@@ -178,7 +208,7 @@ def main():
             else:
                 sheets = sheetNames
 
-            for sheet in sheetNames:
+            for sheet in sheets:
                 sheetFlag[sheet] = True
 
         # copy the files to be modified

simulator/sim-dir/go.mod

@@ -5,7 +5,7 @@ go 1.22.7
 require (
 	github.com/iti/evt/evtm v0.1.4
 	github.com/iti/evt/vrtime v0.1.5
-	github.com/iti/pces v0.0.15
+	github.com/iti/pces v0.0.16
 )
 
 require (

simulator/sim-dir/go.sum

@@ -8,8 +8,8 @@ github.com/iti/evt/vrtime v0.1.5 h1:5d2O3ZGb9OruBkBxZ1PzyXBlHkAUmW27jz9fUXHc6MI=
 github.com/iti/evt/vrtime v0.1.5/go.mod h1:NtgQQ20CSeaLxWNsAROKuHtAdeXNZ86Wg6ox2l5LtrU=
 github.com/iti/mrnes v0.0.16 h1:TiyBzSFo4teG0EvKjbdOPHhvC6HywDmGmVRRtD06wkI=
 github.com/iti/mrnes v0.0.16/go.mod h1:1P8kC384qaei5i84ZK42VYDrXmRLiYZHmx52yeLL37E=
-github.com/iti/pces v0.0.15 h1:wut3GAFRS3Ks8uKhdA/d2w6dqDfD/SD55zgXoLTZqxA=
-github.com/iti/pces v0.0.15/go.mod h1:puOlSzKF8W6wXiK6IwSGOjR7S3gGGKpC0fn9JjakXeA=
+github.com/iti/pces v0.0.16 h1:+PEhCkaqA2HlBnz+aw1u/Yax/BzxveWicFuQozutd7U=
+github.com/iti/pces v0.0.16/go.mod h1:puOlSzKF8W6wXiK6IwSGOjR7S3gGGKpC0fn9JjakXeA=
 github.com/iti/rngstream v0.2.2 h1:9cfSikwWPW1Yie+RjdJ23uUuMryLu+Ou38/TChYLPZ8=
 github.com/iti/rngstream v0.2.2/go.mod h1:sf9vdWtEjVW4dxOocgIqbivkNIrfcl10H8jEeeqFNnQ=
 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=

simulator/sim-dir/sim.go

@@ -1,11 +1,9 @@
 package main
-
 import (
 	"fmt"
 	"github.com/iti/pces"
 )
 
-// main gives the entry point
 func main() {
 	pces.ReadSimArgs() 
 	pces.RunExperiment(expCntrl, expCmplt)