MUSA: Conditionally remove torch and numpy from dependencies

Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>

Author: yeahdongcn

Makefile

@@ -1,5 +1,5 @@
 flake_find:
-	cd ktransformers && flake8 | grep -Eo '[A-Z][0-9]{3}' | sort | uniq| paste -sd ',' - 
+	cd ktransformers && flake8 | grep -Eo '[A-Z][0-9]{3}' | sort | uniq| paste -sd ',' -
 format:
 	@cd ktransformers && black .
 	@black setup.py
@@ -14,7 +14,11 @@ dev_install:
 
 # install ktransformers
 	echo "Installing python dependencies from requirements.txt"
-	pip install -r requirements-local_chat.txt
+	@if command -v mcc > /dev/null 2>&1; then \
+		bash -c 'pip install -r <(grep -v -E "torch|numpy" requirements-local_chat.txt)'; \
+	else \
+		pip install -r requirements-local_chat.txt; \
+	fi
 
 	echo "Installing ktransformers"
 	KTRANSFORMERS_FORCE_BUILD=TRUE pip install -e . -v --no-build-isolation

install.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e  
+set -e
 
 # clear build dirs
 rm -rf build
@@ -10,7 +10,11 @@ rm -rf ktransformers/ktransformers_ext/cuda/dist
 rm -rf ktransformers/ktransformers_ext/cuda/*.egg-info
 
 echo "Installing python dependencies from requirements.txt"
-pip install -r requirements-local_chat.txt
+if command -v mcc > /dev/null 2>&1; then
+    bash -c 'pip install -r <(grep -v -E "torch|numpy" requirements-local_chat.txt)'
+else
+    pip install -r requirements-local_chat.txt
+fi
 
 echo "Installing ktransformers"
 KTRANSFORMERS_FORCE_BUILD=TRUE pip install . --no-build-isolation

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
   "setuptools",
-  "torch >= 2.3.0", 
+  "torch >= 2.3.0",
   "ninja",
   "packaging",
   "cpufeature"
@@ -12,25 +12,7 @@ build-backend = "setuptools.build_meta"
 
 name = "ktransformers"
 
-dynamic = ["version"]
-
-dependencies = [
-  "torch >= 2.3.0",
-  "transformers == 4.43.2",
-  "fastapi >= 0.111.0",
-  "uvicorn >= 0.30.1",
-  "langchain >= 0.2.0",
-  "blessed >= 1.20.0",
-  "accelerate >= 0.31.0",
-  "sentencepiece >= 0.1.97",
-  "setuptools",
-  "ninja",
-  "wheel",
-  "colorlog",
-  "build",
-  "fire",
-  "protobuf"
-]
+dynamic = ["version", "dependencies"]
 
 requires-python = ">=3.10"
 

setup.py

@@ -67,17 +67,17 @@ def get_musa_bare_metal_version(self, musa_dir):
     def get_rocm_bare_metal_version(self, rocm_dir):
         """
         Get the ROCm version from the ROCm installation directory.
-        
+
         Args:
             rocm_dir: Path to the ROCm installation directory
-        
+
         Returns:
             A string representation of the ROCm version (e.g., "63" for ROCm 6.3)
         """
         try:
             # Try using rocm_agent_enumerator to get version info
             raw_output = subprocess.check_output(
-                [rocm_dir + "/bin/rocminfo", "--version"], 
+                [rocm_dir + "/bin/rocminfo", "--version"],
                 universal_newlines=True,
                 stderr=subprocess.STDOUT)
             # Extract version number from output
@@ -90,7 +90,7 @@ def get_rocm_bare_metal_version(self, rocm_dir):
         except (subprocess.CalledProcessError, FileNotFoundError):
             # If rocminfo --version fails, try alternative methods
             pass
-        
+
         try:
             # Try reading version from release file
             with open(os.path.join(rocm_dir, "share/doc/hip/version.txt"), "r") as f:
@@ -100,7 +100,7 @@ def get_rocm_bare_metal_version(self, rocm_dir):
                 return rocm_version
         except (FileNotFoundError, IOError):
             pass
-        
+
         # If all else fails, try to extract from directory name
         dir_name = os.path.basename(os.path.normpath(rocm_dir))
         match = re.search(r'rocm-(\d+\.\d+)', dir_name)
@@ -109,7 +109,7 @@ def get_rocm_bare_metal_version(self, rocm_dir):
             version = parse(version_str)
             rocm_version = f"{version.major}{version.minor}"
             return rocm_version
-        
+
         # Fallback to extracting from hipcc version
         try:
             raw_output = subprocess.check_output(
@@ -124,7 +124,7 @@ def get_rocm_bare_metal_version(self, rocm_dir):
                 return rocm_version
         except (subprocess.CalledProcessError, FileNotFoundError):
             pass
-        
+
         # If we still can't determine the version, raise an error
         raise ValueError(f"Could not determine ROCm version from directory: {rocm_dir}")
 
@@ -319,7 +319,7 @@ def build_extension(self, ext) -> None:
             raise ValueError("Unsupported backend: CUDA_HOME and MUSA_HOME are not set.")
         # log cmake_args
         print("CMake args:", cmake_args)
-        
+
         build_args = []
         if "CMAKE_ARGS" in os.environ:
             cmake_args += [
@@ -398,6 +398,23 @@ def build_extension(self, ext) -> None:
             ["cmake", "--build", ".", "--verbose", *build_args], cwd=build_temp, check=True
         )
 
+dependencies = [
+    "torch >= 2.3.0",
+    "transformers == 4.43.2",
+    "fastapi >= 0.111.0",
+    "uvicorn >= 0.30.1",
+    "langchain >= 0.2.0",
+    "blessed >= 1.20.0",
+    "accelerate >= 0.31.0",
+    "sentencepiece >= 0.1.97",
+    "setuptools",
+    "ninja",
+    "wheel",
+    "colorlog",
+    "build",
+    "fire",
+    "protobuf"
+]
 if CUDA_HOME is not None or ROCM_HOME is not None:
     ops_module = CUDAExtension('KTransformersOps', [
         'ktransformers/ktransformers_ext/cuda/custom_gguf/dequant.cu',
@@ -415,6 +432,7 @@ def build_extension(self, ext) -> None:
         }
     )
 elif MUSA_HOME is not None:
+    dependencies.remove("torch >= 2.3.0")
     SimplePorting(cuda_dir_path="ktransformers/ktransformers_ext/cuda", mapping_rule={
         # Common rules
         "at::cuda": "at::musa",
@@ -443,6 +461,7 @@ def build_extension(self, ext) -> None:
 setup(
     name=VersionInfo.PACKAGE_NAME,
     version=VersionInfo().get_package_version(),
+    install_requires=dependencies,
     cmdclass={"bdist_wheel":BuildWheelsCommand ,"build_ext": CMakeBuild},
     ext_modules=[
         CMakeExtension("cpuinfer_ext"),