Skip to content

Commit a25656a

Browse files
committed
MUSA: Conditionally remove torch and numpy from dependencies
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
1 parent 7b2a669 commit a25656a

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
flake_find:
2-
cd ktransformers && flake8 | grep -Eo '[A-Z][0-9]{3}' | sort | uniq| paste -sd ',' -
2+
cd ktransformers && flake8 | grep -Eo '[A-Z][0-9]{3}' | sort | uniq| paste -sd ',' -
33
format:
44
@cd ktransformers && black .
55
@black setup.py
@@ -14,7 +14,11 @@ dev_install:
1414

1515
# install ktransformers
1616
echo "Installing python dependencies from requirements.txt"
17-
pip install -r requirements-local_chat.txt
17+
@if command -v mcc > /dev/null 2>&1; then \
18+
bash -c 'pip install -r <(grep -v -E "torch|numpy" requirements-local_chat.txt)'; \
19+
else \
20+
pip install -r requirements-local_chat.txt; \
21+
fi
1822

1923
echo "Installing ktransformers"
2024
KTRANSFORMERS_FORCE_BUILD=TRUE pip install -e . -v --no-build-isolation

install.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -e
33

44
# clear build dirs
55
rm -rf build
@@ -10,7 +10,11 @@ rm -rf ktransformers/ktransformers_ext/cuda/dist
1010
rm -rf ktransformers/ktransformers_ext/cuda/*.egg-info
1111

1212
echo "Installing python dependencies from requirements.txt"
13-
pip install -r requirements-local_chat.txt
13+
if command -v mcc > /dev/null 2>&1; then
14+
bash -c 'pip install -r <(grep -v -E "torch|numpy" requirements-local_chat.txt)'
15+
else
16+
pip install -r requirements-local_chat.txt
17+
fi
1418

1519
echo "Installing ktransformers"
1620
KTRANSFORMERS_FORCE_BUILD=TRUE pip install . --no-build-isolation

pyproject.toml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
requires = [
33
"setuptools",
4-
"torch >= 2.3.0",
4+
"torch >= 2.3.0",
55
"ninja",
66
"packaging",
77
"cpufeature"
@@ -12,25 +12,7 @@ build-backend = "setuptools.build_meta"
1212

1313
name = "ktransformers"
1414

15-
dynamic = ["version"]
16-
17-
dependencies = [
18-
"torch >= 2.3.0",
19-
"transformers == 4.43.2",
20-
"fastapi >= 0.111.0",
21-
"uvicorn >= 0.30.1",
22-
"langchain >= 0.2.0",
23-
"blessed >= 1.20.0",
24-
"accelerate >= 0.31.0",
25-
"sentencepiece >= 0.1.97",
26-
"setuptools",
27-
"ninja",
28-
"wheel",
29-
"colorlog",
30-
"build",
31-
"fire",
32-
"protobuf"
33-
]
15+
dynamic = ["version", "dependencies"]
3416

3517
requires-python = ">=3.10"
3618

setup.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,23 @@ def build_extension(self, ext) -> None:
328328
["cmake", "--build", ".", "--verbose", *build_args], cwd=build_temp, check=True
329329
)
330330

331+
dependencies = [
332+
"torch >= 2.3.0",
333+
"transformers == 4.43.2",
334+
"fastapi >= 0.111.0",
335+
"uvicorn >= 0.30.1",
336+
"langchain >= 0.2.0",
337+
"blessed >= 1.20.0",
338+
"accelerate >= 0.31.0",
339+
"sentencepiece >= 0.1.97",
340+
"setuptools",
341+
"ninja",
342+
"wheel",
343+
"colorlog",
344+
"build",
345+
"fire",
346+
"protobuf"
347+
]
331348
if CUDA_HOME is not None:
332349
ops_module = CUDAExtension('KTransformersOps', [
333350
'ktransformers/ktransformers_ext/cuda/custom_gguf/dequant.cu',
@@ -345,6 +362,7 @@ def build_extension(self, ext) -> None:
345362
}
346363
)
347364
elif MUSA_HOME is not None:
365+
dependencies.remove("torch >= 2.3.0")
348366
SimplePorting(cuda_dir_path="ktransformers/ktransformers_ext/cuda", mapping_rule={
349367
# Common rules
350368
"at::cuda": "at::musa",
@@ -372,6 +390,7 @@ def build_extension(self, ext) -> None:
372390

373391
setup(
374392
version=VersionInfo().get_package_version(),
393+
install_requires=dependencies,
375394
cmdclass={"bdist_wheel":BuildWheelsCommand ,"build_ext": CMakeBuild},
376395
ext_modules=[
377396
CMakeExtension("cpuinfer_ext"),

0 commit comments

Comments
 (0)