io depth fixed

carlosmalt · Aug 24, 2020 · 47edea3 · 47edea3
1 parent 3741bcb
commit 47edea3
Show file tree

Hide file tree

Showing 9 changed files with 2,193 additions and 230 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 venv
 __pycache__
 .ipynb_checkpoints
+.idea
+*.pkl
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/radossim.iml b/.idea/radossim.iml
diff --git a/experiments/codelTests/codel_experiments.ipynb b/experiments/codelTests/codel_experiments.ipynb
diff --git a/experiments/latModel/latModelValidation.ipynb b/experiments/latModel/latModelValidation.ipynb
diff --git a/scripts/optimization.py b/scripts/optimization.py
@@ -14,7 +14,7 @@ def __init__(self, optimizationMethod, model, time):
 
     def runSimulationAndCalculateError(self, paramList):
         targetLat, interval = paramList
-        throughput, osdQueueLen = radossim.runSimulation(self.model, targetLat=targetLat, measInterval=interval, time=self.time)
+        throughput, osdQueueLen, _, _ = radossim.runSimulation(self.model, targetLat=targetLat, measInterval=interval, time=self.time)
         return self.error(throughput, osdQueueLen)
 
     def error(self, throughput, osdQueueLen):
@@ -28,8 +28,8 @@ def error(self, throughput, osdQueueLen):
         print(f'Error for ({throughput}, {osdQueueLen}): {osdQLenError + throughputError}')
         return osdQLenError + throughputError
 
-    def optimize(self, targetLatStartPoint, intervalBoundsStartPoint, targetLatBounds=(500, 5000), intervalBounds=(1000, 200000)):
-        throughput, _ = radossim.runSimulation(self.model, targetLat=targetLat, measInterval=interval,
+    def optimize(self, targetLatStartPoint, intervalBoundsStartPoint, targetLatBounds=(50, 5000), intervalBounds=(100, 100000)):
+        throughput, _, _, _ = radossim.runSimulation(self.model, targetLat=targetLat, measInterval=interval,
                                                          time=self.time, useCoDel=False)
         self.originalThroughput = throughput
         print(f'Original Throughput: {self.originalThroughput} B/s')
@@ -49,9 +49,9 @@ def optimize(self, targetLatStartPoint, intervalBoundsStartPoint, targetLatBound
                         help='filepath of latency model (default "latency_model_4K.yaml")'
                         )
     args = parser.parse_args()
-    targetLat = 1000
-    interval = 50000
-    time = 5 * 60 * 1_000_000  # 5 mins
+    targetLat = 100
+    interval = 1000
+    time = 10 * 1_000_000  # 5 mins
     optimizer = Optimizer('L-BFGS-B', args.model, time)
     res = optimizer.optimize(targetLat, interval)
     print(res)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,5 @@ @@
     venv
     __pycache__
     .ipynb_checkpoints
+    .idea
+    *.pkl