Skip to content

Commit 3bdc907

Browse files
committed
Generalize arch optimizations and remove numpy version constraints
1 parent 10557ec commit 3bdc907

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

CMake/Common.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ if (UNIX OR MINGW)
6363
if (CI_BUILD)
6464
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=x86-64")
6565
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=x86-64")
66-
elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
67-
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=apple-m1")
68-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -mcpu=apple-m1")
66+
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
67+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mcpu=native")
68+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -mcpu=native")
6969
else()
7070
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native")
7171
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -DNDEBUG -march=native")

setup.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,6 @@ def build_extension(self, ext):
106106
pbd_version = f.readline().strip()
107107
f.close()
108108

109-
max_numpy_version = "1.19.3"
110-
install_requires = [f"numpy<={max_numpy_version}"]
111-
if platform.machine() == "arm64":
112-
if platform.system() == "Darwin":
113-
install_requires = ["numpy>=1.21.0"]
114-
else:
115-
install_requires = [f"numpy>=1.19.0,<={max_numpy_version}"]
116-
117109
setup(
118110
name=name,
119111
version=pbd_version,
@@ -129,5 +121,5 @@ def build_extension(self, ext):
129121
cmdclass=dict(build_ext=CMakeBuild),
130122
packages=find_packages(),
131123
zip_safe=False,
132-
install_requires=install_requires
124+
install_requires=['numpy']
133125
)

0 commit comments

Comments
 (0)