Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
sronilsson committed Sep 5, 2024
2 parents 8742aa8 + 763561f commit 828ab76
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion simba/data_processors/cuda/circular_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
except:
import numpy as cp

from simba.utils.checks import check_int, check_valid_array, check_float
from simba.utils.checks import check_float, check_int, check_valid_array
from simba.utils.enums import Formats

THREADS_PER_BLOCK = 1024
Expand Down
6 changes: 3 additions & 3 deletions simba/data_processors/cuda/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
import numpy as np
from numba import cuda

from simba.utils.checks import (check_file_exist_and_readable,
from simba.utils.checks import (check_file_exist_and_readable, check_float,
check_if_dir_exists,
check_if_string_value_is_valid_video_timestamp,
check_if_valid_img, check_instance, check_int,
check_nvidea_gpu_available,
check_that_hhmmss_start_is_before_end,
check_valid_array, check_valid_boolean, check_float)
check_valid_array, check_valid_boolean)
from simba.utils.data import find_frame_numbers_from_time_stamp
from simba.utils.errors import FFMPEGCodecGPUError, InvalidInputError
from simba.utils.enums import Formats
from simba.utils.errors import FFMPEGCodecGPUError, InvalidInputError
from simba.utils.printing import stdout_success
from simba.utils.read_write import (
check_if_hhmmss_timestamp_is_valid_part_of_video, get_fn_ext,
Expand Down

0 comments on commit 828ab76

Please sign in to comment.