Apply suggestion of @sgugger

huggingface · Jul 1, 2022 · 1a4cd38 · 1a4cd38
1 parent e298419
commit 1a4cd38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -86,7 +86,6 @@ jobs:
             - run: pip install tensorflow_probability
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
             - run: pip install git+https://github.com/huggingface/accelerate
-            - run: pip install ninja
             - save_cache:
                 key: v0.4-{{ checksum "setup.py" }}
                 paths:
@@ -127,7 +126,6 @@ jobs:
             - run: pip install tensorflow_probability
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
             - run: pip install git+https://github.com/huggingface/accelerate
-            - run: pip install ninja
             - save_cache:
                 key: v0.4-{{ checksum "setup.py" }}
                 paths:
@@ -161,7 +159,6 @@ jobs:
             - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
             - run: pip install git+https://github.com/huggingface/accelerate
-            - run: pip install ninja
             - save_cache:
                 key: v0.4-{{ checksum "setup.py" }}
                 paths:
@@ -200,7 +197,6 @@ jobs:
             - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
             - run: pip install git+https://github.com/huggingface/accelerate
-            - run: pip install ninja
             - save_cache:
                 key: v0.4-{{ checksum "setup.py" }}
                 paths:
@@ -233,7 +229,6 @@ jobs:
             - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
             - run: pip install git+https://github.com/huggingface/accelerate
-            - run: pip install ninja
             - save_cache:
                   key: v0.4-torch-{{ checksum "setup.py" }}
                   paths:
@@ -271,7 +266,6 @@ jobs:
             - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
             - run: pip install git+https://github.com/huggingface/accelerate
-            - run: pip install ninja
             - save_cache:
                   key: v0.4-torch-{{ checksum "setup.py" }}
                   paths:
@@ -436,7 +430,6 @@ jobs:
             - run: pip install .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm]
             - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
-            - run: pip install ninja
             - save_cache:
                   key: v0.4-torch-{{ checksum "setup.py" }}
                   paths:
@@ -474,7 +467,6 @@ jobs:
             - run: pip install .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm]
             - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html
             - run: pip install https://github.com/kpu/kenlm/archive/master.zip
-            - run: pip install ninja
             - save_cache:
                   key: v0.4-torch-{{ checksum "setup.py" }}
                   paths:

diff --git a/src/transformers/models/deformable_detr/modeling_deformable_detr.py b/src/transformers/models/deformable_detr/modeling_deformable_detr.py
@@ -34,6 +34,7 @@
     add_start_docstrings_to_model_forward,
     is_scipy_available,
     is_timm_available,
+    is_torch_cuda_available,
     is_vision_available,
     replace_return_docstrings,
     requires_backends,
@@ -46,7 +47,10 @@
 
 
 # Move this to not compile only when importing, this needs to happen later, like in __init__.
-MSDA = load_cuda_kernels()
+if is_torch_cuda_available():
+    MSDA = load_cuda_kernels()
+else:
+    MSDA = None
 
 
 class MultiScaleDeformableAttentionFunction(Function):