moving tests to a tests/ dir. changing workload base class names to s…

…tart with Base. making acronyms in workloads camel case.
Niccolo-Ajroldi · Mar 29, 2022 · 071d1e3 · 071d1e3
1 parent 10bd7fe
commit 071d1e3
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,4 +19,4 @@ jobs:
     - name: Run pytest
       run: |
 
-        pytest -vx .
+        pytest -vx tests/
diff --git a/algorithmic_efficiency/workloads/imagenet/imagenet_pytorch/workload.py b/algorithmic_efficiency/workloads/imagenet/imagenet_pytorch/workload.py
@@ -30,7 +30,7 @@ def cycle(iterable):
       iterator = iter(iterable)
 
 
-class ImagenetPytorchWorkload(BaseImagenetWorkload):
+class ImagenetWorkload(BaseImagenetWorkload):
 
   @property
   def param_shapes(self):

diff --git a/algorithmic_efficiency/workloads/ogbg/ogbg_jax/workload.py b/algorithmic_efficiency/workloads/ogbg/ogbg_jax/workload.py
@@ -9,13 +9,13 @@
 
 from algorithmic_efficiency import random_utils as prng
 from algorithmic_efficiency import spec
+from algorithmic_efficiency.workloads.ogbg.workload import BaseOgbgWorkload
 from algorithmic_efficiency.workloads.ogbg.ogbg_jax import input_pipeline
 from algorithmic_efficiency.workloads.ogbg.ogbg_jax import metrics
 from algorithmic_efficiency.workloads.ogbg.ogbg_jax import models
-from algorithmic_efficiency.workloads.ogbg.workload import OGBG
 
 
-class OGBGWorkload(OGBG):
+class OgbgWorkload(BaseOgbgWorkload):
 
   def __init__(self):
     self._eval_iterator = None

diff --git a/algorithmic_efficiency/workloads/ogbg/workload.py b/algorithmic_efficiency/workloads/ogbg/workload.py
@@ -1,7 +1,7 @@
 from algorithmic_efficiency import spec
 
 
-class OGBG(spec.Workload):
+class BaseOgbgWorkload(spec.Workload):
 
   def has_reached_goal(self, eval_result: float) -> bool:
     return eval_result['mean_average_precision'] > self.target_value

diff --git a/algorithmic_efficiency/workloads/wmt/wmt_jax/workload.py b/algorithmic_efficiency/workloads/wmt/wmt_jax/workload.py
@@ -21,7 +21,7 @@
 WORKDIR = "./wmt_256"
 
 
-class WMTWorkload(spec.Workload):
+class WmtWorkload(spec.Workload):
   """A WMT workload."""
 
   def __init__(self):

diff --git a/submission_runner.py b/submission_runner.py
@@ -34,7 +34,7 @@
 # TODO(znado): make a nicer registry of workloads that lookup in.
 BASE_WORKLOADS_DIR = "algorithmic_efficiency/workloads/"
 
-# workload_path will be appended by '_pytorch' or '_jax' automatically
+# workload_path will be appended by '_pytorch' or '_jax' automatically.
 WORKLOADS = {
     'mnist': {
         'workload_path': 'mnist/mnist', 'workload_class_name': 'MnistWorkload'
@@ -43,13 +43,13 @@
         'workload_path': 'imagenet/imagenet',
         'workload_class_name': 'ImagenetWorkload'
     },
-    'wmt': {'workload_path': 'wmt/wmt', 'workload_class_name': 'WMTWorkload'},
+    'wmt': {'workload_path': 'wmt/wmt', 'workload_class_name': 'WmtWorkload'},
     'librispeech': {
         'workload_path': 'librispeech/librispeech',
         'workload_class_name': 'LibriSpeechWorkload'
     },
     'ogbg': {
-        'workload_path': 'ogbg/ogbg', 'workload_class_name': 'OGBGWorkload'
+        'workload_path': 'ogbg/ogbg', 'workload_class_name': 'OgbgWorkload'
     },
 }
 

diff --git a/submission_runner_test.py → tests/submission_runner_test.py b/submission_runner_test.py → tests/submission_runner_test.py
diff --git a/test_version.py → tests/test_version.py b/test_version.py → tests/test_version.py
diff --git a/...ds/imagenet/imagenet_jax/workload_test.py → ...ds/imagenet/imagenet_jax/workload_test.py b/...ds/imagenet/imagenet_jax/workload_test.py → ...ds/imagenet/imagenet_jax/workload_test.py