diff --git a/combo/main.py b/combo/main.py index 6a1ac4b81d0237f526161b96ef24b7ff57bd2c85..36c9f688ad08fa4a3fe05be29db71843022c1bbb 100755 --- a/combo/main.py +++ b/combo/main.py @@ -12,7 +12,7 @@ from combo.predictors import Predictor from combo.training.trainable_combo import TrainableCombo from combo.utils import checks -from config import Registry, resolve +from config import resolve from models import ComboModel from predict import COMBO diff --git a/combo/modules/model.py b/combo/modules/model.py index e62bead90ced69abdc505baa8140bb67fd175afe..694c86df29dd9b05d0c2f9e7de61f982e8bcd02f 100644 --- a/combo/modules/model.py +++ b/combo/modules/model.py @@ -478,26 +478,6 @@ class Model(Module, FromParameters): model.extend_embedder_vocab() return model - @classmethod - @overrides - def from_parameters(cls, - parameters: Dict[str, Any] = None, - constructor_method_name: str = None, - pass_down_parameters: Dict[str, Any] = None): - constructed_model = super().from_parameters(parameters) - constructed_model.load_state_dict(torch.load(parameters['weights'])) - return constructed_model - - @overrides - def serialize(self, pass_down_parameter_names: List[str] = None) -> Dict[str, Any]: - vocabulary_dir = os.path.join(self.serialization_dir, 'vocabulary') - self.vocab._serialization_dir = vocabulary_dir - weights_path = os.path.join(self.serialization_dir, 'weights.pth') - torch.save(self.state_dict(), weights_path) - serialized_model = super().serialize() - serialized_model['parameters']['weights'] = weights_path - return serialized_model - def remove_weights_related_keys_from_params( params: Params, keys: List[str] = ["pretrained_file", "initializer"]