Use .value to access str value of enum DistributionStrategy.

scalableminds · Aug 8, 2023 · 36eefcf · 36eefcf
1 parent 3e0d68c
commit 36eefcf
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/webknossos/webknossos/cli/_utils.py b/webknossos/webknossos/cli/_utils.py
@@ -26,7 +26,7 @@ class DistributionStrategy(str, Enum):
     SLURM = "slurm"
     KUBERNETES = "kubernetes"
     MULTIPROCESSING = "multiprocessing"
-    DEBUGS_SEQUENTIAL = "debug_sequential"
+    DEBUG_SEQUENTIAL = "debug_sequential"
 
 
 class LayerCategory(str, Enum):

diff --git a/webknossos/webknossos/cli/check_equality.py b/webknossos/webknossos/cli/check_equality.py
@@ -67,7 +67,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/compress.py b/webknossos/webknossos/cli/compress.py
@@ -49,7 +49,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/convert.py b/webknossos/webknossos/cli/convert.py
@@ -94,7 +94,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/convert_knossos.py b/webknossos/webknossos/cli/convert_knossos.py
@@ -325,7 +325,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/convert_raw.py b/webknossos/webknossos/cli/convert_raw.py
@@ -263,7 +263,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/convert_zarr.py b/webknossos/webknossos/cli/convert_zarr.py
@@ -246,7 +246,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/downsample.py b/webknossos/webknossos/cli/downsample.py
@@ -58,7 +58,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

diff --git a/webknossos/webknossos/cli/export_wkw_as_tiff.py b/webknossos/webknossos/cli/export_wkw_as_tiff.py
@@ -269,7 +269,7 @@ def main(
     logging.info("Starting tiff export for bounding box: %s", bbox)
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
     used_tile_size = None

diff --git a/webknossos/webknossos/cli/upsample.py b/webknossos/webknossos/cli/upsample.py
@@ -72,16 +72,16 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
     dataset = Dataset.open(source)
     mode = SamplingModes.parse(sampling_mode.value)
 
-    with get_executor_for_args(args=executor_args) as executor:
-        if layer_name is None:
-            upsample_all_layers(dataset, mode, from_mag, executor_args)
-        else:
+    if layer_name is None:
+        upsample_all_layers(dataset, mode, from_mag, executor_args)
+    else:
+        with get_executor_for_args(args=executor_args) as executor:
             layer = dataset.get_layer(layer_name)
             layer.upsample(from_mag=from_mag, sampling_mode=mode, executor=executor)