hjxdl 0.1.60__py3-none-any.whl → 0.1.62__py3-none-any.whl

hdl/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.60'
-__version_tuple__ = version_tuple = (0, 1, 60)
+__version__ = version = '0.1.62'
+__version_tuple__ = version_tuple = (0, 1, 62)

hdl/utils/llm/vis.py

@@ -22,6 +22,7 @@ class ImgHandler:
         model_path,
         redis_host,
         redis_port,
+        model_name: str = None,
         device: str = None
     ) -> None:
         if device is None:
@@ -37,10 +38,13 @@ class ImgHandler:
         self.open_clip_cfg = json.load(
             open(Path(model_path) / Path("open_clip_config.json"))
         )
-        self.model_name = (
-            self.open_clip_cfg['model_cfg']['text_cfg']['hf_tokenizer_name']
-            .split('/')[-1]
-        )
+        if model_name is not None:
+            self.model_name = model_name
+        else:
+            self.model_name = (
+                self.open_clip_cfg['model_cfg']['text_cfg']['hf_tokenizer_name']
+                .split('/')[-1]
+            )
 
         self.model, self.preprocess_train, self.preprocess_val = (
             open_clip.create_model_and_transforms(
@@ -72,14 +76,15 @@ class ImgHandler:
         to_numpy = False,
         **kwargs
     ):
-        imgs = torch.stack([
-            self.preprocess_val(Image.open(image)).to(self.device)
-            for image in images
-        ])
-        img_features = self.model.encode_image(imgs, **kwargs)
-        img_features /= img_features.norm(dim=-1, keepdim=True)
-        if to_numpy:
-            img_features = img_features.cpu().numpy()
+        with torch.no_grad(), torch.cuda.amp.autocast():
+            imgs = torch.stack([
+                self.preprocess_val(Image.open(image)).to(self.device)
+                for image in images
+            ])
+            img_features = self.model.encode_image(imgs, **kwargs)
+            img_features /= img_features.norm(dim=-1, keepdim=True)
+            if to_numpy:
+                img_features = img_features.cpu().numpy()
         return img_features
 
     def get_text_features(
@@ -88,14 +93,15 @@ class ImgHandler:
         to_numpy = False,
         **kwargs
     ):
-        txts = self.tokenizer(
-            texts,
-            context_length=self.model.context_length
-        ).to(self.device)
-        txt_features = self.model.encode_text(txts, **kwargs)
-        txt_features /= txt_features.norm(dim=-1, keepdim=True)
-        if to_numpy:
-            txt_features = txt_features.cpu().numpy()
+        with torch.no_grad(), torch.cuda.amp.autocast():
+            txts = self.tokenizer(
+                texts,
+                context_length=self.model.context_length
+            ).to(self.device)
+            txt_features = self.model.encode_text(txts, **kwargs)
+            txt_features /= txt_features.norm(dim=-1, keepdim=True)
+            if to_numpy:
+                txt_features = txt_features.cpu().numpy()
         return txt_features
 
 
@@ -103,11 +109,18 @@ class ImgHandler:
         self,
         texts,
         images,
+        probs: bool = False,
+        to_numpy: bool = False,
         **kwargs
     ):
-        image_features = self.get_img_features(images, **kwargs)
-        text_features = self.get_text_features(texts, **kwargs)
-        text_probs = (100.0 * image_features @ text_features.T).softmax(dim=-1)
+        with torch.no_grad(), torch.cuda.amp.autocast():
+            image_features = self.get_img_features(images, **kwargs)
+            text_features = self.get_text_features(texts, **kwargs)
+            text_probs = (100.0 * image_features @ text_features.T)
+            if probs:
+                text_probs = text_probs.softmax(dim=-1)
+            if to_numpy:
+                text_probs = text_probs.cpu().numpy()
         return text_probs
 
 

{hjxdl-0.1.60.dist-info → hjxdl-0.1.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hjxdl
-Version: 0.1.60
+Version: 0.1.62
 Summary: A collection of functions for Jupyter notebooks
 Home-page: https://github.com/huluxiaohuowa/hdl
 Author: Jianxing Hu

{hjxdl-0.1.60.dist-info → hjxdl-0.1.62.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hdl/__init__.py,sha256=GffnD0jLJdhkd-vo989v40N90sQbofkayRBwxc6TVhQ,72
-hdl/_version.py,sha256=I8yYicE18LeNuqpxw5_Q3MjNjqUav4r_xspI3E7RXfQ,413
+hdl/_version.py,sha256=rG3DSNYFAHXdVeQ2WjD0Z0Cpa8cTqknlt8QLq3_8uSk,413
 hdl/args/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/args/loss_args.py,sha256=s7YzSdd7IjD24rZvvOrxLLFqMZQb9YylxKeyelSdrTk,70
 hdl/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -131,12 +131,12 @@ hdl/utils/llm/chat.py,sha256=sk7Lw5Oa30k-l2fnJknkMmTc5zkBeEKsR981aeFhH5s,11907
 hdl/utils/llm/embs.py,sha256=Tf0FOYrOFZp7qQpEPiSCXzlgyHH0X9HVTUtsup74a9E,7174
 hdl/utils/llm/extract.py,sha256=2sK_WJzmYIc8iuWaM9DA6Nw3_6q1O4lJ5pKpcZo-bBA,6512
 hdl/utils/llm/llama_chat.py,sha256=watcHGOaz-bv3x-yDucYlGk5f8FiqfFhwWogrl334fk,4387
-hdl/utils/llm/vis.py,sha256=ckxGl21MZchCChLJRMX13j3xgIHpW4cfO7Xl5ySGAHw,3147
+hdl/utils/llm/vis.py,sha256=mmitBc5zRwT98oHIKmkhPahc8LI5YhAJlMtvCsRpT4c,3734
 hdl/utils/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/schedulers/norm_lr.py,sha256=bDwCmdEK-WkgxQMFBiMuchv8Mm7C0-GZJ6usm-PQk14,4461
 hdl/utils/weather/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hdl/utils/weather/weather.py,sha256=k11o6wM15kF8b9NMlEfrg68ak-SfSYLN3nOOflFUv-I,4381
-hjxdl-0.1.60.dist-info/METADATA,sha256=nc4_lLnBG1ulMSJ7JAa8FF2v1ot5FQohFQKTqdtESic,880
-hjxdl-0.1.60.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-hjxdl-0.1.60.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
-hjxdl-0.1.60.dist-info/RECORD,,
+hjxdl-0.1.62.dist-info/METADATA,sha256=3Gb5-bSC047umAiQbseqxL3e5yvt82RNt1Usor3cGkg,880
+hjxdl-0.1.62.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+hjxdl-0.1.62.dist-info/top_level.txt,sha256=-kxwTM5JPhylp06z3zAVO3w6_h7wtBfBo2zgM6YZoTk,4
+hjxdl-0.1.62.dist-info/RECORD,,