From 2ed5842448a52ca1e80eb965aa1e6c269720eaf4 Mon Sep 17 00:00:00 2001 From: "Pingchuan Ma (Henry)" <58333343+HensonMa@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:01:17 +0800 Subject: [PATCH] [LLM] add convert's python deps for LLM (#8260) * add python deps for LLM * update release.sh * change deps group name * update all * fix update * test fix * update --- .github/workflows/llm_unit_tests_basic_windows.yml | 7 ++----- python/llm/dev/release.sh | 4 +++- python/llm/setup.py | 5 +++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/llm_unit_tests_basic_windows.yml b/.github/workflows/llm_unit_tests_basic_windows.yml index 4909c84f..af7734c7 100644 --- a/.github/workflows/llm_unit_tests_basic_windows.yml +++ b/.github/workflows/llm_unit_tests_basic_windows.yml @@ -52,12 +52,9 @@ jobs: shell: bash run: | bash python/llm/dev/release_default_windows.sh default false - pip install -i https://pypi.python.org/simple python/llm/dist/bigdl_llm*.whl + whl_name=$(ls python/llm/dist) + pip install -i https://pypi.python.org/simple "python/llm/dist/${whl_name}[all]" pip install pytest - pip install numpy - pip install torch - pip install transformers - pip install sentencepiece bash python/llm/test/run-llm-basic-tests.sh env: ANALYTICS_ZOO_ROOT: ${{ github.workspace }} diff --git a/python/llm/dev/release.sh b/python/llm/dev/release.sh index 0a743cb5..9c8c042b 100644 --- a/python/llm/dev/release.sh +++ b/python/llm/dev/release.sh @@ -43,8 +43,10 @@ echo "The effective version is: ${bigdl_version}" if [ "$platform" == "linux" ]; then verbose_pname="manylinux2010_x86_64" + platform_name="--linux" elif [ "$platform" == "windows" ]; then verbose_pname="win_amd64" + platform_name="--win" else echo "Unsupported platform" fi @@ -59,7 +61,7 @@ fi cd $BIGDL_PYTHON_DIR -wheel_command="python setup.py clean --all bdist_wheel --plat-name ${verbose_pname} --python-tag py3" +wheel_command="python setup.py clean --all bdist_wheel ${platform_name} --plat-name ${verbose_pname} --python-tag py3" echo "Packing python distribution: $wheel_command" ${wheel_command} diff --git a/python/llm/setup.py b/python/llm/setup.py index 34724a69..b4acd347 100644 --- a/python/llm/setup.py +++ b/python/llm/setup.py @@ -42,6 +42,7 @@ BIGDL_PYTHON_HOME = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) VERSION = open(os.path.join(BIGDL_PYTHON_HOME, 'version.txt'), 'r').read().strip() llm_home = os.path.join(os.path.dirname(os.path.abspath(__file__)), "src") libs_dir = os.path.join(llm_home, "bigdl", "llm", "libs") +CONVERT_DEP = ['numpy', 'torch', 'transformers', 'sentencepiece'] def get_llm_packages(): @@ -132,6 +133,9 @@ def setup_package(): for url in lib_urls[platform_name]: download_libs(url, change_permission=change_permission) + + all_requires = [] + all_requires += CONVERT_DEP metadata = dict( name='bigdl-llm', @@ -147,6 +151,7 @@ def setup_package(): package_dir={"": "src"}, package_data={"bigdl.llm": package_data[platform_name]}, include_package_data=True, + extras_require={"all": all_requires}, classifiers=[ 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python :: 3',