Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
daab580
Add cccl/python/cuda_cccl directory and use from cuda_parallel, cuda_…
rwgk Dec 12, 2024
ef9d5f4
Run `copy_cccl_headers_to_aude_include()` before `setup()`
rwgk Dec 20, 2024
bc116dc
Create python/cuda_cccl/cuda/_include/__init__.py, then simply import…
rwgk Dec 20, 2024
2913ae0
Add cuda.cccl._version exactly as for cuda.cooperative and cuda.parallel
rwgk Dec 20, 2024
7dbb82b
Bug fix: cuda/_include only exists after shutil.copytree() ran.
rwgk Dec 20, 2024
0703901
Use `f"cuda-cccl @ file://{cccl_path}/python/cuda_cccl"` in setup.py
rwgk Dec 20, 2024
fc0e543
Remove CustomBuildCommand, CustomWheelBuild in cuda_parallel/setup.py…
rwgk Dec 20, 2024
2e64345
Replace := operator (needs Python 3.8+)
rwgk Dec 20, 2024
82467cd
Merge branch 'main' into pip-cuda-cccl
rwgk Dec 20, 2024
f13a96b
Fix oversights: remove `pip3 install ./cuda_cccl` lines from README.md
rwgk Dec 20, 2024
9ed6036
Restore original README.md: `pip3 install -e` now works on first pass.
rwgk Dec 20, 2024
c9a4d96
cuda_cccl/README.md: FOR INTERNAL USE ONLY
rwgk Dec 20, 2024
df943c0
Remove `$pymajor.$pyminor.` prefix in cuda_cccl _version.py (as sugge…
rwgk Dec 20, 2024
40c8389
Modernize pyproject.toml, setup.py
rwgk Dec 21, 2024
e3c7867
Install CCCL headers under cuda.cccl.include
rwgk Dec 21, 2024
acbd477
Merge branch 'main' into pip-cuda-cccl
rwgk Dec 21, 2024
06f575f
Factor out cuda_cccl/cuda/cccl/include_paths.py
rwgk Dec 21, 2024
e747768
Reuse cuda_cccl/cuda/cccl/include_paths.py from cuda_cooperative
rwgk Dec 21, 2024
499b191
Merge branch 'main' into pip-cuda-cccl
rwgk Dec 21, 2024
62ce2d3
Add missing Copyright notice.
rwgk Dec 21, 2024
65c5a15
Add missing __init__.py (cuda.cccl)
rwgk Dec 21, 2024
bffece6
Add `"cuda.cccl"` to `autodoc.mock_imports`
rwgk Dec 21, 2024
585447c
Move cuda.cccl.include_paths into function where it is used. (Attempt…
rwgk Dec 22, 2024
55c4311
Add # TODO: move this to a module-level import
rwgk Dec 22, 2024
1f3a029
Modernize cuda_cooperative/pyproject.toml, setup.py
rwgk Dec 26, 2024
61637d6
Convert cuda_cooperative to use hatchling as build backend.
rwgk Dec 26, 2024
4a0cca1
Revert "Convert cuda_cooperative to use hatchling as build backend."
rwgk Dec 27, 2024
7dd3d16
Move numpy from [build-system] requires -> [project] dependencies
rwgk Dec 27, 2024
efab5be
Move pyproject.toml [project] dependencies -> setup.py install_requir…
rwgk Dec 27, 2024
9fde3d1
Remove copy_license() and use license_files=["../../LICENSE"] instead.
rwgk Dec 27, 2024
bda5d51
Further modernize cuda_cccl/setup.py to use pathlib
rwgk Dec 27, 2024
4e9720d
Trivial simplifications in cuda_cccl/pyproject.toml
rwgk Dec 27, 2024
c1aea17
Further simplify cuda_cccl/pyproject.toml, setup.py: remove inconsequ…
rwgk Dec 28, 2024
d18d699
Make cuda_cooperative/pyproject.toml more similar to cuda_cccl/pyproj…
rwgk Dec 28, 2024
9be94c6
Add taplo-pre-commit to .pre-commit-config.yaml
rwgk Dec 28, 2024
c2a9f24
taplo-pre-commit auto-fixes
rwgk Dec 28, 2024
c89d620
Use pathlib in cuda_cooperative/setup.py
rwgk Dec 28, 2024
1b3599b
CCCL_PYTHON_PATH in cuda_cooperative/setup.py
rwgk Dec 28, 2024
796b741
Modernize cuda_parallel/pyproject.toml, setup.py
rwgk Dec 28, 2024
9a63830
Use pathlib in cuda_parallel/setup.py
rwgk Dec 28, 2024
477fe3b
Add `# TOML lint & format` comment.
rwgk Dec 28, 2024
246ddf7
Replace MANIFEST.in with `[tool.setuptools.package-data]` section in …
rwgk Dec 28, 2024
e1fd264
Use pathlib in cuda/cccl/include_paths.py
rwgk Dec 28, 2024
87b46ca
pre-commit autoupdate (EXCEPT clang-format, which was manually restored)
rwgk Dec 29, 2024
9597dad
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 6, 2025
eddc6cc
Fixes after git merge main
rwgk Jan 6, 2025
bcf0de8
Resolve warning: AttributeError: '_Reduce' object has no attribute 'b…
rwgk Jan 6, 2025
c763301
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 8, 2025
71fd243
Move `copy_cccl_headers_to_cuda_cccl_include()` functionality to `cla…
rwgk Jan 8, 2025
79057cf
Introduce cuda_cooperative/constraints.txt
rwgk Jan 8, 2025
ccaf8a5
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 9, 2025
46a8329
Also add cuda_parallel/constraints.txt
rwgk Jan 9, 2025
a07222b
Add `--constraint constraints.txt` in ci/test_python.sh
rwgk Jan 9, 2025
2d3c2ed
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 14, 2025
b65f510
Update Copyright dates
rwgk Jan 14, 2025
47893d9
Switch to https://github.com/ComPWA/taplo-pre-commit (the other repo …
rwgk Jan 14, 2025
324ac4f
Remove unused cuda_parallel jinja2 dependency (noticed by chance).
rwgk Jan 14, 2025
3026c81
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 14, 2025
b0d422a
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 15, 2025
e904846
Remove constraints.txt files, advertise running `pip install cuda-ccc…
rwgk Jan 15, 2025
c1f571d
Make cuda_cooperative, cuda_parallel testing completely independent.
rwgk Jan 15, 2025
792e4ba
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 15, 2025
695cc9b
Run only test_python.sh [skip-rapids][skip-matx][skip-docs][skip-vdc]
rwgk Jan 15, 2025
ea33a21
Try using another runner (because V100 runners seem to be stuck) [ski…
rwgk Jan 15, 2025
d439f79
Fix sign-compare warning (#3408) [skip-rapids][skip-matx][skip-docs][…
bernhardmgruber Jan 15, 2025
9a7b498
Revert "Try using another runner (because V100 runners seem to be stu…
rwgk Jan 15, 2025
5d33bb0
Merge branch 'main' into pip-cuda-cccl [skip-rapids][skip-matx][skip-…
rwgk Jan 15, 2025
be34834
Try using A100 runner (because V100 runners still seem to be stuck) […
rwgk Jan 15, 2025
b2b2b5b
Also show cuda-cooperative site-packages, cuda-parallel site-packages…
rwgk Jan 15, 2025
9f83b0d
Try using l4 runner (because V100 runners still seem to be stuck) [sk…
rwgk Jan 15, 2025
4807a79
Restore original ci/matrix.yaml [skip-rapids]
rwgk Jan 16, 2025
d97a68a
Use for loop in test_python.sh to avoid code duplication.
rwgk Jan 16, 2025
ec206fd
Run only test_python.sh [skip-rapids][skip-matx][skip-docs][skip-vdc]…
rwgk Jan 15, 2025
1f4d210
Merge branch 'main' into pip-cuda-cccl [skip-rapids][skip-matx][skip-…
rwgk Jan 16, 2025
f94bbb1
Comment out taplo-lint in pre-commit config [skip-rapids][skip-matx][…
rwgk Jan 16, 2025
b48f866
Revert "Run only test_python.sh [skip-rapids][skip-matx][skip-docs][s…
rwgk Jan 16, 2025
917147f
Implement suggestion by @shwina (https://github.com/NVIDIA/cccl/pull/…
rwgk Jan 16, 2025
ebdbb22
Merge branch 'main' into pip-cuda-cccl
rwgk Jan 16, 2025
12dbf29
Address feedback by @leofang
rwgk Jan 16, 2025
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
Prev Previous commit
Next Next commit
Move pyproject.toml [project] dependencies -> setup.py install_requir…
…es, to be able to use CCCL_PATH
  • Loading branch information
rwgk committed Dec 27, 2024
commit efab5beeabfc2cd4eabe444cab2e06f6f76f51a1
10 changes: 1 addition & 9 deletions python/cuda_cooperative/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build-backend = "setuptools.build_meta"
name = "cuda-cooperative"
description = "Experimental Core Library for CUDA Python"
requires-python = ">=3.9"
dynamic = ["version", "readme"]
dynamic = ["version", "readme", "dependencies"]
authors = [
{ name = "NVIDIA Corporation" }
]
Expand All @@ -23,14 +23,6 @@ classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Environment :: GPU :: NVIDIA CUDA",
]
dependencies = [
# "cuda-cccl @ file:///home/coder/cccl/python/cuda_cccl",
"numpy",
"numba>=0.60.0",
"pynvjitlink-cu12>=0.2.4",
"cuda-python",
"jinja2",
]

[project.optional-dependencies]
test = [
Expand Down
11 changes: 10 additions & 1 deletion python/cuda_cooperative/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,13 @@ def copy_license():
shutil.copy(src, dst)


setup()
setup(
install_requires=[
f"cuda-cccl @ file://{CCCL_PATH}/python/cuda_cccl",
"numpy",
"numba>=0.60.0",
"pynvjitlink-cu12>=0.2.4",
"cuda-python",
"jinja2",
],
)