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

Tuto drunet tmp #195

Closed
wants to merge 920 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
920 commits
Select commit Hold shift + click to select a range
935b992
syntax correction for torch.from_numpy
romainphan Feb 26, 2024
7355550
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Feb 26, 2024
c7a2d50
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
33bf8f1
resolved matrix multiplicatin issues + changed obsolete test of Linea…
romainphan Feb 26, 2024
c4460bf
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Feb 26, 2024
5dd5309
corrected register buffer
romainphan Feb 26, 2024
697db7e
removed debug prints
romainphan Feb 26, 2024
7716dca
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
891ee44
debugging...
romainphan Feb 26, 2024
ee0c93a
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
2604e53
added ()
romainphan Feb 26, 2024
73d091c
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
bed38a7
back to meas_op(x)
romainphan Feb 26, 2024
8702ca5
added ()
romainphan Feb 26, 2024
7ee1c1c
changed test core prep
romainphan Feb 26, 2024
704304b
removed SplitRowPoisson testing, in accordance with LinearRowSplit's …
romainphan Feb 26, 2024
1b72e07
small comment on dev>recon.py
romainphan Feb 26, 2024
8ae1cab
commented (not deleted) definition of SplitRowPoisson
romainphan Feb 26, 2024
4036297
added get_Perm method for HadamSplit
romainphan Feb 26, 2024
121c702
using get_Perm to access permutation matrix
romainphan Feb 26, 2024
3895b5e
Merge pull request #172 from openspyrit/romain_debug
romainphan Feb 26, 2024
e1160e9
putting back old thumbnails
romainphan Feb 26, 2024
1fac823
trying new path for tuto 2 image
romainphan Feb 26, 2024
b07f8f0
corrected image path in tutos
romainphan Feb 27, 2024
3a49f79
changed thumbnail path for tutos
romainphan Feb 27, 2024
4ca8ae0
final fix for image path in tutos
romainphan Feb 27, 2024
57a08bf
corrected thumbnail path
romainphan Feb 27, 2024
9e4f80f
resized thumbnails
romainphan Feb 27, 2024
35f0ecc
correction of thumbnail size
romainphan Feb 27, 2024
1cb05f7
adding noise_op image for thumbnail purpose
romainphan Feb 27, 2024
e5c5b8a
reverting back to original definition of thumbnail image
romainphan Feb 27, 2024
c6e192f
new css template for thumbnails
romainphan Feb 27, 2024
c8dcedd
trying different approach for thumbnail tuto1
romainphan Feb 27, 2024
ca3f840
adding sphinx-gallry homepage
romainphan Feb 27, 2024
1b95eef
changed gallery homepage
romainphan Feb 27, 2024
a7fa3c5
trying to use new thumbnail size
romainphan Feb 27, 2024
5524445
improved gallery homepage
romainphan Feb 27, 2024
d0f7502
explained big diagram on spyrit RTD
romainphan Feb 27, 2024
f60c6d4
added changes to gallery homepage
romainphan Feb 27, 2024
6074c8a
trying new css path
romainphan Feb 27, 2024
7c1b1f3
correcting tuto 1 formatting
romainphan Feb 27, 2024
58b54b7
changed css
romainphan Feb 27, 2024
a303cd2
tuto 1 correction
romainphan Feb 27, 2024
a5f155a
moved html_static_path
romainphan Feb 27, 2024
a8a37ac
changed name of css file for gallery homepage
romainphan Feb 28, 2024
47734e5
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 28, 2024
11b6bb4
Merge pull request #173 from openspyrit/romain_dev
romainphan Feb 28, 2024
877e2f1
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Feb 12, 2024
3a073a0
Documentation update
romainphan Feb 7, 2024
dffca24
Trying to revert to old type documentation
romainphan Feb 8, 2024
bbb1dd1
Adding autosummary in index.rst
romainphan Feb 8, 2024
e3fdb98
removed api/modules line in index.rst
romainphan Feb 8, 2024
a91dbf0
deleted four rst files hoping autosummary will work
romainphan Feb 8, 2024
fe105a8
autosummary_generate = True in conf.py
romainphan Feb 8, 2024
1bf9335
Documentation update
romainphan Feb 7, 2024
4871ad7
Trying to revert to old type documentation
romainphan Feb 8, 2024
c2c3947
Adding autosummary in index.rst
romainphan Feb 8, 2024
ea87312
removed api/modules line in index.rst
romainphan Feb 8, 2024
e56d42e
deleted four rst files hoping autosummary will work
romainphan Feb 8, 2024
c7d09b9
Added first line comment for time.py & detached one function
romainphan Feb 20, 2024
41cce0c
changed slightly some comments
romainphan Feb 20, 2024
fa5a24c
improved recon.py docstrings
romainphan Feb 20, 2024
84a645e
removed attributes autotable in documentation
romainphan Feb 20, 2024
18adaa7
removed again duplicate line
romainphan Feb 20, 2024
a0d2150
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 20, 2024
0045af8
commented skip_member_handler in conf.py
romainphan Feb 20, 2024
55886ed
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 20, 2024
2827e6e
proudly a new author on the docs website
romainphan Feb 21, 2024
371553f
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 21, 2024
98de3a0
Added dynamic measurement operators / changed inheritance architecture
romainphan Feb 22, 2024
ff0ea4d
improved attributes management / docstring large update
romainphan Feb 23, 2024
4034c0d
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 22, 2024
7124a49
recon.py > reconstruct clarified documentation and called reconstruct…
romainphan Feb 23, 2024
962eb54
tiny readability improvement
romainphan Feb 23, 2024
30e7989
minor changes to walsh2_matrix
romainphan Feb 23, 2024
78d1191
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 23, 2024
a8d5bb2
removedLinearRowSplit in tests
romainphan Feb 26, 2024
768398a
conversion from numpy enabled in meas
romainphan Feb 26, 2024
38cd19d
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
00b0ead
removed imports of LinearRowSplit
romainphan Feb 26, 2024
b964008
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
ae93d72
changed LinearRowSplit toLinearSplit
romainphan Feb 26, 2024
9de5e61
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
bc744de
removed final bits of LinearRowSplit
romainphan Feb 26, 2024
13cba17
syntax correction for torch.from_numpy
romainphan Feb 26, 2024
f3f9fb4
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
43b861f
resolved matrix multiplicatin issues + changed obsolete test of Linea…
romainphan Feb 26, 2024
0a2daa5
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
f8c31da
corrected register buffer
romainphan Feb 26, 2024
316952f
removed debug prints
romainphan Feb 26, 2024
8571340
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
4e1ab33
debugging...
romainphan Feb 26, 2024
e986b61
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
d29002f
added ()
romainphan Feb 26, 2024
5c7ff91
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 26, 2024
4552c62
back to meas_op(x)
romainphan Feb 26, 2024
3a4138b
added ()
romainphan Feb 26, 2024
168cdec
changed test core prep
romainphan Feb 26, 2024
3370914
removed SplitRowPoisson testing, in accordance with LinearRowSplit's …
romainphan Feb 26, 2024
c5057ab
small comment on dev>recon.py
romainphan Feb 26, 2024
78f5dbe
commented (not deleted) definition of SplitRowPoisson
romainphan Feb 26, 2024
4edbb25
added get_Perm method for HadamSplit
romainphan Feb 26, 2024
a52e316
using get_Perm to access permutation matrix
romainphan Feb 26, 2024
83511f9
putting back old thumbnails
romainphan Feb 26, 2024
b4a1942
trying new path for tuto 2 image
romainphan Feb 26, 2024
43ad830
corrected image path in tutos
romainphan Feb 27, 2024
07ae5d5
changed thumbnail path for tutos
romainphan Feb 27, 2024
2ef47fd
final fix for image path in tutos
romainphan Feb 27, 2024
75174ac
corrected thumbnail path
romainphan Feb 27, 2024
26b8ad6
resized thumbnails
romainphan Feb 27, 2024
803dddc
correction of thumbnail size
romainphan Feb 27, 2024
a3f8740
adding noise_op image for thumbnail purpose
romainphan Feb 27, 2024
884cf58
reverting back to original definition of thumbnail image
romainphan Feb 27, 2024
490b8d9
new css template for thumbnails
romainphan Feb 27, 2024
8a52fca
trying different approach for thumbnail tuto1
romainphan Feb 27, 2024
fa8b936
adding sphinx-gallry homepage
romainphan Feb 27, 2024
0a2f8a6
changed gallery homepage
romainphan Feb 27, 2024
e2cfbf5
trying to use new thumbnail size
romainphan Feb 27, 2024
5706e94
improved gallery homepage
romainphan Feb 27, 2024
f238af4
explained big diagram on spyrit RTD
romainphan Feb 27, 2024
070236c
added changes to gallery homepage
romainphan Feb 27, 2024
9743f3e
trying new css path
romainphan Feb 27, 2024
5437496
correcting tuto 1 formatting
romainphan Feb 27, 2024
e937663
changed css
romainphan Feb 27, 2024
f867c64
tuto 1 correction
romainphan Feb 27, 2024
8f12b31
moved html_static_path
romainphan Feb 27, 2024
f6c4da3
changed name of css file for gallery homepage
romainphan Feb 28, 2024
bc6c28a
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 28, 2024
cca8da9
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Feb 28, 2024
9f345e7
warp renamed to forward
romainphan Feb 28, 2024
77f2000
updating existing tests
romainphan Feb 28, 2024
d687038
adding a test for time.py
romainphan Feb 28, 2024
b878fd5
organisational changes in time.py
romainphan Feb 28, 2024
2e4c539
finalizing testing of time.py
romainphan Feb 28, 2024
92e0669
including time testing in run_tests.py
romainphan Feb 28, 2024
f20bad9
time.py : corrected docstring
romainphan Feb 28, 2024
f82b12d
corrected docstring
romainphan Feb 28, 2024
8940eaa
changes in rst docstring time.py
romainphan Feb 28, 2024
0eb6193
final touch on time.Py / meas.py rst doc
romainphan Feb 28, 2024
5522801
changed pinv from None to bool
romainphan Feb 28, 2024
d7e8993
implemented nn.Parameter in time.py
romainphan Feb 28, 2024
8ed2074
added support for warping batch of images in time.py
romainphan Feb 29, 2024
58377d6
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 29, 2024
e799705
corrected batch support for warping
romainphan Feb 29, 2024
47a727b
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Feb 29, 2024
72ced9e
corrected time.py batch behavior
romainphan Feb 29, 2024
2d5cb0a
added testing for batch image warping
romainphan Feb 29, 2024
de6b1cd
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Feb 29, 2024
768a528
Merge pull request #175 from openspyrit/romain_dev
romainphan Feb 29, 2024
2e669e1
added sort_by_significance function
romainphan Mar 4, 2024
1fcfc33
implemented sort_by_significance on tutorials 2,3,4
romainphan Mar 4, 2024
0872cc7
renamed order_by_significance --> sort_by_sig
romainphan Mar 4, 2024
2c24c83
implemented sort_by_significance in meas.HadamSplit
romainphan Mar 4, 2024
053cec1
improved tests prints and display
romainphan Mar 4, 2024
f9ca1bb
implemented sort_by_significance in sampling.py
romainphan Mar 4, 2024
ec21627
Major improvement in walsh_matrix function, now much faster
romainphan Mar 4, 2024
8fc9c48
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Mar 4, 2024
9a1fc24
removed unsupported character
romainphan Mar 4, 2024
c4fbd9b
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Mar 4, 2024
db892c8
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Mar 4, 2024
de56a3b
corrercted docstring in sampling.py
romainphan Mar 5, 2024
e36b8f9
new image/thumbnail on tutos
romainphan Mar 5, 2024
fb762de
attribute Perm started to be removed
romainphan Mar 5, 2024
6004f16
changed sampling docstring
romainphan Mar 5, 2024
8774f86
removed comment line
romainphan Mar 5, 2024
d42f6a0
doc correction
romainphan Mar 5, 2024
6699719
doc update
romainphan Mar 5, 2024
2594a49
Merge pull request #178 from openspyrit/romain_dev
romainphan Mar 5, 2024
fce0ee8
added new principle figure on RTD
romainphan Mar 5, 2024
e441231
corrected typo
romainphan Mar 5, 2024
4ddb9e5
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Mar 5, 2024
a8e9849
Merge pull request #179 from openspyrit/romain_dev
romainphan Mar 5, 2024
b7404f0
corrected error in sort_by_significance
romainphan Mar 5, 2024
803f537
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Mar 5, 2024
72202fa
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Mar 6, 2024
94fa924
added new figures to git repo
romainphan Mar 6, 2024
7674335
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Mar 6, 2024
1435bc2
new path for images in tutos
romainphan Mar 6, 2024
51bcabe
changed back fig path
romainphan Mar 6, 2024
4fbd433
Merge pull request #180 from openspyrit/romain_dev
romainphan Mar 6, 2024
9f9e0c6
Transfer all information from setup.py to pyproject.toml
tbaudier Feb 20, 2024
fb5a56c
Update github actions steps versions
tbaudier Feb 23, 2024
1e85594
added one method and updated docstring
romainphan Mar 7, 2024
22596ba
Add tutorials in wheel
tbaudier Mar 7, 2024
1c5a0ad
new css for gallery homepage
romainphan Mar 7, 2024
4103cdc
added pinv to dynamic classes
romainphan Mar 11, 2024
b8ccb77
merged structures of DeformationField and AffineDeformationField
romainphan Mar 11, 2024
b72b1c7
misc.sampling.sort_by_significance made torch/numpy-agnostic
romainphan Mar 20, 2024
dc0fcb7
forgot transpose when using nn.Parameter
romainphan Mar 20, 2024
b690587
corrected sort_by_significance and changed optional param name
romainphan Mar 26, 2024
3f530c6
permutation correction in pinv
romainphan Mar 26, 2024
7129857
no longer using forward operator for meas_op.H
romainphan Mar 26, 2024
ede488a
updating core.time tests
romainphan Mar 26, 2024
ab88ef5
display change for test_helpers
romainphan Mar 26, 2024
e9cbd35
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Mar 26, 2024
82c5404
module documentation update on readthedocs
romainphan Mar 26, 2024
9042199
missing import
romainphan Mar 26, 2024
f0a9532
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Mar 26, 2024
e166a82
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Mar 26, 2024
dc12e57
removed unused imports
romainphan Mar 26, 2024
648c8b1
Merge pull request #186 from openspyrit/romain_dev
romainphan Mar 26, 2024
1d13e62
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Mar 26, 2024
51cc504
linked duplicate function to one definition, warned of future depreca…
romainphan Mar 26, 2024
4e090b8
recon torch-compatible
romainphan Mar 27, 2024
e1cb575
conversion from np.ndarray to torch.tensor, added optional Ord in all…
romainphan Mar 28, 2024
0ce1254
fixed sort_by_sig for equal sig values ; added sort_by_indices
romainphan Mar 28, 2024
65b999f
adapted tutos 5,6 to torch input
romainphan Mar 28, 2024
7c18d1f
tuto5 path correction
romainphan Mar 28, 2024
78055eb
deleted unused imports
romainphan Mar 28, 2024
763d1ac
comments from numpy to torch
romainphan Mar 28, 2024
6bf4cc1
torch.tensors now used in code + docstrings
romainphan Mar 28, 2024
0e516cf
torch.tensor inputs in tests, display improvement
romainphan Mar 28, 2024
27a26e7
tutos use torch.tensors in Linear inputs
romainphan Mar 28, 2024
18d10fb
removed useless attribute Ord
romainphan Mar 28, 2024
96e3b43
removed reference to inexistant image in tuto1
romainphan Apr 4, 2024
730a69b
fixed device and float 32
romainphan Apr 4, 2024
83940ec
added sort_by_indices, inherited from measurent operator
romainphan Apr 4, 2024
eb3d9b4
fixed path suffix in load_net
romainphan Apr 4, 2024
5e8f37f
removed get_Perm() uses, replaced by sort_by_indices()
romainphan Apr 4, 2024
08f651f
random order for more specificity
romainphan Apr 4, 2024
e8995a7
file loading improved
romainphan Apr 4, 2024
3bd4a77
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] Apr 4, 2024
bb6a74e
commented change, TODO later
romainphan Apr 4, 2024
f0854ba
Merge branch 'romain_dev' of https://github.com/openspyrit/spyrit int…
romainphan Apr 4, 2024
05cb4f7
Merge pull request #188 from openspyrit/romain_dev
romainphan Apr 4, 2024
a69998f
doc update - changes by Nico
romainphan Apr 5, 2024
61830f7
Merge pull request #189 from openspyrit/romain_dev
romainphan Apr 5, 2024
aba5ea2
DCNet = denoised completion network
romainphan Apr 5, 2024
723cd0c
Merge pull request #190 from openspyrit/romain_dev
romainphan Apr 5, 2024
21702f3
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Apr 29, 2024
7704733
Use macos-13 for python
tbaudier Apr 30, 2024
0a9c145
Merge pull request #193 from openspyrit/update_thomas
tbaudier Apr 30, 2024
83d5ba9
Merge pull request #152 from openspyrit/pyproject
nducros May 3, 2024
ce68ccf
Merge pull request #184 from openspyrit/pre-commit-ci-update-config
tbaudier May 14, 2024
1cdc6bf
tuto drunet
jabascal May 14, 2024
3b6ea09
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] May 14, 2024
b77b9c2
Merge branch 'master' into tuto_drunet_tmp
jabascal May 17, 2024
0ad0f0d
update tuto7: added very different noise level to improve appreciation
jabascal May 17, 2024
ca190fc
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] May 17, 2024
0f8849c
updated gallery index
jabascal May 17, 2024
3d82c9c
Merge remote-tracking branch 'refs/remotes/origin/tuto_drunet_tmp' in…
jabascal May 17, 2024
35a03ce
update gallery index: minor
jabascal May 17, 2024
4637928
update drunet figure
jabascal May 17, 2024
877cef5
update link to figure
jabascal May 17, 2024
bef203e
update figure size
jabascal May 17, 2024
4796273
add tuto lpgd
jabascal May 17, 2024
5961ced
update formating .pth
jabascal May 17, 2024
c7d443f
update tuto lpgd: minor and add class LearnedPGD to recon
jabascal May 17, 2024
54ffe41
add figure lpgd
jabascal May 17, 2024
6a8c99a
[pre-commit.ci] Automatic python formatting
pre-commit-ci[bot] May 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 0 additions & 11 deletions .github/workflows/actionsCreateWheelLinux.sh

