Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1 Release #65

Merged
merged 87 commits into from
Mar 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
3cbe114
Bump version: 0.1.3 → 0.1.4
Mar 22, 2022
7532e80
Merge pull request #43 from tldr-group/main
isaacsquires Jul 11, 2022
602448e
New convergence tests for solver and periodic
isaacsquires Feb 9, 2023
c99ce0c
conv finished
Feb 22, 2023
1b4e727
Merge pull request #46 from tldr-group/new-convergence-tests
stke9 Feb 22, 2023
1107bc8
Merge branch 'development' of https://github.com/tldr-group/taufactor…
Feb 22, 2023
df06534
pytorch implemented
Feb 23, 2023
09e3d44
Merge pull request #47 from tldr-group/torch-conversion
stke9 Feb 23, 2023
35799e9
remove cupy deps
isaacsquires Feb 23, 2023
55e77b4
tifffile reqs
isaacsquires Feb 23, 2023
afceeca
Merge pull request #48 from tldr-group/cupy-purge
isaacsquires Feb 23, 2023
c6a5f41
docs updated to md
isaacsquires Feb 23, 2023
a919667
pytorch deps error in docs
isaacsquires Feb 23, 2023
0e54f9f
update sphinx reqs
isaacsquires Feb 23, 2023
3b67151
tifffile to sphinx reqs
isaacsquires Feb 23, 2023
582944e
myst_parser to sphinx reqs
isaacsquires Feb 23, 2023
3800c01
update readme to purge cupy
isaacsquires Feb 23, 2023
9f65607
tldr link to readme
isaacsquires Feb 23, 2023
73b520c
Merge pull request #49 from tldr-group/update-docs
isaacsquires Feb 23, 2023
57ba1dc
remove readme.rst
isaacsquires Feb 23, 2023
ec35be2
Create python-package.yml
isaacsquires Feb 23, 2023
73bf408
pr to dev
isaacsquires Feb 23, 2023
e0c5dc3
run issue
isaacsquires Feb 23, 2023
51a2d38
run syntax
isaacsquires Feb 23, 2023
ddd9a37
rename workflow
isaacsquires Feb 23, 2023
96da302
name action and add to readme
isaacsquires Feb 23, 2023
14a8f07
add badge
isaacsquires Feb 23, 2023
b6f64cd
try test env without python version
isaacsquires Feb 23, 2023
104fcbb
remove rsts
isaacsquires Feb 23, 2023
6d61f45
Merge pull request #50 from tldr-group/CI-testing
isaacsquires Feb 24, 2023
f73a49c
device added, tests to cpu
Feb 24, 2023
62a66f8
Merge pull request #51 from tldr-group/device-selection
stke9 Feb 24, 2023
d152ba1
Update docs issues and dates
isaacsquires Feb 24, 2023
078df49
add paper compile action
isaacsquires Feb 24, 2023
8bffa68
update on for pytests
isaacsquires Feb 24, 2023
8b3711b
add name for workflow
isaacsquires Feb 24, 2023
15a05cf
check paper compile
isaacsquires Feb 27, 2023
a665135
Merge pull request #52 from tldr-group/docs-license-update
isaacsquires Feb 27, 2023
8e2f9e8
JOSS formatting
isaacsquires Feb 27, 2023
3910e18
separate bib file
isaacsquires Feb 27, 2023
ee37ceb
fix metrics and docs, add flux direction util
isaacsquires Feb 28, 2023
5b8f2a4
remove flux maps
isaacsquires Feb 28, 2023
d2fc78a
2d capable plot flux
isaacsquires Feb 28, 2023
dac7917
torch refactor and some asertions on input image
isaacsquires Feb 28, 2023
db35b16
Merge pull request #53 from tldr-group/util-plot-show-direction
isaacsquires Feb 28, 2023
143e6e8
update to v1
isaacsquires Mar 1, 2023
45dd9d9
validation errors for multiphase and normal
isaacsquires Mar 1, 2023
ed3be44
catch device if no cuda avail and set to cpu
isaacsquires Mar 1, 2023
db01e0f
set device as torch device
isaacsquires Mar 1, 2023
478442a
device selection to multiphase solver
isaacsquires Mar 1, 2023
9f13bd2
propogate device change throughout all solvers
isaacsquires Mar 1, 2023
1659a19
warnings instead of print
isaacsquires Mar 1, 2023
12e4d51
pytorch import error
isaacsquires Mar 1, 2023
71cffda
Merge pull request #57 from tldr-group/compile-paper-action
isaacsquires Mar 8, 2023
2ea332b
Merge pull request #59 from tldr-group/validation-errors
isaacsquires Mar 8, 2023
f0f048b
Add note to readme re taufactor matlab
isaacsquires Mar 8, 2023
22790c7
Merge pull request #60 from tldr-group/58-confusion-use-taufactor-wit…
isaacsquires Mar 8, 2023
bbe880d
pytorch version 1.10
isaacsquires Mar 9, 2023
5469665
first draft paper
Mar 10, 2023
7d5ae6c
paper draft 1.1 sk
Mar 10, 2023
d54e56d
paper draft 1.2 sk
Mar 10, 2023
e099147
paper draft 2 sk
Mar 10, 2023
f794bc6
paper draft 2.1
Mar 10, 2023
d255a29
Isaac's paper edits
isaacsquires Mar 10, 2023
c3ae271
Update plot with nicer padding and PoreSpy capital
isaacsquires Mar 10, 2023
47f2639
Fix equation formatting error
isaacsquires Mar 10, 2023
d137d2c
paper with SC corrections
Mar 23, 2023
5983de1
SC first changes
Mar 23, 2023
a7e75b8
pep8 format
isaacsquires Mar 23, 2023
5d5e7c8
Merge branch 'release-v1' into development
isaacsquires Mar 23, 2023
1ed20a8
SC second edits
Mar 23, 2023
7bb94c3
SC edits 3
Mar 23, 2023
be1d3b2
final paper draft
Mar 23, 2023
d9eaee5
reformat and fix mphase issues
isaacsquires Mar 23, 2023
97ff163
stop tensor error
isaacsquires Mar 23, 2023
607fc72
include non trivial tests
isaacsquires Mar 23, 2023
89f1385
Merge branch 'release-v1' into development
isaacsquires Mar 23, 2023
dcc0b88
Merge pull request #62 from tldr-group/development
isaacsquires Mar 23, 2023
abd947f
Merge pull request #63 from tldr-group/JOSS-paper
isaacsquires Mar 23, 2023
4c25e13
wrap inf in tensor for tests
isaacsquires Mar 23, 2023
1c760c5
add eg for pytorch
isaacsquires Mar 23, 2023
5765a12
new tau image
isaacsquires Mar 23, 2023
a3e1ba4
add paper to histroy
isaacsquires Mar 23, 2023
8ef5cd9
release date
isaacsquires Mar 23, 2023
cb85e31
include conv and verbose in docs
isaacsquires Mar 23, 2023
7d68ad7
permute doc
isaacsquires Mar 23, 2023
b391adb
Merge pull request #64 from tldr-group/release-v1
isaacsquires Mar 23, 2023
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
25 changes: 25 additions & 0 deletions .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: JOSS Paper Compile

