Skip to content

Fix #37 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GOKORURI007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #37 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ numpy = "*"
[dev-packages]
pytest = "*"
pillow = "*"
cpuid = "*"

[requires]
python_version = "3.6"
20 changes: 0 additions & 20 deletions cpuid/LICENSE
View file
Open in desktop

This file was deleted.

Empty file removed cpuid/__init__.py
View file
Open in desktop
Empty file.
154 changes: 0 additions & 154 deletions cpuid/cpuid.py
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,18 @@ def _check_openmp():
return _compile_and_check(omp_test, ['-fopenmp', '-lgomp'])

def _check_avx2():
from cpuid.cpuid import CPUID
import cpuid
try:
# Invoke CPUID instruction with eax 0x7
# ECX bit 5: AVX2 support
# For more information, refer to https://en.wikipedia.org/wiki/CPUID
input_eax = 0x7
output_eax, output_ebx, output_ecx, output_edx = CPUID()(input_eax)
output_eax, output_ebx, output_ecx, output_edx = cpuid.cpuid_count(input_eax, 0)
bits = bin(output_ebx)[::-1]
avx2_support = bits[5]
return avx2_support == '1'
except:
except Exception as e:
print(f"Failed to check AVX2 support: {e}")
return False

def _check_neon():
Expand Down Expand Up @@ -170,11 +171,11 @@ def _check_neon():

setup(
name="fast-slic",
version="0.4.0",
version="0.4.1",
description="Fast Slic Superpixel Implementation",
author="Alchan Kim",
author_email="a9413miky@gmail.com",
setup_requires = ["cython", "numpy"],
setup_requires = ["cython", "numpy", "cpuid"],
install_requires=["numpy"],
python_requires=">=3.5",
license="MIT",
Expand Down