Skip to content

Commit 6ca389d

Browse files
authored
Merge pull request #231 from astro-informatics/mmg/cuda-primitive
Updates to custom CUDA HEALPix FFT primitive
2 parents 50c4dd9 + 620f49f commit 6ca389d

File tree

14 files changed

+548
-609
lines changed

14 files changed

+548
-609
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ jobs:
2626
run: |
2727
sudo apt install pandoc
2828
python -m pip install --upgrade pip
29-
pip install jaxlib
30-
pip install -r requirements/requirements-core.txt
31-
pip install -r requirements/requirements-docs.txt
32-
pip install .
29+
pip install .[docs]
3330
3431
- name: Build Documentation
3532
run: |

.github/workflows/tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ jobs:
2828
- name: Install dependencies
2929
run: |
3030
python -m pip install --upgrade pip
31-
pip install -r requirements/requirements-tests.txt
32-
pip install -r requirements/requirements-core.txt
33-
pip install .
31+
pip install .[tests]
3432
3533
- name: Run tests
3634
run: |

MANIFEST.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
graft s2fft
22
graft tests
3-
graft requirements
43
graft docs
54

65
include .pip_readme.rst
@@ -14,4 +13,4 @@ exclude *.log
1413
recursive-exclude docs/_build *
1514
recursive-exclude notebooks *
1615

17-
global-exclude *.py[cod] __pycache__ *.so *.dylib .ipynb_checkpoints/** *~
16+
global-exclude *.py[cod] __pycache__ *.so *.dylib .ipynb_checkpoints/** *~

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,4 +290,13 @@ it will be of use to a wider community.
290290
Copyright 2023 Matthew Price, Jason McEwen and contributors.
291291

292292
`S2FFT` is free software made available under the MIT License. For
293-
details see the LICENSE file.
293+
details see the [`LICENCE.txt`](LICENCE.txt) file.
294+
295+
The file [`lib/include/kernel_helpers.h`](lib/include/kernel_helpers.h) is adapted from
296+
[code](https://github.com/dfm/extending-jax/blob/c33869665236877a2ae281f3f5dbff579e8f5b00/lib/kernel_helpers.h) in [a tutorial on extending JAX](https://github.com/dfm/extending-jax) by
297+
[Dan Foreman-Mackey](https://github.com/dfm) and licensed under a [MIT license](https://github.com/dfm/extending-jax/blob/371dca93c6405368fa8e71690afd3968d75f4bac/LICENSE).
298+
299+
The file [`lib/include/kernel_nanobind_helpers.h`](lib/include/kernel_nanobind_helpers.h)
300+
is adapted from [code](https://github.com/jax-ml/jax/blob/3d389a7fb440c412d95a1f70ffb91d58408247d0/jaxlib/kernel_nanobind_helpers.h)
301+
by the [JAX](https://github.com/jax-ml/jax) authors
302+
and licensed under a [Apache-2.0 license](https://github.com/jax-ml/jax/blob/3d389a7fb440c412d95a1f70ffb91d58408247d0/LICENSE).

lib/include/kernel_helpers.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
// Adapted from code in a tutorial by Dan Foreman-Mackey
2+
// https://github.com/dfm/extending-jax/blob/c33869665236877a2ae281/lib/kernel_helpers.h
3+
//
4+
// Original license:
5+
//
6+
// MIT License
7+
//
8+
// Copyright (c) 2021 Dan Foreman-Mackey
9+
//
10+
// Permission is hereby granted, free of charge, to any person obtaining a copy
11+
// of this software and associated documentation files (the "Software"), to deal
12+
// in the Software without restriction, including without limitation the rights
13+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
// copies of the Software, and to permit persons to whom the Software is
15+
// furnished to do so, subject to the following conditions:
16+
//
17+
// The above copyright notice and this permission notice shall be included in all
18+
// copies or substantial portions of the Software.
19+
//
20+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
26+
// SOFTWARE.
27+
128
// This header is not specific to our application and you'll probably want
229
// something like this for any extension you're building. This includes the
330
// infrastructure needed to serialize descriptors that are used with the

lib/include/kernel_nanobind_helpers.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Adapted from code by JAX authors
2+
// https://github.com/jax-ml/jax/blob/3d389a7fb440c412d/jaxlib/kernel_nanobind_helpers.h
3+
14
/* Copyright 2019 The JAX Authors.
25
36
Licensed under the Apache License, Version 2.0 (the "License");

requirements/requirements-core.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

requirements/requirements-docs.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

requirements/requirements-plotting.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

requirements/requirements-tests.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)