zhichyu commited on
Commit
4a6bb1f
·
1 Parent(s): c5006c2

Fix onnxruntime-gpu marks (#4643)

Browse files

### What problem does this PR solve?

Fix onnxruntime-gpu marks

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

Files changed (2) hide show
  1. pyproject.toml +4 -4
  2. uv.lock +46 -46
pyproject.toml CHANGED
@@ -59,8 +59,8 @@ dependencies = [
59
  "nltk==3.9.1",
60
  "numpy>=1.26.0,<2.0.0",
61
  "ollama==0.2.1",
62
- "onnxruntime==1.19.2; sys_platform == 'darwin' or platform_machine == 'arm64'",
63
- "onnxruntime-gpu==1.19.2; platform_machine == 'x86_64'",
64
  "openai==1.45.0",
65
  "opencv-python==4.10.0.84",
66
  "opencv-python-headless==4.10.0.84",
@@ -128,8 +128,8 @@ dependencies = [
128
  [project.optional-dependencies]
129
  full = [
130
  "bcembedding==0.1.5",
131
- "fastembed>=0.3.6,<0.4.0; sys_platform == 'darwin' or platform_machine == 'arm64'",
132
- "fastembed-gpu>=0.3.6,<0.4.0; platform_machine == 'x86_64'",
133
  "flagembedding==1.2.10",
134
  "torch>=2.5.0,<3.0.0",
135
  "transformers>=4.35.0,<5.0.0"
 
59
  "nltk==3.9.1",
60
  "numpy>=1.26.0,<2.0.0",
61
  "ollama==0.2.1",
62
+ "onnxruntime==1.19.2; sys_platform == 'darwin' or platform_machine != 'x86_64'",
63
+ "onnxruntime-gpu==1.19.2; sys_platform != 'darwin' and platform_machine == 'x86_64'",
64
  "openai==1.45.0",
65
  "opencv-python==4.10.0.84",
66
  "opencv-python-headless==4.10.0.84",
 
128
  [project.optional-dependencies]
129
  full = [
130
  "bcembedding==0.1.5",
131
+ "fastembed>=0.3.6,<0.4.0; sys_platform == 'darwin' or platform_machine != 'x86_64'",
132
+ "fastembed-gpu>=0.3.6,<0.4.0; sys_platform != 'darwin' and platform_machine == 'x86_64'",
133
  "flagembedding==1.2.10",
134
  "torch>=2.5.0,<3.0.0",
135
  "transformers>=4.35.0,<5.0.0"
uv.lock CHANGED
@@ -850,7 +850,7 @@ name = "coloredlogs"
850
  version = "15.0.1"
851
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
852
  dependencies = [
853
- { name = "humanfriendly", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
854
  ]
855
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/cc/c7/eed8f27100517e8c0e6b923d5f0845d0cb99763da6fdee00478f91db7325/coloredlogs-15.0.1.tar.gz", hash = "sha256:7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0", size = 278520 }
856
  wheels = [
@@ -1329,18 +1329,18 @@ name = "fastembed"
1329
  version = "0.3.6"
1330
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
1331
  dependencies = [
1332
- { name = "huggingface-hub", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1333
- { name = "loguru", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1334
- { name = "mmh3", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1335
- { name = "numpy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1336
- { name = "onnx", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1337
- { name = "onnxruntime", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1338
- { name = "pillow", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1339
- { name = "pystemmer", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1340
- { name = "requests", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1341
- { name = "snowballstemmer", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1342
- { name = "tokenizers", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1343
- { name = "tqdm", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1344
  ]
1345
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/ae/20/68a109c8def842ed47a2951873fb2d7d23ee296ef8c195aedbb735670fff/fastembed-0.3.6.tar.gz", hash = "sha256:c93c8ec99b8c008c2d192d6297866b8d70ec7ac8f5696b34eb5ea91f85efd15f", size = 35058 }
1346
  wheels = [
@@ -1352,17 +1352,17 @@ name = "fastembed-gpu"
1352
  version = "0.3.6"
1353
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
1354
  dependencies = [
1355
- { name = "huggingface-hub", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1356
- { name = "loguru", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1357
- { name = "mmh3", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1358
- { name = "numpy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1359
- { name = "onnxruntime-gpu", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1360
- { name = "pillow", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1361
- { name = "pystemmer", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1362
- { name = "requests", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1363
- { name = "snowballstemmer", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1364
- { name = "tokenizers", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1365
- { name = "tqdm", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
1366
  ]
1367
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/da/07/7336c7f3d7ee47f33b407eeb50f5eeb152889de538a52a8f1cc637192816/fastembed_gpu-0.3.6.tar.gz", hash = "sha256:ee2de8918b142adbbf48caaffec0c492f864d73c073eea5a3dcd0e8c1041c50d", size = 35051 }
1368
  wheels = [
@@ -3424,8 +3424,8 @@ name = "onnx"
3424
  version = "1.17.0"
3425
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
3426
  dependencies = [
3427
- { name = "numpy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3428
- { name = "protobuf", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3429
  ]
3430
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/9a/54/0e385c26bf230d223810a9c7d06628d954008a5e5e4b73ee26ef02327282/onnx-1.17.0.tar.gz", hash = "sha256:48ca1a91ff73c1d5e3ea2eef20ae5d0e709bb8a2355ed798ffc2169753013fd3", size = 12165120 }
3431
  wheels = [
@@ -3451,12 +3451,12 @@ name = "onnxruntime"
3451
  version = "1.19.2"
3452
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
3453
  dependencies = [
3454
- { name = "coloredlogs", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3455
- { name = "flatbuffers", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3456
- { name = "numpy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3457
- { name = "packaging", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3458
- { name = "protobuf", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3459
- { name = "sympy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3460
  ]
3461
  wheels = [
3462
  { url = "https://pypi.tuna.tsinghua.edu.cn/packages/39/18/272d3d7406909141d3c9943796e3e97cafa53f4342d9231c0cfd8cb05702/onnxruntime-1.19.2-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:84fa57369c06cadd3c2a538ae2a26d76d583e7c34bdecd5769d71ca5c0fc750e", size = 16776408 },
@@ -3481,12 +3481,12 @@ name = "onnxruntime-gpu"
3481
  version = "1.19.2"
3482
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
3483
  dependencies = [
3484
- { name = "coloredlogs", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3485
- { name = "flatbuffers", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3486
- { name = "numpy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3487
- { name = "packaging", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3488
- { name = "protobuf", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3489
- { name = "sympy", marker = "platform_machine != 'aarch64' or sys_platform != 'linux'" },
3490
  ]
3491
  wheels = [
3492
  { url = "https://pypi.tuna.tsinghua.edu.cn/packages/d0/9c/3fa310e0730643051eb88e884f19813a6c8b67d0fbafcda610d960e589db/onnxruntime_gpu-1.19.2-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a49740e079e7c5215830d30cde3df792e903df007aa0b0fd7aa797937061b27a", size = 226178508 },
@@ -4768,8 +4768,8 @@ dependencies = [
4768
  { name = "nltk" },
4769
  { name = "numpy" },
4770
  { name = "ollama" },
4771
- { name = "onnxruntime", marker = "platform_machine == 'arm64' or sys_platform == 'darwin'" },
4772
- { name = "onnxruntime-gpu", marker = "platform_machine == 'x86_64'" },
4773
  { name = "openai" },
4774
  { name = "opencv-python" },
4775
  { name = "opencv-python-headless" },
@@ -4833,8 +4833,8 @@ dependencies = [
4833
  [package.optional-dependencies]
4834
  full = [
4835
  { name = "bcembedding" },
4836
- { name = "fastembed", marker = "platform_machine == 'arm64' or sys_platform == 'darwin'" },
4837
- { name = "fastembed-gpu", marker = "platform_machine == 'x86_64'" },
4838
  { name = "flagembedding" },
4839
  { name = "torch" },
4840
  { name = "transformers" },
@@ -4870,8 +4870,8 @@ requires-dist = [
4870
  { name = "elastic-transport", specifier = "==8.12.0" },
4871
  { name = "elasticsearch", specifier = "==8.12.1" },
4872
  { name = "elasticsearch-dsl", specifier = "==8.12.0" },
4873
- { name = "fastembed", marker = "(platform_machine == 'arm64' and extra == 'full') or (sys_platform == 'darwin' and extra == 'full')", specifier = ">=0.3.6,<0.4.0" },
4874
- { name = "fastembed-gpu", marker = "platform_machine == 'x86_64' and extra == 'full'", specifier = ">=0.3.6,<0.4.0" },
4875
  { name = "fasttext", specifier = "==0.9.3" },
4876
  { name = "filelock", specifier = "==3.15.4" },
4877
  { name = "flagembedding", marker = "extra == 'full'", specifier = "==1.2.10" },
@@ -4900,8 +4900,8 @@ requires-dist = [
4900
  { name = "nltk", specifier = "==3.9.1" },
4901
  { name = "numpy", specifier = ">=1.26.0,<2.0.0" },
4902
  { name = "ollama", specifier = "==0.2.1" },
4903
- { name = "onnxruntime", marker = "platform_machine == 'arm64' or sys_platform == 'darwin'", specifier = "==1.19.2" },
4904
- { name = "onnxruntime-gpu", marker = "platform_machine == 'x86_64'", specifier = "==1.19.2" },
4905
  { name = "openai", specifier = "==1.45.0" },
4906
  { name = "opencv-python", specifier = "==4.10.0.84" },
4907
  { name = "opencv-python-headless", specifier = "==4.10.0.84" },
 
850
  version = "15.0.1"
851
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
852
  dependencies = [
853
+ { name = "humanfriendly" },
854
  ]
855
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/cc/c7/eed8f27100517e8c0e6b923d5f0845d0cb99763da6fdee00478f91db7325/coloredlogs-15.0.1.tar.gz", hash = "sha256:7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0", size = 278520 }
856
  wheels = [
 
1329
  version = "0.3.6"
1330
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
1331
  dependencies = [
1332
+ { name = "huggingface-hub" },
1333
+ { name = "loguru" },
1334
+ { name = "mmh3" },
1335
+ { name = "numpy" },
1336
+ { name = "onnx" },
1337
+ { name = "onnxruntime" },
1338
+ { name = "pillow" },
1339
+ { name = "pystemmer" },
1340
+ { name = "requests" },
1341
+ { name = "snowballstemmer" },
1342
+ { name = "tokenizers" },
1343
+ { name = "tqdm" },
1344
  ]
1345
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/ae/20/68a109c8def842ed47a2951873fb2d7d23ee296ef8c195aedbb735670fff/fastembed-0.3.6.tar.gz", hash = "sha256:c93c8ec99b8c008c2d192d6297866b8d70ec7ac8f5696b34eb5ea91f85efd15f", size = 35058 }
1346
  wheels = [
 
1352
  version = "0.3.6"
1353
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
1354
  dependencies = [
1355
+ { name = "huggingface-hub", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1356
+ { name = "loguru", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1357
+ { name = "mmh3", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1358
+ { name = "numpy", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1359
+ { name = "onnxruntime-gpu", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1360
+ { name = "pillow", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1361
+ { name = "pystemmer", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1362
+ { name = "requests", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1363
+ { name = "snowballstemmer", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1364
+ { name = "tokenizers", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1365
+ { name = "tqdm", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
1366
  ]
1367
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/da/07/7336c7f3d7ee47f33b407eeb50f5eeb152889de538a52a8f1cc637192816/fastembed_gpu-0.3.6.tar.gz", hash = "sha256:ee2de8918b142adbbf48caaffec0c492f864d73c073eea5a3dcd0e8c1041c50d", size = 35051 }
1368
  wheels = [
 
3424
  version = "1.17.0"
3425
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
3426
  dependencies = [
3427
+ { name = "numpy" },
3428
+ { name = "protobuf" },
3429
  ]
3430
  sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/9a/54/0e385c26bf230d223810a9c7d06628d954008a5e5e4b73ee26ef02327282/onnx-1.17.0.tar.gz", hash = "sha256:48ca1a91ff73c1d5e3ea2eef20ae5d0e709bb8a2355ed798ffc2169753013fd3", size = 12165120 }
3431
  wheels = [
 
3451
  version = "1.19.2"
3452
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
3453
  dependencies = [
3454
+ { name = "coloredlogs" },
3455
+ { name = "flatbuffers" },
3456
+ { name = "numpy" },
3457
+ { name = "packaging" },
3458
+ { name = "protobuf" },
3459
+ { name = "sympy" },
3460
  ]
3461
  wheels = [
3462
  { url = "https://pypi.tuna.tsinghua.edu.cn/packages/39/18/272d3d7406909141d3c9943796e3e97cafa53f4342d9231c0cfd8cb05702/onnxruntime-1.19.2-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:84fa57369c06cadd3c2a538ae2a26d76d583e7c34bdecd5769d71ca5c0fc750e", size = 16776408 },
 
3481
  version = "1.19.2"
3482
  source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
3483
  dependencies = [
3484
+ { name = "coloredlogs", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
3485
+ { name = "flatbuffers", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
3486
+ { name = "numpy", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
3487
+ { name = "packaging", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
3488
+ { name = "protobuf", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
3489
+ { name = "sympy", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },
3490
  ]
3491
  wheels = [
3492
  { url = "https://pypi.tuna.tsinghua.edu.cn/packages/d0/9c/3fa310e0730643051eb88e884f19813a6c8b67d0fbafcda610d960e589db/onnxruntime_gpu-1.19.2-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a49740e079e7c5215830d30cde3df792e903df007aa0b0fd7aa797937061b27a", size = 226178508 },
 
4768
  { name = "nltk" },
4769
  { name = "numpy" },
4770
  { name = "ollama" },
4771
+ { name = "onnxruntime", marker = "platform_machine != 'x86_64' or sys_platform == 'darwin'" },
4772
+ { name = "onnxruntime-gpu", marker = "platform_machine == 'x86_64' and sys_platform != 'darwin'" },
4773
  { name = "openai" },
4774
  { name = "opencv-python" },
4775
  { name = "opencv-python-headless" },
 
4833
  [package.optional-dependencies]
4834
  full = [
4835
  { name = "bcembedding" },
4836
+ { name = "fastembed", marker = "platform_machine != 'x86_64' or sys_platform == 'darwin'" },
4837
+ { name = "fastembed-gpu", marker = "platform_machine == 'x86_64' and sys_platform != 'darwin'" },
4838
  { name = "flagembedding" },
4839
  { name = "torch" },
4840
  { name = "transformers" },
 
4870
  { name = "elastic-transport", specifier = "==8.12.0" },
4871
  { name = "elasticsearch", specifier = "==8.12.1" },
4872
  { name = "elasticsearch-dsl", specifier = "==8.12.0" },
4873
+ { name = "fastembed", marker = "(platform_machine != 'x86_64' and extra == 'full') or (sys_platform == 'darwin' and extra == 'full')", specifier = ">=0.3.6,<0.4.0" },
4874
+ { name = "fastembed-gpu", marker = "platform_machine == 'x86_64' and sys_platform != 'darwin' and extra == 'full'", specifier = ">=0.3.6,<0.4.0" },
4875
  { name = "fasttext", specifier = "==0.9.3" },
4876
  { name = "filelock", specifier = "==3.15.4" },
4877
  { name = "flagembedding", marker = "extra == 'full'", specifier = "==1.2.10" },
 
4900
  { name = "nltk", specifier = "==3.9.1" },
4901
  { name = "numpy", specifier = ">=1.26.0,<2.0.0" },
4902
  { name = "ollama", specifier = "==0.2.1" },
4903
+ { name = "onnxruntime", marker = "platform_machine != 'x86_64' or sys_platform == 'darwin'", specifier = "==1.19.2" },
4904
+ { name = "onnxruntime-gpu", marker = "platform_machine == 'x86_64' and sys_platform != 'darwin'", specifier = "==1.19.2" },
4905
  { name = "openai", specifier = "==1.45.0" },
4906
  { name = "opencv-python", specifier = "==4.10.0.84" },
4907
  { name = "opencv-python-headless", specifier = "==4.10.0.84" },