From 6bb1bf58ce41d3b3ba4e4a8597c268d2a6b646ef Mon Sep 17 00:00:00 2001 From: Irene Dea Date: Mon, 5 Feb 2024 17:06:50 -0800 Subject: [PATCH] Fix merge --- llmfoundry/models/mpt/configuration_mpt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llmfoundry/models/mpt/configuration_mpt.py b/llmfoundry/models/mpt/configuration_mpt.py index ec0de01fe3..a2e721a26a 100644 --- a/llmfoundry/models/mpt/configuration_mpt.py +++ b/llmfoundry/models/mpt/configuration_mpt.py @@ -19,9 +19,9 @@ # isort: off from llmfoundry.models.layers.fc import FC_CLASS_REGISTRY # type: ignore (see note) from llmfoundry.models.layers.norm import LPLayerNorm # type: ignore (see note) -from llmfoundry.models.layers.ffn import FFN_CLASS_REGISTRY +from llmfoundry.models.layers.ffn import FFN_CLASS_REGISTRY # type: ignore (see note) -from llmfoundry.utils.warnings import VersionedDeprecationWarning # type: ignore (see note) +from llmfoundry.utils.warnings import VersionedDeprecationWarning ffn_config_defaults: Dict = { 'ffn_type': 'mptmlp',