Merge remote-tracking branch 'origin/master'

# Conflicts: # simba/data_processors/cuda/utils.py
sgoldenlab · Sep 17, 2024 · 827b0cf · 827b0cf
2 parents c5a3f2e + e4a6d05
commit 827b0cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/simba/data_processors/cuda/timeseries.py b/simba/data_processors/cuda/timeseries.py
@@ -1,11 +1,12 @@
-import numpy as np
-from typing import Optional
 from time import perf_counter
-from simba.utils.enums import Formats
-from simba.utils.checks import check_valid_array, check_float
+from typing import Optional
+
+import numpy as np
 from numba import cuda
-from simba.data_processors.cuda.utils import _cuda_mean, _cuda_std
 
+from simba.data_processors.cuda.utils import _cuda_mean, _cuda_std
+from simba.utils.checks import check_float, check_valid_array
+from simba.utils.enums import Formats
 
 THREADS_PER_BLOCK = 1024
 

diff --git a/simba/feature_extractors/feature_extractor_user_defined.py b/simba/feature_extractors/feature_extractor_user_defined.py
@@ -10,7 +10,7 @@
 
 from simba.mixins.config_reader import ConfigReader
 from simba.mixins.feature_extraction_mixin import FeatureExtractionMixin
-from simba.utils.checks import check_str, check_float
+from simba.utils.checks import check_float, check_str
 from simba.utils.errors import MissingColumnsError, ParametersFileError
 from simba.utils.printing import SimbaTimer, stdout_success
 from simba.utils.read_write import get_fn_ext, read_df, write_df