Skip to content

Commit c8d5460

Browse files
[SYSTEMDS-3887] Rework Scuro Optimizers
This patch adds a reworked version of the unimodal and multimodal optimizer and the hyperparameter tuner.
1 parent 4fb9ee2 commit c8d5460

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1833
-1925
lines changed

.github/workflows/python.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,23 @@ jobs:
155155
156156
- name: Run Scuro Python Tests
157157
if: ${{ matrix.test_mode == 'scuro' }}
158+
env:
159+
TORCH_HOME: ${{ github.workspace }}/.torch
158160
run: |
161+
( while true; do echo "."; sleep 25; done ) &
162+
KA=$!
163+
pip install --upgrade pip wheel setuptools
164+
# Use CUDA 12.1 wheels to avoid slow/source builds
165+
pip install --extra-index-url https://download.pytorch.org/whl/cu121 \
166+
torch==2.4.1 torchvision==0.19.1
159167
pip install \
160-
torchvision \
161168
transformers \
162169
opencv-python \
163-
torch \
164170
librosa \
165171
h5py \
166172
gensim \
167173
opt-einsum \
168174
nltk
175+
kill $KA
169176
cd src/main/python
170-
python -m unittest discover -s tests/scuro -p 'test_*.py'
171-
172-
177+
python -m unittest discover -s tests/scuro -p 'test_*.py' -v

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,13 @@
6767
from systemds.scuro.modality.joined import JoinedModality
6868
from systemds.scuro.modality.joined_transformed import JoinedTransformedModality
6969
from systemds.scuro.modality.modality import Modality
70-
from systemds.scuro.modality.modality_identifier import ModalityIdentifier
70+
from systemds.scuro.utils.identifier import Identifier
7171
from systemds.scuro.modality.transformed import TransformedModality
7272
from systemds.scuro.modality.type import ModalityType
7373
from systemds.scuro.modality.unimodal_modality import UnimodalModality
74-
from systemds.scuro.drsearch.dr_search import DRSearch
7574
from systemds.scuro.drsearch.task import Task
76-
from systemds.scuro.drsearch.fusion_optimizer import FusionOptimizer
7775
from systemds.scuro.drsearch.operator_registry import Registry
7876
from systemds.scuro.drsearch.optimization_data import OptimizationData
79-
from systemds.scuro.drsearch.representation_cache import RepresentationCache
80-
from systemds.scuro.drsearch.unimodal_representation_optimizer import (
81-
UnimodalRepresentationOptimizer,
82-
)
8377
from systemds.scuro.representations.covarep_audio_features import (
8478
RMSE,
8579
Spectral,
@@ -131,17 +125,13 @@
131125
"JoinedModality",
132126
"JoinedTransformedModality",
133127
"Modality",
134-
"ModalityIdentifier",
128+
"Identifier",
135129
"TransformedModality",
136130
"ModalityType",
137131
"UnimodalModality",
138-
"DRSearch",
139132
"Task",
140-
"FusionOptimizer",
141133
"Registry",
142134
"OptimizationData",
143-
"RepresentationCache",
144-
"UnimodalRepresentationOptimizer",
145135
"UnimodalOptimizer",
146136
"MultimodalOptimizer",
147137
"ZeroCrossing",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ def _load(self, indices: List[str]):
127127
if isinstance(file_names, str):
128128
self.extract(file_names, indices)
129129
else:
130-
for file_name in file_names:
131-
self.extract(file_name)
130+
for i, file_name in enumerate(file_names):
131+
self.extract(file_name, indices[i])
132132

133133
return self.data, self.metadata
134134

src/main/python/systemds/scuro/drsearch/dr_search.py

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)