on: [push]

jobs:
paper:
runs-on: ubuntu-latest
name: Paper Draft
steps:
- name: Checkout
uses: actions/checkout@v3
- 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: paper.md
- name: Upload
uses: actions/upload-artifact@v1
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: paper.pdf
37 changes: 37 additions & 0 deletions .github/workflows/taufactor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will install Python dependencies, run tests and lint with a single version of Python
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python

name: TauFactor Tests

on: [push, pull_request]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
uses: actions/setup-python@v3
with:
python-version: "3.8"
- name: Install dependencies
run: |
$CONDA/bin/conda env update --file tests/environment.yml --name base
- name: Install taufactor
run: |
$CONDA/bin/pip install -e .
- name: Lint with flake8
run: |
$CONDA/bin/conda install flake8
# stop the build if there are Python syntax errors or undefined names
$CONDA/bin/flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
$CONDA/bin/flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
$CONDA/bin/conda install pytest
$CONDA/bin/python -m pytest
8 changes: 4 additions & 4 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ version: 2

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py
configuration: docs/conf.py

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: docs/requirements.txt
version: 3.8
install:
- requirements: docs/requirements.txt
11 changes: 11 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Authors

## Team

- Sam Cooper <[email protected]>
- Isaac Squires <[email protected]>
- Steve Kench <[email protected]>

## Contributors

None yet. Why not be the first?
15 changes: 0 additions & 15 deletions AUTHORS.rst

This file was deleted.

111 changes: 53 additions & 58 deletions CONTRIBUTING.rst → CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,125 +1,120 @@
.. highlight:: shell

============
Contributing
============
# Contributing

Contributions are welcome, and they are greatly appreciated! Every little bit
helps, and credit will always be given.

You can contribute in many ways:

Types of Contributions
----------------------
## Types of Contributions

Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/tldr-group/taufactor/issues.

If you are reporting a bug, please include:

* Your operating system name and version.
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.
- Your operating system name and version.
- Any details about your local setup that might be helpful in troubleshooting.
- Detailed steps to reproduce the bug.

