Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add setuptools as a basic dependency #12563

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Add setuptools as a basic dependency #12563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a7134
Add setuptools as a basic dependency
Oscilloscope98 Dec 17, 2024
5644296
Remove unnecessary requirements of setuptools in example/unit/nightly…
Oscilloscope98 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/llm-nightly-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ jobs:
shell: bash
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools==58.0.4
python -m pip install --upgrade wheel

- name: Download llm binary
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/llm_example_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools==58.0.4
python -m pip install --upgrade wheel

- name: Download llm binary
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/llm_unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ jobs:
shell: bash
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools==58.0.4
python -m pip install --upgrade wheel

# May remove later
Expand Down Expand Up @@ -317,7 +316,6 @@ jobs:
shell: bash
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade "setuptools<70.0.0"
python -m pip install --upgrade wheel
python -m pip install --upgrade notebook

Expand Down
7 changes: 7 additions & 0 deletions python/llm/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
github_artifact_dir = os.path.join(llm_home, '../llm-binary')
libs_dir = os.path.join(llm_home, "ipex_llm", "libs")

COMMON_DEP = ["setuptools"]
cpu_torch_version = ["torch==2.1.2+cpu;platform_system=='Linux'", "torch==2.1.2;platform_system=='Windows'"]
CONVERT_DEP = ['numpy == 1.26.4', # lastet 2.0.0b1 will cause error
'transformers == 4.37.0', 'sentencepiece', 'tokenizers == 0.15.2',
Expand Down Expand Up @@ -265,11 +266,13 @@ def setup_package():
'mpmath==1.3.0' # fix AttributeError: module 'mpmath' has no attribute 'rational'
]
all_requires += CONVERT_DEP
all_requires += COMMON_DEP

# Add internal requires for llama-index
llama_index_requires = copy.deepcopy(all_requires)
for exclude_require in cpu_torch_version:
llama_index_requires.remove(exclude_require)
llama_index_requires.remove("setuptools")
llama_index_requires += ["setuptools<70.0.0"]
llama_index_requires += ["torch<2.2.0",
"sentence-transformers~=2.6.1"]
Expand All @@ -283,6 +286,7 @@ def setup_package():
xpu_21_requires = copy.deepcopy(all_requires)
for exclude_require in cpu_torch_version:
xpu_21_requires.remove(exclude_require)
xpu_21_requires.remove("setuptools")
xpu_21_requires += ["setuptools<70.0.0"]
xpu_21_requires += ["torch==2.1.0a0",
"torchvision==0.16.0a0",
Expand Down Expand Up @@ -311,13 +315,16 @@ def setup_package():
cpp_requires = ["bigdl-core-cpp==" + CORE_XE_VERSION,
"onednn-devel==2024.2.1;platform_system=='Windows'"]
cpp_requires += oneapi_2024_2_requires
cpp_requires += COMMON_DEP

cpp_arl_requires = ["bigdl-core-cpp==" + CORE_XE_VERSION,
"onednn-devel==2024.1.1;platform_system=='Windows'"]
cpp_arl_requires += oneapi_2024_2_requires
cpp_arl_requires += COMMON_DEP

serving_requires = ['py-cpuinfo']
serving_requires += SERVING_DEP
serving_requires += COMMON_DEP

npu_requires = copy.deepcopy(all_requires)
cpu_transformers_version = ['transformers == 4.37.0', 'tokenizers == 0.15.2']
Expand Down
Loading