import packaging to be compatible with setuptools==70.0.0 (#449)

JamieMartin · Jamie · jongwook · web-flow · commit dcba3cb2e282 · 2024-06-05T04:47:22.000+09:00
* import packaging to be compatible with setuptools==70.0.0

* importing the version module

---------

Co-authored-by: Jamie &lt;Jamie@Alexandras-MacBook-Pro.local&gt;
Co-authored-by: Jong Wook Kim &lt;jongwook@nyu.edu&gt;
diff --git a/clip/clip.py b/clip/clip.py
@@ -2,8 +2,8 @@
 import os
 import urllib
 import warnings
-from typing import Any, Union, List
-from pkg_resources import packaging
+from packaging import version
+from typing import Union, List
 
 import torch
 from PIL import Image
@@ -20,7 +20,7 @@
     BICUBIC = Image.BICUBIC
 
 
-if packaging.version.parse(torch.__version__) < packaging.version.parse("1.7.1"):
+if version.parse(torch.__version__) < version.parse("1.7.1"):
     warnings.warn("PyTorch version 1.7.1 or higher is recommended")
 
 
@@ -228,7 +228,7 @@ def tokenize(texts: Union[str, List[str]], context_length: int = 77, truncate: b
     sot_token = _tokenizer.encoder["<|startoftext|>"]
     eot_token = _tokenizer.encoder["<|endoftext|>"]
     all_tokens = [[sot_token] + _tokenizer.encode(text) + [eot_token] for text in texts]
-    if packaging.version.parse(torch.__version__) < packaging.version.parse("1.8.0"):
+    if version.parse(torch.__version__) < version.parse("1.8.0"):
         result = torch.zeros(len(all_tokens), context_length, dtype=torch.long)
     else:
         result = torch.zeros(len(all_tokens), context_length, dtype=torch.int)
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 ftfy
+packaging
 regex
 tqdm
 torch

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`ftfy`
	`2`	`+packaging`
`2`	`3`	`regex`
`3`	`4`	`tqdm`
`4`	`5`	`torch`