Merge branch 'master' into linear_grid_sym

PlasmaControl · Mar 30, 2023 · 166e30d · 166e30d
2 parents 0518f8b + 6a06623
commit 166e30d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort (python)

diff --git a/tests/benchmarks/benchmark_cpu_large.py b/tests/benchmarks/benchmark_cpu_large.py
@@ -257,14 +257,14 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
-
+        deltas = {"p_l": dp}
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 1,
             "verbose": 2,
@@ -289,14 +289,14 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
-
+        deltas = {"p_l": dp}
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 2,
             "verbose": 2,

diff --git a/tests/benchmarks/benchmark_cpu_small.py b/tests/benchmarks/benchmark_cpu_small.py
@@ -295,14 +295,15 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
+        deltas = {"p_l": dp}
 
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 1,
             "verbose": 2,
@@ -327,14 +328,15 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
+        deltas = {"p_l": dp}
 
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 2,
             "verbose": 2,

diff --git a/tests/benchmarks/benchmark_gpu_large.py b/tests/benchmarks/benchmark_gpu_large.py
@@ -257,14 +257,15 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
+        deltas = {"p_l": dp}
 
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 1,
             "verbose": 2,
@@ -289,14 +290,15 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
+        deltas = {"p_l": dp}
 
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 2,
             "verbose": 2,

diff --git a/tests/benchmarks/benchmark_gpu_small.py b/tests/benchmarks/benchmark_gpu_small.py
@@ -295,14 +295,15 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
+        deltas = {"p_l": dp}
 
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 1,
             "verbose": 2,
@@ -327,14 +328,15 @@ def setup():
         dp = np.zeros_like(eq.p_l)
         objective.build(eq)
         dp[np.array([0, 2])] = 8e3 * np.array([1, -1])
+        deltas = {"p_l": dp}
 
         args = (
             eq,
             objective,
             constraints,
         )
         kwargs = {
-            "dp": dp,
+            "deltas": deltas,
             "tr_ratio": tr_ratio,
             "order": 2,
             "verbose": 2,