Skip to content

Commit 95c74be

Browse files
christinadionysioBaunsgaard
authored andcommitted
[MINOR] add correct python dependencies
This commit fixes the python dependencies to support scuro. Closes #2117
1 parent 7d9230b commit 95c74be

File tree

9 files changed

+43
-17
lines changed

9 files changed

+43
-17
lines changed

.github/workflows/python.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,20 @@ jobs:
100100
pip install --upgrade pip
101101
pip install --upgrade pip
102102
pip install wheel
103-
pip install numpy py4j scipy scikit-learn keras requests pandas unittest-parallel
103+
pip install \
104+
numpy \
105+
py4j \
106+
scipy \
107+
scikit-learn \
108+
requests \
109+
pandas \
110+
unittest-parallel \
111+
torchvision \
112+
transformers \
113+
opencv-python \
114+
torch \
115+
librosa \
116+
h5py
104117
105118
- name: Build Python Package
106119
run: |

src/main/python/systemds/scuro/representations/average.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import numpy as np
2525

2626
from systemds.scuro.modality.modality import Modality
27-
from keras.api.preprocessing.sequence import pad_sequences
27+
from systemds.scuro.representations.utils import pad_sequences
2828

2929
from systemds.scuro.representations.fusion import Fusion
3030

@@ -41,7 +41,7 @@ def fuse(self, modalities: List[Modality]):
4141

4242
padded_modalities = []
4343
for modality in modalities:
44-
d = pad_sequences(modality.data, maxlen=max_emb_size, dtype='float32', padding='post')
44+
d = pad_sequences(modality.data, maxlen=max_emb_size, dtype='float32')
4545
padded_modalities.append(d)
4646

4747
data = padded_modalities[0]

src/main/python/systemds/scuro/representations/concatenation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import numpy as np
2525

2626
from systemds.scuro.modality.modality import Modality
27-
from keras.api.preprocessing.sequence import pad_sequences
27+
from systemds.scuro.representations.utils import pad_sequences
2828

2929
from systemds.scuro.representations.fusion import Fusion
3030

@@ -51,7 +51,7 @@ def fuse(self, modalities: List[Modality]):
5151

5252
for modality in modalities:
5353
if self.padding:
54-
data = np.concatenate([data, pad_sequences(modality.data, maxlen=max_emb_size, dtype='float32', padding='post')], axis=-1)
54+
data = np.concatenate([data, pad_sequences(modality.data, maxlen=max_emb_size, dtype='float32')], axis=-1)
5555
else:
5656
data = np.concatenate([data, modality.data], axis=-1)
5757

src/main/python/systemds/scuro/representations/max.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import numpy as np
2525

2626
from systemds.scuro.modality.modality import Modality
27-
from keras.preprocessing.sequence import pad_sequences
27+
from systemds.scuro.representations.utils import pad_sequences
2828

2929
from systemds.scuro.representations.fusion import Fusion
3030

@@ -46,7 +46,7 @@ def fuse(self, modalities: List[Modality],):
4646

4747
padded_modalities = []
4848
for modality in modalities:
49-
d = pad_sequences(modality.data, maxlen=max_emb_size, dtype='float32', padding='post')
49+
d = pad_sequences(modality.data, maxlen=max_emb_size, dtype='float32')
5050
padded_modalities.append(d)
5151

5252
split_rows = int(len(modalities[0].data) / self.split)

src/main/python/systemds/scuro/representations/mel_spectrogram.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import librosa
2626
import numpy as np
27-
from keras.src.utils import pad_sequences
27+
from systemds.scuro.representations.utils import pad_sequences
2828

2929
from systemds.scuro.representations.unimodal import UnimodalRepresentation
3030

@@ -51,7 +51,7 @@ def parse_all(self, file_path, indices, get_sequences=False):
5151

