Unverified Commit a7b99536 authored by ZiWei Yuan's avatar ZiWei Yuan Committed by GitHub
Browse files

Merge pull request #1197 from jizhilong/jizhilong-patch-1

fix: make cpufeature a local import
parents b90362b5 82920e79
...@@ -3,7 +3,7 @@ transformers==4.43.2 ...@@ -3,7 +3,7 @@ transformers==4.43.2
numpy numpy
torch>=2.3.0 torch>=2.3.0
packaging packaging
cpufeature cpufeature; sys_platform == 'win32' or sys_platform == 'Windows'
protobuf protobuf
tiktoken tiktoken
blobfile blobfile
...@@ -33,7 +33,6 @@ import torch ...@@ -33,7 +33,6 @@ import torch
import torch.version import torch.version
from wheel.bdist_wheel import bdist_wheel as _bdist_wheel from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
from setuptools import setup, Extension from setuptools import setup, Extension
from cpufeature.extension import CPUFeature
from torch.utils.cpp_extension import BuildExtension, CUDAExtension, CUDA_HOME, ROCM_HOME from torch.utils.cpp_extension import BuildExtension, CUDAExtension, CUDA_HOME, ROCM_HOME
try: try:
from torch_musa.utils.simple_porting import SimplePorting from torch_musa.utils.simple_porting import SimplePorting
...@@ -188,6 +187,8 @@ class VersionInfo: ...@@ -188,6 +187,8 @@ class VersionInfo:
raise ValueError( raise ValueError(
"Unsupported cpu Instructions: {}".format(flags_line)) "Unsupported cpu Instructions: {}".format(flags_line))
elif sys.platform == "win32": elif sys.platform == "win32":
from cpufeature.extension import CPUFeature
if CPUFeature.get("AVX512bw", False): if CPUFeature.get("AVX512bw", False):
return 'fancy' return 'fancy'
if CPUFeature.get("AVX512f", False): if CPUFeature.get("AVX512f", False):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment