🧲 Use our own require_bitsandbytes (#2370)

* use our own require_bitsandbytes

* rephrase

tests/slow/test_dpo_slow.py

@@ -21,11 +21,12 @@
 from datasets import load_dataset
 from parameterized import parameterized
 from transformers import AutoModelForCausalLM, AutoTokenizer, BitsAndBytesConfig
-from transformers.testing_utils import require_bitsandbytes, require_peft, require_torch_accelerator, torch_device
+from transformers.testing_utils import require_peft, require_torch_accelerator, torch_device
 from transformers.utils import is_peft_available
 
 from trl import DPOConfig, DPOTrainer
 
+from ..testing_utils import require_bitsandbytes
 from .testing_constants import DPO_LOSS_TYPES, DPO_PRECOMPUTE_LOGITS, GRADIENT_CHECKPOINTING_KWARGS, MODELS_TO_TEST
 
 

tests/slow/test_sft_slow.py

@@ -22,7 +22,6 @@
 from parameterized import parameterized
 from transformers import AutoModelForCausalLM, AutoTokenizer, BitsAndBytesConfig
 from transformers.testing_utils import (
-    require_bitsandbytes,
     require_liger_kernel,
     require_peft,
     require_torch_accelerator,
@@ -33,6 +32,7 @@
 from trl import SFTConfig, SFTTrainer
 from trl.models.utils import setup_chat_format
 
+from ..testing_utils import require_bitsandbytes
 from .testing_constants import DEVICE_MAP_OPTIONS, GRADIENT_CHECKPOINTING_KWARGS, MODELS_TO_TEST, PACKING_OPTIONS
 
 

tests/test_dpo_trainer.py

@@ -29,16 +29,11 @@
     PreTrainedTokenizerBase,
     is_vision_available,
 )
-from transformers.testing_utils import (
-    require_bitsandbytes,
-    require_peft,
-    require_torch_gpu_if_bnb_not_multi_backend_enabled,
-    require_vision,
-)
+from transformers.testing_utils import require_peft, require_torch_gpu_if_bnb_not_multi_backend_enabled, require_vision
 
 from trl import DPOConfig, DPOTrainer, FDivergenceType
 
-from .testing_utils import require_no_wandb
+from .testing_utils import require_bitsandbytes, require_no_wandb
 
 
 if is_vision_available():

tests/testing_utils.py

@@ -14,11 +14,20 @@
 import random
 import unittest
 
-from transformers import is_sklearn_available, is_wandb_available
+from transformers import is_bitsandbytes_available, is_sklearn_available, is_wandb_available
 
 from trl import BaseBinaryJudge, BasePairwiseJudge, is_diffusers_available, is_llm_blender_available
 
 
+# transformers.testing_utils contains a require_bitsandbytes function, but relies on pytest markers which we don't use
+# in our test suite. We therefore need to implement our own version of this function.
+def require_bitsandbytes(test_case):
+    """
+    Decorator marking a test that requires bitsandbytes. Skips the test if bitsandbytes is not available.
+    """
+    return unittest.skipUnless(is_bitsandbytes_available(), "test requires bitsandbytes")(test_case)
+
+
 def require_diffusers(test_case):
     """
     Decorator marking a test that requires diffusers. Skips the test if diffusers is not available.