Bugfix/alexsherstinsky/fix none check for attention factor in rope scaling 2024 08 28 0

src/transformers/modeling_rope_utils.py

@@ -487,10 +487,11 @@ def _validate_longrope_parameters(config: PretrainedConfig):
             logger.warning(f"`rope_scaling`'s factor field must be a float >= 1, got {factor}")
 
         attention_factor = rope_scaling.get("attention_factor")
-        if attention_factor is not None and not isinstance(attention_factor, float) or attention_factor < 0:
-            logger.warning(
-                f"`rope_scaling`'s attention_factor field must be a float greater than 0, got {attention_factor}"
-            )
+        if attention_factor is not None:
+            if not isinstance(attention_factor, float) or attention_factor < 0.0:
+                logger.warning(
+                    f"`rope_scaling`'s attention_factor field must be a float greater than 0, got {attention_factor}"
+                )
 
 
 def _validate_llama3_parameters(config: PretrainedConfig):

tests/utils/test_modeling_rope_utils.py

@@ -330,6 +330,16 @@ def test_longrope_rope_numerically(self):
             _, attention_scale = rope_fn(config=config, device=torch_device, seq_len=1)
             self.assertEqual(attention_scale, 0.5)
 
+            config.rope_scaling = {
+                "rope_type": "longrope",
+                "factor": factor,
+                "short_factor": short_factor,
+                "long_factor": long_factor,
+            }
+            self.assertEqual(config.rope_scaling.get("attention_factor"), None)
+            # Verify that "TypeError: '<' not supported between instances of 'NoneType' and 'int'" is not raised.
+            rope_config_validation(config)
+
         # Check 2: Factor == 1.0 -> short factor is applied to the default frequencies
         factor = 1.0
         config.rope_scaling = {