Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	simba/third_party_label_appenders/tools.py
#	simba/utils/read_write.py
  • Loading branch information
sronilsson committed Aug 29, 2024
2 parents 32ac2b3 + 5fd7cb1 commit 1ec324a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion simba/data_processors/cuda/convex_hull.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
__author__ = "Simon Nilsson"
__email__ = "[email protected]"

from numba import cuda, njit
import numpy as np
from numba import cuda, njit

THREADS_PER_BLOCK = 128

Expand Down
4 changes: 3 additions & 1 deletion simba/data_processors/cuda/convex_hull_area.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from typing import Optional

import cupy as cp
import numpy as np

from simba.utils.checks import check_float, check_valid_array
import numpy as np
from simba.utils.enums import Formats


def poly_area(data: np.ndarray,
pixels_per_mm: Optional[float] = 1.0,
batch_size: Optional[int] = int(0.5e+7)) -> np.ndarray:
Expand Down
17 changes: 12 additions & 5 deletions simba/third_party_label_appenders/BENTO_appender.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,23 @@
import glob
import os
from copy import deepcopy
import pandas as pd
from typing import Union, Dict, Optional
from typing import Dict, Optional, Union

import numpy as np
import pandas as pd

from simba.mixins.config_reader import ConfigReader
from simba.utils.checks import check_if_filepath_list_is_empty, check_if_dir_exists, check_all_file_names_are_represented_in_video_log
from simba.utils.checks import (
check_all_file_names_are_represented_in_video_log, check_if_dir_exists,
check_if_filepath_list_is_empty)
from simba.utils.errors import NoFilesFoundError
from simba.utils.printing import stdout_success
from simba.utils.read_write import get_fn_ext, read_df, write_df, find_files_of_filetypes_in_directory, bento_file_reader
from simba.utils.warnings import (ThirdPartyAnnotationsClfMissingWarning, ThirdPartyAnnotationsOutsidePoseEstimationDataWarning)
from simba.utils.read_write import (bento_file_reader,
find_files_of_filetypes_in_directory,
get_fn_ext, read_df, write_df)
from simba.utils.warnings import (
ThirdPartyAnnotationsClfMissingWarning,
ThirdPartyAnnotationsOutsidePoseEstimationDataWarning)


class BentoAppender(ConfigReader):
Expand Down

0 comments on commit 1ec324a

Please sign in to comment.