Skip to content

Commit

Permalink
Merge branch 'master' into fix_issue_211
Browse files Browse the repository at this point in the history
  • Loading branch information
chaithyagr authored Nov 21, 2024
2 parents 2281f0d + 6e04a36 commit b63ac1c
Show file tree
Hide file tree
Showing 8 changed files with 715 additions and 6 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Draft PDF
on:
push:
paths:
- docs/paper-joss/*
- .github/workflows/draft-pdf.yml*

permissions:
pull-requests: write

jobs:
paper:
runs-on: ubuntu-latest
name: Paper Draft
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build draft PDF
uses: openjournals/openjournals-draft-action@master
with:
journal: joss
# This should be the path to the paper within your repo.
paper-path: docs/paper-joss/paper.md
- name: Upload
uses: actions/upload-artifact@v4
with:
name: paper
# This is the output path where Pandoc will write the compiled
# PDF. Note, this should be the same directory as the input
# paper.md
path: docs/paper-joss/paper.pdf

link:
needs: paper # make sure the artifacts are uploaded first
runs-on: ubuntu-latest
permissions:
contents: write # for commenting on your commit
pull-requests: write # for commenting on your pr
steps:
- uses: beni69/artifact-link@v1
with:
token: ${{ github.token }}
1 change: 1 addition & 0 deletions .github/workflows/master-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
destination_dir: . # Ensure you deploy to the root of the gh-pages branch
publish_branch: gh-pages
keep_files: false


# build-n-publish:
# name: Build and publish Python 🐍 distributions 📦 to TestPyPI
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
jobs:
test-cpu:
runs-on: cpu
if: ${{ !contains(github.event.head_commit.message, '!style') || github.ref == 'refs/heads/master' }}
if: ${{ !contains(github.event.head_commit.message, '[style]') || github.ref == 'refs/heads/master' }}
strategy:
matrix:
backend: [finufft, pynfft, pynufft-cpu, bart, sigpy, torchkbnufft-cpu]
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

test-gpu:
runs-on: gpu
if: ${{ !contains(github.event.head_commit.message, '!style') || github.ref == 'refs/heads/master' }}
if: ${{ !contains(github.event.head_commit.message, '[style]') || github.ref == 'refs/heads/master' }}
strategy:
matrix:
backend: [cufinufft, gpunufft, torchkbnufft-gpu, tensorflow]
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
test-examples:
runs-on: gpu
needs: get-commit-message
if: ${{ !contains(needs.get-commit-message.outputs.message, '!style') || github.ref == 'refs/heads/master' }}
if: ${{ !contains(needs.get-commit-message.outputs.message, '[style]') || github.ref == 'refs/heads/master' }}

steps:
- uses: actions/checkout@v4
Expand All @@ -207,15 +207,15 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -e .[test,dev]
python -m pip install finufft pooch brainweb-dl torch
python -m pip install finufft pooch brainweb-dl torch fastmri
- name: Install GPU related interfaces
run: |
export CUDA_BIN_PATH=/usr/local/cuda-12.1/
export PATH=/usr/local/cuda-12.1/bin/:${PATH}
export LD_LIBRARY_PATH=/usr/local/cuda-12.1/lib64/:${LD_LIBRARY_PATH}
pip install cupy-cuda12x torch
python -m pip install gpuNUFFT "cufinufft<2.3" sigpy scikit-image
python -m pip install gpuNUFFT "cufinufft<2.3" sigpy scikit-image fastmri
- name: Run examples
shell: bash
Expand Down Expand Up @@ -298,7 +298,7 @@ jobs:
name: Build API Documentation
runs-on: gpu
needs: get-commit-message
if: ${{ contains(needs.get-commit-message.outputs.message, '!docs_build') || github.ref == 'refs/heads/master' }}
if: ${{ contains(needs.get-commit-message.outputs.message, '[docs]') || github.ref == 'refs/heads/master' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
*.npy
*.gif
docs/sg_execution_times.rst
build/
dist/
*.egg-info/
Expand Down
165 changes: 165 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<!-- omit in toc -->
# Contributing to MRI-NUFFT

First off, thanks for taking the time to contribute! ❤️

All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉

> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
> - Star the project
> - Tweet about it
> - Refer this project in your project's readme
> - Mention the project at local meetups and tell your friends/colleagues
<!-- omit in toc -->
## Table of Contents

- [Code of Conduct](#code-of-conduct)
- [I Have a Question](#i-have-a-question)
- [I Want To Contribute](#i-want-to-contribute)
- [Reporting Bugs](#reporting-bugs)
- [Suggesting Enhancements](#suggesting-enhancements)
- [Your First Code Contribution](#your-first-code-contribution)
- [Improving The Documentation](#improving-the-documentation)
- [Styleguides](#styleguides)
- [Commit Messages](#commit-messages)
- [Join The Project Team](#join-the-project-team)


## Code of Conduct

This project and everyone participating in it is governed by the
[MRI-NUFFT Code of Conduct](https://github.com/mind-inria/mri-nufft/blob/master/CODE_OF_CONDUCT.md).
By participating, you are expected to uphold this code. Please report unacceptable behavior
to <[email protected]> or <[email protected]>.


## I Have a Question

> If you want to ask a question, we assume that you have read the available [Documentation](https://mind-inria.github.io.mri-nufft/).
Before you ask a question, it is best to search for existing [Issues](https://github.com/mind-inria/mri-nufft/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.

If you then still feel the need to ask a question and need clarification, we recommend the following:

- Open an [Issue](https://github.com/mind-inria/mri-nufft/issues/new).
- Provide as much context as you can about what you're running into.
- Provide project and platform versions (python, CUDA, torch versions notably), depending on what seems relevant.

We will then take care of the issue as soon as possible.


## I Want To Contribute

> ### Legal Notice <!-- omit in toc -->
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project licence (BSD-3-Clause).
### Reporting Bugs

<!-- omit in toc -->
#### Before Submitting a Bug Report

A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.

- Make sure that you are using the latest version.
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://mind-inria.github.io.mri-nufft/). If you are looking for support, you might want to check [this section](#i-have-a-question)).
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/mind-inria/mri-nufft/issues?q=label%3Abug).
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
- Collect information about the bug:
- Stack trace (Traceback)
- OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
- Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
- Possibly your input and the output
- Can you reliably reproduce the issue? And can you also reproduce it with older versions?

<!-- omit in toc -->
#### How Do I Submit a Good Bug Report?

> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to <[email protected]>.
<!-- You may add a PGP key to allow the messages to be sent encrypted as well. -->
We use GitHub issues to track bugs and errors. If you run into an issue with the project:

- Open an [Issue](https://github.com/mind-inria/mri-nufft/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
- Explain the behavior you would expect and the actual behavior.
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
- Provide the information you collected in the previous section.

Once it's filed:

- The project team will label the issue accordingly.
- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
- If the team is able to reproduce the issue, it will be marked `bug`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#your-first-code-contribution).

<!-- You might want to create an issue template for bugs and errors that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->


### Suggesting Enhancements

This section guides you through submitting an enhancement suggestion for MRI-NUFFT, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.

<!-- omit in toc -->
#### Before Submitting an Enhancement

- Make sure that you are using the latest version.
- Read the [documentation](https://mind-inria.github.io.mri-nufft/) carefully and find out if the functionality is already covered, maybe by an individual configuration.
- Perform a [search](https://github.com/mind-inria/mri-nufft/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.

<!-- omit in toc -->
#### How Do I Submit a Good Enhancement Suggestion?

Enhancement suggestions are tracked as [GitHub issues](https://github.com/mind-inria/mri-nufft/issues).

- Use a **clear and descriptive title** for the issue to identify the suggestion.
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
- **Explain why this enhancement would be useful** to most MRI-NUFFT users. You may also want to point out the other projects that solved it better and which could serve as inspiration.

<!-- You might want to create an issue template for enhancement suggestions that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->

### Your First Code Contribution
<!-- TODO
include Setup of env, IDE and typical getting started instructions?
-->
The project team welcomes your code contributions. Before you start working with the project, please follow these steps:

```bash
git clone https://github.com:mind-inria/mri-nufft
pip install -e ./mri-nufft[dev]
```
Then proceed to implement your changes and if possible, add tests and/or example code. When you are done, submit a pull request.


### Improving The Documentation

The documentation of MRI-NUFFT can be found at [https://mind-inria.github.io/mri-nufft/](https://mind-inria.github.io/mri-nufft/). If you want to help improve the documentation, you can do so by:
- Adding new examples script to the documentation (in the `examples` folder).
- Improving the existing documentation (in the `docs` folder)

The documentation is written in the [ReStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html) format and built using Sphinx.
To build the documentation locally, you can run the following commands :
```bash
git clone https://github.com:mind-inria/mri-nufft
pip install -e ./mri-nufft[dev,doc]
cd mri-nufft/docs
# do your changes
cd ..
python -m sphinx-build docs docs_build
# view the documentation in your browser
python -m http.server --directory docs_build 8080
# open localhost:8080 in your browser
```


## Styleguides
### Docstrings
We use Numpy style docstrings. You can find more information about them [here](https://numpydoc.readthedocs.io/en/latest/format.html).

### Commit Messages
We recommend (but do not enforce) using the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) format for commit messages. This format allows for better readability and automatic Changelog generation.

## Attribution
This guide is based on the [contributing.md](https://contributing.md/generator)!

Loading

1 comment on commit b63ac1c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Artifacts

Please sign in to comment.