[SYSTEMDS-3887] Rework Scuro Optimizers

.github/workflows/python.yml

@@ -155,18 +155,23 @@ jobs:
 
     - name: Run Scuro Python Tests 
       if: ${{ matrix.test_mode == 'scuro' }}
+      env:
+        TORCH_HOME: ${{ github.workspace }}/.torch
       run: |
+        ( while true; do echo "."; sleep 25; done ) &
+        KA=$!
+        pip install --upgrade pip wheel setuptools
+        # Use CUDA 12.1 wheels to avoid slow/source builds
+        pip install --extra-index-url https://download.pytorch.org/whl/cu121 \
+          torch==2.4.1 torchvision==0.19.1
         pip install \
-          torchvision \
           transformers \
           opencv-python \
-          torch \
           librosa \
           h5py \
           gensim \
           opt-einsum \
           nltk
+        kill $KA 
         cd src/main/python
-        python -m unittest discover -s tests/scuro -p 'test_*.py'
-
-
+        python -m unittest discover -s tests/scuro -p 'test_*.py' -v

src/main/python/systemds/scuro/__init__.py

@@ -67,19 +67,13 @@
 from systemds.scuro.modality.joined import JoinedModality
 from systemds.scuro.modality.joined_transformed import JoinedTransformedModality
 from systemds.scuro.modality.modality import Modality
-from systemds.scuro.modality.modality_identifier import ModalityIdentifier
+from systemds.scuro.utils.identifier import Identifier
 from systemds.scuro.modality.transformed import TransformedModality
 from systemds.scuro.modality.type import ModalityType
 from systemds.scuro.modality.unimodal_modality import UnimodalModality
-from systemds.scuro.drsearch.dr_search import DRSearch
 from systemds.scuro.drsearch.task import Task
-from systemds.scuro.drsearch.fusion_optimizer import FusionOptimizer
 from systemds.scuro.drsearch.operator_registry import Registry
 from systemds.scuro.drsearch.optimization_data import OptimizationData
-from systemds.scuro.drsearch.representation_cache import RepresentationCache
-from systemds.scuro.drsearch.unimodal_representation_optimizer import (
-    UnimodalRepresentationOptimizer,
-)
 from systemds.scuro.representations.covarep_audio_features import (
     RMSE,
     Spectral,
@@ -131,17 +125,13 @@
     "JoinedModality",
     "JoinedTransformedModality",
     "Modality",
-    "ModalityIdentifier",
+    "Identifier",
     "TransformedModality",
     "ModalityType",
     "UnimodalModality",
-    "DRSearch",
     "Task",
-    "FusionOptimizer",
     "Registry",
     "OptimizationData",
-    "RepresentationCache",
-    "UnimodalRepresentationOptimizer",
     "UnimodalOptimizer",
     "MultimodalOptimizer",
     "ZeroCrossing",

src/main/python/systemds/scuro/dataloader/base_loader.py

@@ -127,8 +127,8 @@ def _load(self, indices: List[str]):
         if isinstance(file_names, str):
             self.extract(file_names, indices)
         else:
-            for file_name in file_names:
-                self.extract(file_name)
+            for i, file_name in enumerate(file_names):
+                self.extract(file_name, indices[i])
 
         return self.data, self.metadata