Fix Bugs
~~~~~~~~
## Fix Bugs

Look through the GitHub issues for bugs. Anything tagged with "bug" and "help
wanted" is open to whoever wants to implement it.

Implement Features
~~~~~~~~~~~~~~~~~~
## Implement Features

Look through the GitHub issues for features. Anything tagged with "enhancement"
and "help wanted" is open to whoever wants to implement it.

Write Documentation
~~~~~~~~~~~~~~~~~~~
## Write Documentation

TauFactor could always use more documentation, whether as part of the
official TauFactor docs, in docstrings, or even on the web in blog posts,
articles, and such.

Submit Feedback
~~~~~~~~~~~~~~~
## Submit Feedback

The best way to send feedback is to file an issue at https://github.com/tldr-group/taufactor/issues.

If you are proposing a feature:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.
* Remember that this is a volunteer-driven project, and that contributions
are welcome :)
- Explain in detail how it would work.
- Keep the scope as narrow as possible, to make it easier to implement.
- Remember that this is a volunteer-driven project, and that contributions
are welcome :)

Get Started!
------------
## Get Started!

Ready to contribute? Here's how to set up `taufactor` for local development.

1. Fork the `taufactor` repo on GitHub.
2. Clone your fork locally::

$ git clone [email protected]:your_name_here/taufactor.git
2. Clone your fork locally:

3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
```
git clone [email protected]:your_name_here/taufactor.git
```

$ mkvirtualenv taufactor
$ cd taufactor/
$ python setup.py develop
3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development:

4. Create a branch for local development::
```
mkvirtualenv taufactor
cd taufactor/
python setup.py develop
```

$ git checkout -b name-of-your-bugfix-or-feature
4. Create a branch for local development:

Now you can make your changes locally.
```
git checkout -b name-of-your-bugfix-or-feature
```

5. When you're done making changes, check that your changes pass flake8 and the
tests, including testing other Python versions with tox::
tests, including testing other Python versions with tox:

$ flake8 taufactor tests
$ python setup.py test or pytest
$ tox
```
flake8 taufactor tests
python setup.py test or pytest
tox
```

To get flake8 and tox, just pip install them into your virtualenv.
To get flake8 and tox, just pip install them into your virtualenv.

6. Commit your changes and push your branch to GitHub::
6. Commit your changes and push your branch to GitHub:

$ git add .
$ git commit -m "Your detailed description of your changes."
$ git push origin name-of-your-bugfix-or-feature
```
git add .
git commit -m "Your detailed description of your changes."
git push origin name-of-your-bugfix-or-feature
```

7. Submit a pull request through the GitHub website.

Pull Request Guidelines
-----------------------
## Pull Request Guidelines

Before you submit a pull request, check that it meets these guidelines:

1. The pull request should include tests.
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.

Tips
----
feature to the list in README.md.

To run a subset of tests::
## Tips

$ pytest tests.test_taufactor
To run a subset of tests:

pytest tests.test_taufactor

Deploying
---------
## Deploying

A reminder for the maintainers on how to deploy.
Make sure all your changes are committed (including an entry in HISTORY.rst).
Then run::
Then run:

$ bump2version patch # possible: major / minor / patch
$ git push
$ git push --tags
```
bump2version patch # possible: major / minor / patch
git push
git push --tags
```

Travis will then deploy to PyPI if tests pass.
44 changes: 44 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# History

## 1.0.0 (2023-03-23)

---

- Migrated to PyTorch from CuPy
- New convergence criteria
- New documentation style
- CI testing
- Includes TauFactor paper

## 0.1.4 (2022-07-11)

---

- Add TauE solver
- Add triple phase boundary calculations
- Fix cuboids not converging
- Fix convergence messaging

## 0.1.3 (2021-03-25)

---

- Hotfix code in taufactor.py

## 0.1.2 (2021-03-25)

---

- Added multi-phase and periodic solvers and metrics calculations

## 0.1.1 (2021-02-10)

---

- Removed CuPy from requirements and added installation instructions to README

## 0.1.0 (2021-02-08)

---

- First release on PyPI.
35 changes: 0 additions & 35 deletions HISTORY.rst

This file was deleted.

3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021, Isaac Squires
Copyright (c) 2023, Isaac Squires

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

8 changes: 4 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include AUTHORS.rst
include CONTRIBUTING.rst
include HISTORY.rst
include AUTHORS.md
include CONTRIBUTING.md
include HISTORY.md
include LICENSE
include README.rst
include README.md

recursive-include tests *
recursive-exclude * __pycache__
Expand Down
Loading