SUMIN/HuggingFace_transformer
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix compatibility with 1.12 (#17925)

Browse Source 
* Fix compatibility with 1.12

* Remove pin from examples requirements

* Update torch scatter version

* Fix compatibility with 1.12

* Remove pin from examples requirements

* Update torch scatter version

* fix torch.onnx.symbolic_opset12 import

* Reject bad version

Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>
This commit is contained in:
Sylvain Gugger
2022-08-08 09:53:08 -04:00
committed by GitHub
parent 2fecde742d
commit 70b0d4e193
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@@ -83,7 +83,7 @@ jobs:
- run: git lfs install - run: git lfs install
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,tf-cpu,torch,testing,sentencepiece,torch-speech,vision] - run: pip install .[sklearn,tf-cpu,torch,testing,sentencepiece,torch-speech,vision]
- run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install tensorflow_probability - run: pip install tensorflow_probability
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- run: pip install git+https://github.com/huggingface/accelerate - run: pip install git+https://github.com/huggingface/accelerate
@@ -124,7 +124,7 @@ jobs:
- run: git lfs install - run: git lfs install
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,tf-cpu,torch,testing,sentencepiece,torch-speech,vision] - run: pip install .[sklearn,tf-cpu,torch,testing,sentencepiece,torch-speech,vision]
- run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install tensorflow_probability - run: pip install tensorflow_probability
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- run: pip install git+https://github.com/huggingface/accelerate - run: pip install git+https://github.com/huggingface/accelerate
@@ -159,7 +159,7 @@ jobs:
- run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,flax,torch,testing,sentencepiece,torch-speech,vision] - run: pip install .[sklearn,flax,torch,testing,sentencepiece,torch-speech,vision]
- run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- run: pip install git+https://github.com/huggingface/accelerate - run: pip install git+https://github.com/huggingface/accelerate
- save_cache: - save_cache:
@@ -198,7 +198,7 @@ jobs:
- run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,flax,torch,testing,sentencepiece,torch-speech,vision] - run: pip install .[sklearn,flax,torch,testing,sentencepiece,torch-speech,vision]
- run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.11.0+cpu.html - run: pip install torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- run: pip install git+https://github.com/huggingface/accelerate - run: pip install git+https://github.com/huggingface/accelerate
- save_cache: - save_cache:
@@ -231,7 +231,7 @@ jobs:
- run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng time - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng time
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm] - 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 torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- run: pip install git+https://github.com/huggingface/accelerate - run: pip install git+https://github.com/huggingface/accelerate
- save_cache: - save_cache:
@@ -269,7 +269,7 @@ jobs:
- run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm] - 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 torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- run: pip install git+https://github.com/huggingface/accelerate - run: pip install git+https://github.com/huggingface/accelerate
- save_cache: - save_cache:
@@ -439,7 +439,7 @@ jobs:
- run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm] - 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 torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- save_cache: - save_cache:
key: v0.5-torch-{{ checksum "setup.py" }} key: v0.5-torch-{{ checksum "setup.py" }}
@@ -477,7 +477,7 @@ jobs:
- run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng - run: sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng
- run: pip install --upgrade pip - run: pip install --upgrade pip
- run: pip install .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm] - 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 torch-scatter -f https://pytorch-geometric.com/whl/torch-1.12.0+cpu.html
- run: pip install https://github.com/kpu/kenlm/archive/master.zip - run: pip install https://github.com/kpu/kenlm/archive/master.zip
- save_cache: - save_cache:
key: v0.5-torch-{{ checksum "setup.py" }} key: v0.5-torch-{{ checksum "setup.py" }}

1
examples/pytorch/_tests_requirements.txt
View File

@@ -22,5 +22,4 @@ protobuf
torchvision torchvision
jiwer jiwer
librosa librosa
torch < 1.12
evaluate >= 0.2.0 evaluate >= 0.2.0

2
setup.py
View File

