Merge branch 'flash-ci/functions-to-classes' of github.com:Lightning-…

…AI/lightning-flash into flash-ci/functions-to-classes
Lightning-Universe · Aug 12, 2022 · 8e03fd7 · 8e03fd7
2 parents ef9b0c0 + ccc7e24
commit 8e03fd7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.azure-pipelines/testing-template.yml b/.azure-pipelines/testing-template.yml
@@ -36,8 +36,7 @@ jobs:
 
       - bash: |
           # python -m pip install "pip==20.1"
-          if [ "${{config}}" == "icevision" ]; then pip install '.[image]' icevision icedata; elif [ "${{config}}" == "vissl" ]; then pip install '.[image]'; else pip install '.[${{config}}]'; fi
-          if [ "${{config}}" == "icevision" ]; then pip install git+https://github.com/rwightman/efficientdet-pytorch.git@79d26d8982b9f8e1f27d9f896e38012ac250fd26; fi
+          if [ "${{config}}" == "icevision" ]; then pip install '.[image]' icevision effdet icedata; elif [ "${{config}}" == "vissl" ]; then pip install '.[image]'; else pip install '.[${{config}}]'; fi
           pip install '.[test]' --upgrade-strategy only-if-needed
           pip list
         displayName: 'Install dependencies'

diff --git a/flash/core/integrations/icevision/adapter.py b/flash/core/integrations/icevision/adapter.py
@@ -151,9 +151,9 @@ def process_train_dataset(
         input_transform = input_transform or self.input_transform
         if input_transform is not None:
             input_transform.inject_collate_fn(data_loader.collate_fn)
-        data_loader = self._update_collate_fn_dataloader(
-            create_worker_input_transform_processor(RunningStage.TRAINING, input_transform), data_loader
-        )
+            data_loader = self._update_collate_fn_dataloader(
+                create_worker_input_transform_processor(RunningStage.TRAINING, input_transform), data_loader
+            )
         return data_loader
 
     def process_val_dataset(
@@ -187,9 +187,9 @@ def process_val_dataset(
         input_transform = input_transform or self.input_transform
         if input_transform is not None:
             input_transform.inject_collate_fn(data_loader.collate_fn)
-        data_loader = self._update_collate_fn_dataloader(
-            create_worker_input_transform_processor(RunningStage.VALIDATING, input_transform), data_loader
-        )
+            data_loader = self._update_collate_fn_dataloader(
+                create_worker_input_transform_processor(RunningStage.VALIDATING, input_transform), data_loader
+            )
         return data_loader
 
     def process_test_dataset(