5252
r = []
5353
for elem in result:
54-
d = pad_sequences(elem, maxlen=max_length, dtype='float32', padding='post')
54+
d = pad_sequences(elem, maxlen=max_length, dtype='float32')
5555
r.append(d)
5656

5757
np_array_r = np.array(r) if not self.avg else np.mean(np.array(r), axis=1)

src/main/python/systemds/scuro/representations/multiplication.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import numpy as np
2525

2626
from systemds.scuro.modality.modality import Modality
27-
from keras.preprocessing.sequence import pad_sequences
27+
from systemds.scuro.representations.utils import pad_sequences
2828

2929
from systemds.scuro.representations.fusion import Fusion
3030

@@ -39,10 +39,10 @@ def __init__(self):
3939
def fuse(self, modalities: List[Modality], train_indices=None):
4040
max_emb_size = self.get_max_embedding_size(modalities)
4141

42-
data = pad_sequences(modalities[0].data, maxlen=max_emb_size, dtype='float32', padding='post')
42+
data = pad_sequences(modalities[0].data, maxlen=max_emb_size, dtype='float32')
4343

4444
for m in range(1, len(modalities)):
4545
# scaled = self.scale_data(modalities[m].data, train_indices)
46-
data = np.multiply(data, pad_sequences(modalities[m].data, maxlen=max_emb_size, dtype='float32', padding='post'))
46+
data = np.multiply(data, pad_sequences(modalities[m].data, maxlen=max_emb_size, dtype='float32'))
4747

4848
return data

src/main/python/systemds/scuro/representations/rowmax.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import numpy as np
2525

2626
from modality.modality import Modality
27-
from keras.api.preprocessing.sequence import pad_sequences
27+
from systemds.scuro.representations.utils import pad_sequences
2828

2929
from representations.fusion import Fusion
3030

@@ -47,7 +47,7 @@ def fuse(self, modalities: List[Modality], train_indices):
4747
padded_modalities = []
4848
for modality in modalities:
4949
scaled = self.scale_data(modality.data, train_indices)
50-
d = pad_sequences(scaled, maxlen=max_emb_size, dtype='float32', padding='post')
50+
d = pad_sequences(scaled, maxlen=max_emb_size, dtype='float32')
5151
padded_modalities.append(d)
5252

5353
split_rows = int(len(modalities[0].data) / self.split)

src/main/python/systemds/scuro/representations/sum.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424

2525
from systemds.scuro.modality.modality import Modality
26-
from keras.preprocessing.sequence import pad_sequences
26+
from systemds.scuro.representations.utils import pad_sequences
2727

2828
from systemds.scuro.representations.fusion import Fusion
2929

@@ -38,9 +38,9 @@ def __init__(self):
3838
def fuse(self, modalities: List[Modality]):
3939
max_emb_size = self.get_max_embedding_size(modalities)
4040

41-
data = pad_sequences(modalities[0].data, maxlen=max_emb_size, dtype='float32', padding='post')
41+
data = pad_sequences(modalities[0].data, maxlen=max_emb_size, dtype='float32')
4242

4343
for m in range(1, len(modalities)):
44-
data += pad_sequences(modalities[m].data, maxlen=max_emb_size, dtype='float32', padding='post')
44+
data += pad_sequences(modalities[m].data, maxlen=max_emb_size, dtype='float32')
4545

4646
return data

src/main/python/systemds/scuro/representations/utils.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,16 @@ def __init__(self):
9393
def parse_all(self, filepath, indices):
9494
with open(filepath) as file:
9595
return json.load(file)
96+
97+
98+
def pad_sequences(sequences, maxlen=None, dtype='float32', value=0):
99+
if maxlen is None:
100+
maxlen = max([len(seq) for seq in sequences])
101+
102+
result = np.full((len(sequences), maxlen), value, dtype=dtype)
103+
104+
for i, seq in enumerate(sequences):
105+
data = seq[:maxlen]
106+
result[i, :len(data)] = data
107+
108+
return result

0 commit comments

Comments
 (0)