ayo/ipex-llm
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add setuptools as a basic dependency (#12563)

Browse source 
* Add setuptools as a basic dependency

* Remove unnecessary requirements of setuptools in example/unit/nightly tests
This commit is contained in:
Yuwen Hu 2024-12-17 16:56:41 +08:00 committed by GitHub
parent 694d14b2b4
commit 6278cafc25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/llm-nightly-test.yml vendored
View file

@ -86,7 +86,6 @@ jobs:
shell: bash shell: bash
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
python -m pip install --upgrade setuptools==58.0.4
python -m pip install --upgrade wheel python -m pip install --upgrade wheel
- name: Download llm binary - name: Download llm binary

1
.github/workflows/llm_example_tests.yml vendored
View file

@ -61,7 +61,6 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
python -m pip install --upgrade setuptools==58.0.4
python -m pip install --upgrade wheel python -m pip install --upgrade wheel
- name: Download llm binary - name: Download llm binary

2
.github/workflows/llm_unit_tests.yml vendored
View file

@ -127,7 +127,6 @@ jobs:
shell: bash shell: bash
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
python -m pip install --upgrade setuptools==58.0.4
python -m pip install --upgrade wheel python -m pip install --upgrade wheel
# May remove later # May remove later
@ -317,7 +316,6 @@ jobs:
shell: bash shell: bash
run: | run: |
python -m pip install --upgrade pip 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 wheel
python -m pip install --upgrade notebook python -m pip install --upgrade notebook

7
python/llm/setup.py
View file

@ -51,6 +51,7 @@ llm_home = os.path.join(os.path.dirname(os.path.abspath(__file__)), "src")
github_artifact_dir = os.path.join(llm_home, '../llm-binary') github_artifact_dir = os.path.join(llm_home, '../llm-binary')
libs_dir = os.path.join(llm_home, "ipex_llm", "libs") 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'"] 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 CONVERT_DEP = ['numpy == 1.26.4', # lastet 2.0.0b1 will cause error
'transformers == 4.37.0', 'sentencepiece', 'tokenizers == 0.15.2', 'transformers == 4.37.0', 'sentencepiece', 'tokenizers == 0.15.2',
@ -265,11 +266,13 @@ def setup_package():
'mpmath==1.3.0' # fix AttributeError: module 'mpmath' has no attribute 'rational' 'mpmath==1.3.0' # fix AttributeError: module 'mpmath' has no attribute 'rational'
] ]
all_requires += CONVERT_DEP all_requires += CONVERT_DEP
all_requires += COMMON_DEP
# Add internal requires for llama-index # Add internal requires for llama-index
llama_index_requires = copy.deepcopy(all_requires) llama_index_requires = copy.deepcopy(all_requires)
for exclude_require in cpu_torch_version: for exclude_require in cpu_torch_version:
llama_index_requires.remove(exclude_require) llama_index_requires.remove(exclude_require)
llama_index_requires.remove("setuptools")
llama_index_requires += ["setuptools<70.0.0"] llama_index_requires += ["setuptools<70.0.0"]
llama_index_requires += ["torch<2.2.0", llama_index_requires += ["torch<2.2.0",
"sentence-transformers~=2.6.1"] "sentence-transformers~=2.6.1"]
@ -283,6 +286,7 @@ def setup_package():
xpu_21_requires = copy.deepcopy(all_requires) xpu_21_requires = copy.deepcopy(all_requires)
for exclude_require in cpu_torch_version: for exclude_require in cpu_torch_version:
xpu_21_requires.remove(exclude_require) xpu_21_requires.remove(exclude_require)
xpu_21_requires.remove("setuptools")
xpu_21_requires += ["setuptools<70.0.0"] xpu_21_requires += ["setuptools<70.0.0"]
xpu_21_requires += ["torch==2.1.0a0", xpu_21_requires += ["torch==2.1.0a0",
"torchvision==0.16.0a0", "torchvision==0.16.0a0",
@ -311,13 +315,16 @@ def setup_package():
cpp_requires = ["bigdl-core-cpp==" + CORE_XE_VERSION, cpp_requires = ["bigdl-core-cpp==" + CORE_XE_VERSION,
"onednn-devel==2024.2.1;platform_system=='Windows'"] "onednn-devel==2024.2.1;platform_system=='Windows'"]
cpp_requires += oneapi_2024_2_requires cpp_requires += oneapi_2024_2_requires
cpp_requires += COMMON_DEP
cpp_arl_requires = ["bigdl-core-cpp==" + CORE_XE_VERSION, cpp_arl_requires = ["bigdl-core-cpp==" + CORE_XE_VERSION,
"onednn-devel==2024.1.1;platform_system=='Windows'"] "onednn-devel==2024.1.1;platform_system=='Windows'"]
cpp_arl_requires += oneapi_2024_2_requires cpp_arl_requires += oneapi_2024_2_requires
cpp_arl_requires += COMMON_DEP
serving_requires = ['py-cpuinfo'] serving_requires = ['py-cpuinfo']
serving_requires += SERVING_DEP serving_requires += SERVING_DEP
serving_requires += COMMON_DEP
npu_requires = copy.deepcopy(all_requires) npu_requires = copy.deepcopy(all_requires)
cpu_transformers_version = ['transformers == 4.37.0', 'tokenizers == 0.15.2'] cpu_transformers_version = ['transformers == 4.37.0', 'tokenizers == 0.15.2']