opensportslib 0.0.1.dev9__tar.gz → 0.0.1.dev11__tar.gz

{opensportslib-0.0.1.dev9/opensportslib.egg-info → opensportslib-0.0.1.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensportslib
-Version: 0.0.1.dev9
+Version: 0.0.1.dev11
 Summary: OpenSportsLib is the professional library, designed for advanced video understanding in sports. It provides state-of-the-art tools for action recognition, spotting, retrieval, and captioning, making it ideal for researchers, analysts, and developers working with sports video data.
 Author: Jeet Vora
 Requires-Python: >=3.12

{opensportslib-0.0.1.dev9 → opensportslib-0.0.1.dev11}/opensportslib/apis/localization.py

@@ -112,7 +112,7 @@ class LocalizationAPI:
             gpu=self.config.SYSTEM.GPU,
             default_args=data_obj_train.default_args,
         )
-        train_loader = data_obj_train.building_dataloader(dataset_Train, cfg=data_obj_train.cfg.dataloader, gpu=self.config.SYSTEM.GPU, dali=True)
+        train_loader = data_obj_train.building_dataloader(dataset_Train, cfg=data_obj_train.cfg.dataloader, gpu=self.config.SYSTEM.GPU, dali=self.config.dali)
         print(len(train_loader))
         # Valid
         data_obj_valid = build_dataset(self.config,split="valid")
@@ -121,7 +121,7 @@ class LocalizationAPI:
             gpu= self.config.SYSTEM.GPU,
             default_args=data_obj_valid.default_args,
         )
-        valid_loader = data_obj_valid.building_dataloader(dataset_Valid, cfg=data_obj_valid.cfg.dataloader, gpu=self.config.SYSTEM.GPU, dali=True)
+        valid_loader = data_obj_valid.building_dataloader(dataset_Valid, cfg=data_obj_valid.cfg.dataloader, gpu=self.config.SYSTEM.GPU, dali=self.config.dali)
         print(len(valid_loader))
 
         # Trainer
@@ -200,13 +200,13 @@ class LocalizationAPI:
                 gpu=self.config.SYSTEM.GPU,
                 default_args=data_obj_test.default_args,
             )
-            test_loader = data_obj_test.building_dataloader(dataset_Test, cfg=data_obj_test.cfg.dataloader, gpu=self.config.SYSTEM.GPU, dali=True)
+            test_loader = data_obj_test.building_dataloader(dataset_Test, cfg=data_obj_test.cfg.dataloader, gpu=self.config.SYSTEM.GPU, dali=self.config.dali)
             print(len(test_loader))
 
             # # Inference
             inferer = build_inferer(cfg=self.config.MODEL,
                                     model=self.model)
-            json_gz_file = inferer.infer(cfg=self.config, data=test_loader)
+            json_gz_file = inferer.infer(cfg=self.config, data=dataset_Test)
 
         #json_gz_file = self.config.DATA.test.results + ".recall.json.gz"
         json_gz_file = predictions if predictions else json_gz_file

{opensportslib-0.0.1.dev9 → opensportslib-0.0.1.dev11}/opensportslib/core/utils/video_processing.py

@@ -1,6 +1,10 @@
 import torch
 import numpy as np
 import math
+import random
+import torch.nn as nn
+import torchvision.transforms as T
+import torchvision.transforms.functional as F
 
 try:
     import decord
@@ -301,12 +305,6 @@ def get_remaining(data_len, batch_size):
     return (math.ceil(data_len / batch_size) * batch_size) - data_len
 
 
-import random
-import numpy as np
-import torch
-import torchvision.transforms as T
-import torchvision.transforms.functional as F
-
 class RandomHorizontalFlipFLow(nn.Module):
 
     def __init__(self, p=0.5):

{opensportslib-0.0.1.dev9 → opensportslib-0.0.1.dev11}/opensportslib/datasets/localization_dataset.py

@@ -16,7 +16,7 @@ import logging
 import tqdm
 from opensportslib.core.utils.default_args import get_default_args_dataset
 from opensportslib.core.utils.load_annotations import get_repartition_gpu