This file was deleted.

127 changes: 0 additions & 127 deletions .github/workflows/example.py

This file was deleted.

166 changes: 40 additions & 126 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- '*'
pull_request:
branches: [ master ]
schedule:
- cron: '0 0 * * 0'
workflow_dispatch:

jobs:
Expand All @@ -16,209 +18,121 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest]
python-version: [3.8, 3.9, "3.10", "3.11"]

steps:
- name: Checkout github repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: 'x64'
- name: Create Wheel Linux
if: matrix.os == 'ubuntu-latest'
- name: Create Wheel
run: |
if [ ${{ matrix.python-version }} == "3.6" ]; then
export PYTHONFOLDER="cp36-cp36m"
elif [ ${{ matrix.python-version }} == "3.7" ]; then
export PYTHONFOLDER="cp37-cp37m"
elif [ ${{ matrix.python-version }} == "3.8" ]; then
export PYTHONFOLDER="cp38-cp38"
fi
docker run --rm -e "PYTHONFOLDER=${PYTHONFOLDER}" -v $GITHUB_WORKSPACE:/home quay.io/pypa/manylinux2014_x86_64 /home/.github/workflows/actionsCreateWheelLinux.sh
ls wheelhouse
sudo rm -rf dist
mv wheelhouse dist
- name: Create Wheel Windows
if: matrix.os == 'windows-latest'
run: |
pip install wheel delocate numpy==1.19.3
rm -r -fo fht
cmd /c mklink /d fht spyrit\fht\fht
python setup.py sdist bdist_wheel
pip install build
python -m build
mkdir wheelhouse
copy dist\spyrit-* wheelhouse\
ls wheelhouse
rm -r -fo dist
mv wheelhouse dist
- name: Create Wheel Mac
if: matrix.os == 'macos-latest'
run: |
brew update
brew install ccache \
libomp
pip install wheel delocate numpy==1.19.3
python setup.py sdist bdist_wheel
delocate-wheel -w wheelhouse -v dist/*.whl
cp dist/spyrit-* wheelhouse/
ls wheelhouse
delocate-listdeps --all wheelhouse/*.whl
rm -rf dist
rm -r dist
mv wheelhouse dist
- name: Upload wheels
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: dist
name: dist-${{ matrix.os }}-${{ matrix.python-version }}
path: dist/

test_install:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest, windows-latest, macos-13]
python-version: [3.8, 3.9, "3.10", "3.11"]

steps:
- name: Checkout github repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: 'x64'
- name: Cache
id: cache_data_example
uses: actions/cache@v2
with:
path: data_example
key: data_example3
restore-keys: data_example3
- name: Run the tests on Mac and Linux
if: matrix.os != 'windows-latest'
run: |
mkdir -p data_example
pip install -e .
cd data_example
if [ -f "data/stl10_binary.tar.gz" ]; then
cd data
tar xzvf stl10_binary.tar.gz
cd ..
fi
python ../.github/workflows/example.py
rm -rf data/stl10_binary
python spyrit/test/run_tests.py
- name: Run the tests on Windows
if: matrix.os == 'windows-latest'
run: |
if(-not (Test-Path -path "data_example")) { mkdir data_example }
rm -r -fo fht
cmd /c mklink /d fht spyrit\fht\fht
pip install torch torchvision -f https://download.pytorch.org/whl/torch_stable.html
pip install -e .
cd data_example
if(Test-Path -path "data\stl10_binary.tar.gz") {
cd data
tar xzvf stl10_binary.tar.gz
cd ..
}
python ..\.github\workflows\example.py
rm -r -fo data/stl10_binary
python spyrit\test\run_tests.py

test_wheel:
runs-on: ${{ matrix.os }}
needs: [build_wheel]
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.6, 3.7, 3.8]
os: [ubuntu-latest, windows-latest, macos-13]
python-version: [3.8, 3.9, "3.10", "3.11"]

steps:
- name: Checkout github repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: 'x64'
- name: Cache
id: cache_data_example
uses: actions/cache@v2
with:
path: data_example
key: data_example3
restore-keys: data_example3
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: dist
pattern: dist-*
merge-multiple: true
path: dist/
- name: Run the tests on Mac and Linux
- name: Run tests on Mac and Linux
if: matrix.os != 'windows-latest'
run: |
mkdir -p data_example
cd dist
if [ ${{ matrix.python-version }} == "3.6" ]; then
export PYTHONFOLDER="cp36-cp36m"
elif [ ${{ matrix.python-version }} == "3.7" ]; then
export PYTHONFOLDER="cp37-cp37m"
elif [ ${{ matrix.python-version }} == "3.8" ]; then
export PYTHONFOLDER="cp38-cp38"
fi
if [ ${{ matrix.os }} == "ubuntu-latest" ]; then
export OS="manylinux"
elif [ ${{ matrix.os }} == "macos-latest" ]; then
export OS="macos"
fi
pip install spyrit-*${PYTHONFOLDER}-${OS}*.whl
cd ../data_example
if [ -f "data/stl10_binary.tar.gz" ]; then
cd data
tar xzvf stl10_binary.tar.gz
cd ..
fi
python ../.github/workflows/example.py
rm -rf data/stl10_binary
pip install spyrit-*.whl
cd ..
python spyrit/test/run_tests.py
- name: Run the tests on Windows
if: matrix.os == 'windows-latest'
run: |
if(-not (Test-Path -path "data_example")) { mkdir data_example }
cd dist
pip install torch torchvision -f https://download.pytorch.org/whl/torch_stable.html
pip install --find-links=. spyrit
cd ..\data_example
if(Test-Path -path "data\stl10_binary.tar.gz") {
cd data
tar xzvf stl10_binary.tar.gz
cd ..
}
python ..\.github\workflows\example.py
rm -r -fo data/stl10_binary

$package=dir -Path . -Filter spyrit*.whl | %{$_.FullName}
echo $package
pip install $package
cd ..
python spyrit\test\run_tests.py

publish_wheel:
runs-on: ubuntu-latest
needs: [build_wheel, test_wheel, test_install]
steps:
- name: Checkout github repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Checkout submodules
run: git submodule update --init --recursive
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: dist
pattern: dist-*
merge-multiple: true
path: dist/
- name: Publish to PyPI
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
password: ${{ secrets.PYPI }}
repository_url: https://test.pypi.org/legacy/
skip_existing: true

Loading