diff --git a/models/Model_Quick96/Model.py b/models/Model_Quick96/Model.py index a03d673..a215cb5 100644 --- a/models/Model_Quick96/Model.py +++ b/models/Model_Quick96/Model.py @@ -319,7 +319,7 @@ class QModel(ModelBase): DM = D[i]*target_dstm[i] if filenames is not None and len(filenames) > 0: SM = label_face_filename(SM, filenames[0][i]) - DM = label_face_filename(DM, filenames[0][i]) + DM = label_face_filename(DM, filenames[1][i]) ar = SM, SS[i], DM, DD[i]*DDM[i], SD[i]*(DDM[i]*SDM[i]) st_m.append ( np.concatenate ( ar, axis=1) ) diff --git a/models/Model_SAEHD/Model.py b/models/Model_SAEHD/Model.py index 817ce9d..51569ed 100644 --- a/models/Model_SAEHD/Model.py +++ b/models/Model_SAEHD/Model.py @@ -994,7 +994,7 @@ class SAEHDModel(ModelBase): DM = D[i]*target_dstm[i] if filenames is not None and len(filenames) > 0: SM = label_face_filename(SM, filenames[0][i]) - DM = label_face_filename(DM, filenames[0][i]) + DM = label_face_filename(DM, filenames[1][i]) ar = SM, SS[i]*SSM[i], DM, DD[i]*DDM[i], SD[i]*SD_mask st_m.append ( np.concatenate ( ar, axis=1) ) diff --git a/samplelib/SampleGeneratorFace.py b/samplelib/SampleGeneratorFace.py index 68229c2..d7dec3a 100644 --- a/samplelib/SampleGeneratorFace.py +++ b/samplelib/SampleGeneratorFace.py @@ -115,9 +115,9 @@ class SampleGeneratorFace(SampleGeneratorBase): samples, index_host, ct_samples, ct_index_host = param bs = self.batch_size - filenames = [] while True: batches = None + filenames = [] indexes = index_host.multi_get(bs) ct_indexes = ct_index_host.multi_get(bs) if ct_samples is not None else None