Merge branch 'parallel'

LAION-AI · Aug 16, 2023 · 734f03b · 734f03b
2 parents a2325b1 + 981cfeb
commit 734f03b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,5 +1,16 @@
 ## History
 
+### 1.5.0
+
+* Custom classnames and templates
+* support wds for captioning evaluation
+* support imagenet-w
+* support babel imagenet
+* support chinese flickr30k/8k
+* support sugar crepe (compositionality)
+* support (optional) sharding evaluation based on rank, for parallel runs
+* fix many issues
+
 ### 1.4.0
 
 * Fix silent webdataset error-handling

diff --git a/clip_benchmark/cli.py b/clip_benchmark/cli.py
@@ -149,9 +149,9 @@ def run(args):
         if args.distributed:
             local_rank, rank, world_size = world_info_from_env()
             device = 'cuda:%d' % local_rank
+            torch.cuda.set_device(device)
         else:
             device = "cuda"
-        torch.cuda.set_device(device)
         args.device = device
     else:
         args.device = "cpu"

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-torch>=1.8.1,<2
-torchvision>=0.8.9,<2
+torch>=1.8.1
+torchvision>=0.8.9
 tqdm>=2
 scikit-learn>=1.0,<2
 open_clip_torch>=0.2.1