Skip to content

Commit

Permalink
Added a new environment variable to control the cache_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
lcolok committed Nov 22, 2023
1 parent b9ee59f commit b2662c4
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions llava/model/multimodal_encoder/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,28 @@
from .mae_encoder import MAEVisionTower
from transformers import CLIPModel

CACHE_DIR = os.getenv('VIDEO_LLAVA_CACHE_DIR','./cache_dir')

def build_image_tower(image_tower_cfg, **kwargs):
image_tower = getattr(image_tower_cfg, 'mm_image_tower', getattr(image_tower_cfg, 'image_tower', None))
is_absolute_path_exists = os.path.exists(image_tower)
if is_absolute_path_exists or image_tower.startswith("openai") or image_tower.startswith("laion"):
return CLIPVisionTower(image_tower, args=image_tower_cfg, **kwargs)
if image_tower.endswith('LanguageBind_Image'):
return LanguageBindImageTower(image_tower, args=image_tower_cfg, cache_dir='./cache_dir', **kwargs)
return LanguageBindImageTower(image_tower, args=image_tower_cfg, cache_dir=CACHE_DIR, **kwargs)
if 'mae' in image_tower:
print('maemaemaemaemaemaemaemae')
print('maemaemaemaemaemaemaemae')
print('maemaemaemaemaemaemaemae')
print('maemaemaemaemaemaemaemae')
print('maemaemaemaemaemaemaemae')
return MAEVisionTower(image_tower, args=image_tower_cfg, cache_dir='./cache_dir', **kwargs)
return MAEVisionTower(image_tower, args=image_tower_cfg, cache_dir=CACHE_DIR, **kwargs)
raise ValueError(f'Unknown image tower: {image_tower}')

def build_video_tower(video_tower_cfg, **kwargs):
video_tower = getattr(video_tower_cfg, 'mm_video_tower', getattr(video_tower_cfg, 'video_tower', None))
if video_tower.endswith('LanguageBind_Video_merge'):
return LanguageBindVideoTower(video_tower, args=video_tower_cfg, cache_dir='./cache_dir', **kwargs)
return LanguageBindVideoTower(video_tower, args=video_tower_cfg, cache_dir=CACHE_DIR, **kwargs)
raise ValueError(f'Unknown video tower: {video_tower}')


Expand All @@ -39,11 +41,11 @@ def build_video_tower(video_tower_cfg, **kwargs):
# if is_absolute_path_exists or image_tower.startswith("openai") or image_tower.startswith("laion"):
# return CLIPVisionTower(image_tower, args=image_tower_cfg, **kwargs)
# if image_tower.endswith('LanguageBind_Image'):
# return LanguageBindImageTower(image_tower, args=image_tower_cfg, cache_dir='./cache_dir', **kwargs)
# return LanguageBindImageTower(image_tower, args=image_tower_cfg, cache_dir=CACHE_DIR', **kwargs)
# raise ValueError(f'Unknown image tower: {image_tower}')

# def build_video_tower(video_tower_cfg, **kwargs):
# video_tower = getattr(video_tower_cfg, 'mm_video_tower', getattr(video_tower_cfg, 'video_tower', None))
# if video_tower.endswith('LanguageBind_Video'):
# return LanguageBindVideoTower(video_tower, args=video_tower_cfg, cache_dir='./cache_dir', **kwargs)
# return LanguageBindVideoTower(video_tower, args=video_tower_cfg, cache_dir=CACHE_DIR, **kwargs)
# raise ValueError(f'Unknown video tower: {video_tower}')

0 comments on commit b2662c4

Please sign in to comment.