Skip to content

Commit dd155e8

Browse files
committed
Remove CogVLM2 support on Windows
1 parent d1d9402 commit dd155e8

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

requirements.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,3 @@ https://download.pytorch.org/whl/cu124/torch-2.6.0%2Bcu124-cp311-cp311-win_amd64
3434
flash-attn==2.7.4.post1; platform_system == "Linux"
3535
https://github.com/kingbri1/flash-attention/releases/download/v2.7.4.post1/flash_attn-2.7.4.post1+cu124torch2.6.0cxx11abiFALSE-cp312-cp312-win_amd64.whl; platform_system == "Windows" and python_version == "3.12"
3636
https://github.com/kingbri1/flash-attention/releases/download/v2.7.4.post1/flash_attn-2.7.4.post1+cu124torch2.6.0cxx11abiFALSE-cp311-cp311-win_amd64.whl; platform_system == "Windows" and python_version == "3.11"
37-
38-
# Triton (CogVLM2)
39-
triton==3.2.0; platform_system == "Linux"
40-
https://github.com/woct0rdho/triton-windows/releases/download/v3.2.0-windows.post10/triton-3.2.0-cp312-cp312-win_amd64.whl; platform_system == "Windows" and python_version == "3.12"
41-
https://github.com/woct0rdho/triton-windows/releases/download/v3.2.0-windows.post10/triton-3.2.0-cp311-cp311-win_amd64.whl; platform_system == "Windows" and python_version == "3.11"

taggui-windows.spec

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# -*- mode: python ; coding: utf-8 -*-
2-
import os, sys
32
from PyInstaller.utils.hooks import collect_data_files
43

54
datas = [('clip-vit-base-patch32', 'clip-vit-base-patch32'),
65
('images/icon.ico', 'images')]
7-
datas += [(os.path.join(sys.base_prefix, 'include'), 'include')]
8-
datas += collect_data_files('triton')
96
datas += collect_data_files('xformers')
107
hiddenimports = [
118
'timm.models.layers',
@@ -30,7 +27,6 @@ a = Analysis(
3027
cipher=block_cipher,
3128
noarchive=False,
3229
module_collection_mode={
33-
'triton': 'py',
3430
'xformers': 'pyz+py',
3531
},
3632
)

taggui/auto_captioning/models/cogvlm2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class Cogvlm2(AutoCaptioningModel):
1818

1919
def get_additional_error_message(self) -> str | None:
2020
if not importlib.util.find_spec('triton'):
21-
return ('This model requires the `triton` package, which is only '
22-
'available for Linux and Windows. Therefore, this model '
23-
'cannot be run on this system.')
21+
return ('This model cannot be run because it requires the '
22+
'`triton` package, which is not available for your '
23+
'system.')
2424
is_4_bit_model = 'int4' in self.model_id
2525
if is_4_bit_model:
2626
if self.device_setting == CaptionDevice.CPU:

0 commit comments

Comments
 (0)