@@ -162,7 +162,7 @@ _deps = [
"timeout-decorator", "timeout-decorator",
"timm", "timm",
"tokenizers>=0.11.1,!=0.11.3,<0.13", "tokenizers>=0.11.1,!=0.11.3,<0.13",
"torch>=1.0,<1.12", "torch>=1.0,!=0.12.0",
"torchaudio", "torchaudio",
"pyctcdecode>=0.3.0", "pyctcdecode>=0.3.0",
"tqdm>=4.27", "tqdm>=4.27",

2
src/transformers/dependency_versions_table.py
View File

@@ -68,7 +68,7 @@ deps = {
"timeout-decorator": "timeout-decorator", "timeout-decorator": "timeout-decorator",
"timm": "timm", "timm": "timm",
"tokenizers": "tokenizers>=0.11.1,!=0.11.3,<0.13", "tokenizers": "tokenizers>=0.11.1,!=0.11.3,<0.13",
"torch": "torch>=1.0,<1.12", "torch": "torch>=1.0,!=0.12.0",
"torchaudio": "torchaudio", "torchaudio": "torchaudio",
"pyctcdecode": "pyctcdecode>=0.3.0", "pyctcdecode": "pyctcdecode>=0.3.0",
"tqdm": "tqdm>=4.27", "tqdm": "tqdm>=4.27",

4
src/transformers/models/deberta/modeling_deberta.py
View File

@@ -187,6 +187,8 @@ class XDropout(torch.autograd.Function):
@staticmethod @staticmethod
def symbolic(g: torch._C.Graph, input: torch._C.Value, local_ctx: Union[float, DropoutContext]) -> torch._C.Value: def symbolic(g: torch._C.Graph, input: torch._C.Value, local_ctx: Union[float, DropoutContext]) -> torch._C.Value:
from torch.onnx import symbolic_opset12
dropout_p = local_ctx dropout_p = local_ctx
if isinstance(local_ctx, DropoutContext): if isinstance(local_ctx, DropoutContext):
dropout_p = local_ctx.dropout dropout_p = local_ctx.dropout
@@ -198,7 +200,7 @@ class XDropout(torch.autograd.Function):
# Once https://github.com/pytorch/pytorch/issues/78391 is fixed, do something like: # Once https://github.com/pytorch/pytorch/issues/78391 is fixed, do something like:
# if opset_version < 12: # if opset_version < 12:
# return torch.onnx.symbolic_opset9.dropout(g, input, dropout_p, train) # return torch.onnx.symbolic_opset9.dropout(g, input, dropout_p, train)
return torch.onnx.symbolic_opset12.dropout(g, input, dropout_p, train) return symbolic_opset12.dropout(g, input, dropout_p, train)
class StableDropout(nn.Module): class StableDropout(nn.Module):

4
src/transformers/models/deberta_v2/modeling_deberta_v2.py
View File

@@ -193,6 +193,8 @@ class XDropout(torch.autograd.Function):
@staticmethod @staticmethod
def symbolic(g: torch._C.Graph, input: torch._C.Value, local_ctx: Union[float, DropoutContext]) -> torch._C.Value: def symbolic(g: torch._C.Graph, input: torch._C.Value, local_ctx: Union[float, DropoutContext]) -> torch._C.Value:
from torch.onnx import symbolic_opset12
dropout_p = local_ctx dropout_p = local_ctx
if isinstance(local_ctx, DropoutContext): if isinstance(local_ctx, DropoutContext):
dropout_p = local_ctx.dropout dropout_p = local_ctx.dropout
@@ -204,7 +206,7 @@ class XDropout(torch.autograd.Function):
# Once https://github.com/pytorch/pytorch/issues/78391 is fixed, do something like: # Once https://github.com/pytorch/pytorch/issues/78391 is fixed, do something like:
# if opset_version < 12: # if opset_version < 12:
# return torch.onnx.symbolic_opset9.dropout(g, input, dropout_p, train) # return torch.onnx.symbolic_opset9.dropout(g, input, dropout_p, train)
return torch.onnx.symbolic_opset12.dropout(g, input, dropout_p, train) return symbolic_opset12.dropout(g, input, dropout_p, train)
# Copied from transformers.models.deberta.modeling_deberta.StableDropout # Copied from transformers.models.deberta.modeling_deberta.StableDropout

4
src/transformers/models/sew_d/modeling_sew_d.py
View File

@@ -597,6 +597,8 @@ class XDropout(torch.autograd.Function):
@staticmethod @staticmethod
def symbolic(g: torch._C.Graph, input: torch._C.Value, local_ctx: Union[float, DropoutContext]) -> torch._C.Value: def symbolic(g: torch._C.Graph, input: torch._C.Value, local_ctx: Union[float, DropoutContext]) -> torch._C.Value:
from torch.onnx import symbolic_opset12
dropout_p = local_ctx dropout_p = local_ctx
if isinstance(local_ctx, DropoutContext): if isinstance(local_ctx, DropoutContext):
dropout_p = local_ctx.dropout dropout_p = local_ctx.dropout
@@ -608,7 +610,7 @@ class XDropout(torch.autograd.Function):
# Once https://github.com/pytorch/pytorch/issues/78391 is fixed, do something like: # Once https://github.com/pytorch/pytorch/issues/78391 is fixed, do something like:
# if opset_version < 12: # if opset_version < 12:
# return torch.onnx.symbolic_opset9.dropout(g, input, dropout_p, train) # return torch.onnx.symbolic_opset9.dropout(g, input, dropout_p, train)
return torch.onnx.symbolic_opset12.dropout(g, input, dropout_p, train) return symbolic_opset12.dropout(g, input, dropout_p, train)
# Copied from transformers.models.deberta.modeling_deberta.StableDropout # Copied from transformers.models.deberta.modeling_deberta.StableDropout