Add wmem to all the tests and make it necessary

pulp-platform · Dec 5, 2024 · 7458477 · 7458477
1 parent e57260a
commit 7458477
Show file tree

Hide file tree

Showing 121 changed files with 243 additions and 121 deletions.
diff --git a/test/NnxTestClasses.py b/test/NnxTestClasses.py
@@ -52,7 +52,7 @@ class NnxTestConf(BaseModel):
     has_norm_quant: bool
     has_bias: bool
     has_relu: bool
-    wmem: WmemLiteral = "tcdm"
+    wmem: WmemLiteral
 
     @model_validator(mode="after")  # type: ignore
     def check_valid_depthwise_channels(self) -> NnxTestConf:

diff --git a/test/conftest.py b/test/conftest.py
@@ -114,7 +114,10 @@ def pytest_generate_tests(metafunc):
                 test.save_data(test_dir)
             nnxTestAndNames.append((test, test_dir))
         except pydantic.ValidationError as e:
-            _ = e
+            for error in e.errors():
+                if error['type'] == 'missing':
+                    raise e
+
             nnxTestAndNames.append(
                 pytest.param(
                     (None, test_dir),

diff --git a/test/tests/test_0/conf.json b/test/tests/test_0/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_1/conf.json b/test/tests/test_1/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_10/conf.json b/test/tests/test_10/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_100/conf.json b/test/tests/test_100/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": true
+    "has_relu": true,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_101/conf.json b/test/tests/test_101/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": true
+    "has_relu": true,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_102/conf.json b/test/tests/test_102/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": true
+    "has_relu": true,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_103/conf.json b/test/tests/test_103/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": true
+    "has_relu": true,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_104/conf.json b/test/tests/test_104/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": true
+    "has_relu": true,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_105/conf.json b/test/tests/test_105/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": true
+    "has_relu": true,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_106/conf.json b/test/tests/test_106/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_107/conf.json b/test/tests/test_107/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_108/conf.json b/test/tests/test_108/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_109/conf.json b/test/tests/test_109/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_11/conf.json b/test/tests/test_11/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_110/conf.json b/test/tests/test_110/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_111/conf.json b/test/tests/test_111/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_112/conf.json b/test/tests/test_112/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_113/conf.json b/test/tests/test_113/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_114/conf.json b/test/tests/test_114/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_115/conf.json b/test/tests/test_115/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": false,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_116/conf.json b/test/tests/test_116/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_117/conf.json b/test/tests/test_117/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_118/conf.json b/test/tests/test_118/conf.json
@@ -25,5 +25,6 @@
     "bias_type": "int32",
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_12/conf.json b/test/tests/test_12/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_13/conf.json b/test/tests/test_13/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_14/conf.json b/test/tests/test_14/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_15/conf.json b/test/tests/test_15/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_16/conf.json b/test/tests/test_16/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_17/conf.json b/test/tests/test_17/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_18/conf.json b/test/tests/test_18/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_19/conf.json b/test/tests/test_19/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_2/conf.json b/test/tests/test_2/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_20/conf.json b/test/tests/test_20/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_21/conf.json b/test/tests/test_21/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_22/conf.json b/test/tests/test_22/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_23/conf.json b/test/tests/test_23/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_24/conf.json b/test/tests/test_24/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_25/conf.json b/test/tests/test_25/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_26/conf.json b/test/tests/test_26/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": true,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_27/conf.json b/test/tests/test_27/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_28/conf.json b/test/tests/test_28/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }
diff --git a/test/tests/test_29/conf.json b/test/tests/test_29/conf.json
@@ -25,5 +25,6 @@
     },
     "has_norm_quant": true,
     "has_bias": false,
-    "has_relu": false
+    "has_relu": false,
+    "wmem": "tcdm"
 }