Fix #839 and move most setup.py metadata and config into pyproject.toml
#959
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,6 @@ | |
| import os | ||
| import platform | ||
| import re | ||
| import shutil | ||
| import subprocess | ||
| import sys | ||
|
|
@@ -24,6 +23,8 @@ | |
| from setuptools import Extension, setup | ||
| from setuptools.command.build_ext import build_ext | ||
|
|
||
| __version__ = "0.23.0.dev0" | ||
|
Collaborator
There was a problem hiding this comment. You can use tomllib to get version from pyproject.toml and avoid duplicate definition. That modules is builtin since Python 3.11 |
||
|
|
||
|
|
||
| class CMakeExtension(Extension): | ||
| def __init__(self, name, sourcedir=""): | ||
|
|
@@ -67,6 +68,8 @@ def build_extension(self, ext): | |
| "-DCMAKE_CUDA_COMPILER=nvcc", | ||
| ] | ||
|
|
||
| # Append additional CMake arguments from the environment variable. | ||
| # This is e.g. used by cibuildwheel to force a certain C++ standard. | ||
| additional_cmake_args = os.environ.get("CMAKE_ARGS", "") | ||
| if additional_cmake_args: | ||
| cmake_args += additional_cmake_args.split() | ||
|
|
@@ -110,9 +113,7 @@ def build_extension(self, ext): | |
|
|
||
| env = os.environ.copy() | ||
| cxxflags = env.get("CXXFLAGS", "") | ||
| env["CXXFLAGS"] = f'{cxxflags} -DVERSION_INFO=\\"{__version__}\\"' | ||
mhucka marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if not os.path.exists(self.build_temp): | ||
| os.makedirs(self.build_temp) | ||
| subprocess.check_call( | ||
|
|
@@ -124,42 +125,7 @@ def build_extension(self, ext): | |
| ) | ||
|
|
||
|
|
||
| setup( | ||
| ext_modules=[ | ||
| CMakeExtension("qsimcirq/qsim_avx512"), | ||
| CMakeExtension("qsimcirq/qsim_avx2"), | ||
|
|
@@ -170,49 +136,5 @@ def build_extension(self, ext): | |
| CMakeExtension("qsimcirq/qsim_decide"), | ||
| CMakeExtension("qsimcirq/qsim_hip"), | ||
| ], | ||
| cmdclass={"build_ext": CMakeBuild}, | ||
| ) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This duplicates
requirements.txt- do you plan on retiring that file together withdev-requirements.txtand only declare dependencies in pyproject.toml?You might want to check if qsim can be converted to a uv managed project which will support dependency-tree locking and a full development reproducibility.