-from opensportslib.opensportslib.core.utils.video_processing import feats2clip, getChunks_anchors, getTimestampTargets, oneHotToShifts
+from opensportslib.core.utils.video_processing import feats2clip, getChunks_anchors, getTimestampTargets, oneHotToShifts
 from SoccerNet.Downloader import getListGames
 from SoccerNet.Downloader import SoccerNetDownloader
 from SoccerNet.Evaluation.utils import (
@@ -246,7 +246,7 @@ class LocalizationDataset(Dataset):
             num_workers=cfg.num_workers if gpu >= 0 else 0,
             pin_memory=cfg.pin_memory if gpu >= 0 else False,
             prefetch_factor=(
-                cfg.prefetch_factor if "prefetch_factor" in cfg.keys() else None
+                getattr(cfg, "prefetch_factor", None)
             ),
             worker_init_fn=worker_init_fn
         )
@@ -457,7 +457,7 @@ class ActionSpotDataset(Dataset):
         from opensportslib.core.utils.video_processing import _get_deferred_rgb_transform, _get_img_transforms
 
         self._src_file = label_file
-        self._labels = annotationstoe2eformat(
+        self._labels, self.task_name = annotationstoe2eformat(
             label_file, video_dir, input_fps, extract_fps, False
         )
         # self._labels = load_json(label_file)
@@ -491,17 +491,17 @@ class ActionSpotDataset(Dataset):
 
         self._mixup = mixup
 
+        self.IMAGENET_MEAN = IMAGENET_MEAN
+        self.IMAGENET_STD = IMAGENET_STD
+        self.TARGET_HEIGHT = TARGET_HEIGHT
+        self.TARGET_WIDTH = TARGET_WIDTH
         # Try to do defer the latter half of the transforms to the GPU
         self._gpu_transform = None
         if not is_eval and same_transform:
             if modality == "rgb":
                 print("=> Deferring some RGB transforms to the GPU!")
-                self._gpu_transform = _get_deferred_rgb_transform()
+                self._gpu_transform = _get_deferred_rgb_transform(self.IMAGENET_MEAN, self.IMAGENET_STD)
 
-        self.IMAGENET_MEAN = IMAGENET_MEAN
-        self.IMAGENET_STD = IMAGENET_STD
-        self.TARGET_HEIGHT = TARGET_HEIGHT
-        self.TARGET_WIDTH = TARGET_WIDTH
 
         crop_transform, img_transform = _get_img_transforms(
             self.IMAGENET_MEAN,
@@ -771,7 +771,7 @@ class ActionSpotVideoDataset(Dataset, DatasetVideoSharedMethods):
     
         self._src_file = label_file
         if label_file.endswith(".json"):
-            self._labels = annotationstoe2eformat(
+            self._labels, self.task_name = annotationstoe2eformat(
                 label_file, video_dir, input_fps, extract_fps, False
             )
             # self._labels = load_json(label_file)

{opensportslib-0.0.1.dev9 → opensportslib-0.0.1.dev11}/opensportslib/models/utils/litebase.py

@@ -4,9 +4,9 @@ import pytorch_lightning as pl
 import time
 from SoccerNet.Evaluation.utils import AverageMeter
 
-from oslactionspotting.core.loss.builder import build_criterion
-from oslactionspotting.core.scheduler.builder import build_scheduler
-from oslactionspotting.core.optimizer.builder import build_optimizer
+from opensportslib.core.loss.builder import build_criterion
+from opensportslib.core.scheduler.builder import build_scheduler
+from opensportslib.core.optimizer.builder import build_optimizer
 
 
 class LiteBaseModel(pl.LightningModule):

{opensportslib-0.0.1.dev9 → opensportslib-0.0.1.dev11/opensportslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opensportslib
-Version: 0.0.1.dev9
+Version: 0.0.1.dev11
 Summary: OpenSportsLib is the professional library, designed for advanced video understanding in sports. It provides state-of-the-art tools for action recognition, spotting, retrieval, and captioning, making it ideal for researchers, analysts, and developers working with sports video data.
 Author: Jeet Vora
 Requires-Python: >=3.12

{opensportslib-0.0.1.dev9 → opensportslib-0.0.1.dev11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opensportslib"
-version = "0.0.1.dev9"
+version = "0.0.1.dev11"
 description = "OpenSportsLib is the professional library, designed for advanced video understanding in sports. It provides state-of-the-art tools for action recognition, spotting, retrieval, and captioning, making it ideal for researchers, analysts, and developers working with sports video data."
 readme = "README.md"
 requires-python = ">=3.12"