Replacing data/camera.png due to copyright #4913

alexdesiqueira · 2020-08-13T16:55:12Z

Description

Removing data/camera.png (a.k.a. cameraman) due to copyright issues. Solves #3927.

grlee77 · 2020-08-13T17:48:54Z

This image is pretty widely used in lot of test cases, including some with some pre-computed results such as:

Lines 121 to 124 in 59fd968

    
           "restoration/tests/camera_rl.npy": "d219834415dc7094580abd975abb28bc7a6fb5ab83366e92c61ccffa66ca54fd", 
        
           "restoration/tests/camera_unsup.npy": "6d911fd0028ee78add8c416553097f15c6c4e59723ea32bd828f71269b6ea240", 
        
           "restoration/tests/camera_unsup2.npy": "30e81718f3cac0fc00d84518ca75a3c0fb9b246bb7748a9e20ec0b44da33734d", 
        
           "restoration/tests/camera_wiener.npy": "71e7cab739d6d145a288ec85dd235a62ff34442ccd1488b08139bc809850772b",

I am wondering if we can keep using it in the test suite for that purpose, but just not keep it as part of the public API or demos in the documentation? Wouldn't that usage fit within the non-profit restrictions of the license?

pep8speaks · 2020-08-13T18:08:32Z

Hello @alexdesiqueira! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

In the file skimage/data/_registry.py:

Line 68:80: E501 line too long (90 > 79 characters)
Line 121:80: E501 line too long (106 > 79 characters)
Line 122:80: E501 line too long (109 > 79 characters)
Line 123:80: E501 line too long (110 > 79 characters)
Line 124:80: E501 line too long (110 > 79 characters)

In the file skimage/feature/tests/test_canny.py:

Line 26:80: E501 line too long (80 > 79 characters)
Line 82:21: E241 multiple spaces after ','
Line 82:28: E241 multiple spaces after ','
Line 82:35: E241 multiple spaces after ','
Line 83:35: E241 multiple spaces after ','
Line 84:35: E241 multiple spaces after ','
Line 85:28: E241 multiple spaces after ','
Line 85:35: E241 multiple spaces after ','
Line 89:26: E128 continuation line under-indented for visual indent

In the file skimage/restoration/tests/test_restoration.py:

Line 64:57: E261 at least two spaces before inline comment

Comment last updated at 2020-09-30 12:15:11 UTC

alexdesiqueira · 2020-08-13T18:13:10Z

@grlee77 indeed, I'm seeing that now! 😅

I am wondering if we can keep using it in the test suite for that purpose, but just not keep it as part of the public API or demos in the documentation?

Personally, I'd not be comfortable with that, Greg. It would give us some work (by Tupã, I know 😂), but IMHO it's not like we don't have alternatives around with less restrictive licenses. Of course, my two BRL cents.

grlee77 · 2020-08-13T19:28:15Z

Personally, I'd not be comfortable with that, Greg. It would give us some work (by Tupã, I know joy), but IMHO it's not like we don't have alternatives around with less restrictive licenses. Of course, my two BRL cents.

Sure, in most cases it is probably trivial to switch. For the few with precomputed outputs, I guess we can just regenerate those for a different image and update the registry.

alexdesiqueira · 2020-08-13T21:01:26Z

@grlee77 yeah, I was thinking about that. @stefanv wanted a nice image to take cameraman's place, but we didn't get it yet... I'll search for some viable candidates today. I put grass in its place just for now, but we'll have to recalculate everything for the new image.

stefanv · 2020-08-14T05:22:28Z

Best to just bite the bullet, I think. It wouldn't be the end of the world to use it internally, but it is shouldn't be too hard to switch.

This reverts commit c7cab1e.

This reverts commit 2e5e601.

alexdesiqueira · 2020-08-16T19:54:29Z

Alright, based on the discussion we had on #4914, data.camera will point to a new camera.png.

emmanuelle · 2020-08-16T21:06:03Z

I was surprised that all tests passed with the new image but there is a catch: pooch uses the data files in master because of https://github.com/scikit-image/scikit-image/blob/master/skimage/data/__init__.py#L120, so that the old image is used (as you can see from https://225-2014929-gh.circle-artifacts.com/0/doc/build/html/auto_examples/data/plot_general.html#sphx-glr-auto-examples-data-plot-general-py for example).

As a workaround, could you please modify https://github.com/scikit-image/scikit-image/blob/master/skimage/data/__init__.py#L120 so that it points to your repo and branch? Then we can see if tests pass and the doc looks good, and of course we'll revert the code in data before merging.

alexdesiqueira · 2020-08-17T01:28:36Z

Sure thing @emmanuelle, thanks for the catch! You're right, I think it's very unlikely the tests will pass for the new image 🙂

skimage/data/__init__.py

emmanuelle · 2020-08-19T14:40:48Z

I pushed a commit to your branch because the URL where to find the files was not the correct one I think, let's keep fingers crossed this one works!

emmanuelle · 2020-08-19T15:01:00Z

ok, you also need to modify the hash in the registry (see the error in CI).

…/scikit-image into goodbye_cameraman

emmanuelle · 2020-08-19T16:12:18Z

We're making progress, now the next thing is to fix the 25 failing tests...

FAILED exposure/tests/test_exposure.py::test_equalize_masked - assert 1.23262...
FAILED feature/tests/test_canny.py::TestCanny::test_use_quantiles - Assertion...
FAILED filters/tests/test_ridges.py::test_2d_cropped_camera_image - ValueErro...
FAILED filters/tests/test_ridges.py::test_3d_cropped_camera_image - ValueErro...
FAILED filters/tests/test_thresholding.py::test_otsu_camera_image - assert 91...
FAILED filters/tests/test_thresholding.py::test_li_camera_image - assert 69.7...
FAILED filters/tests/test_thresholding.py::test_yen_camera_image - assert 199...
FAILED filters/tests/test_thresholding.py::test_isodata_camera_image - assert...
FAILED filters/tests/test_thresholding.py::test_threshold_minimum - Assertion...
FAILED io/tests/test_collection.py::TestImageCollection::test_concatenate - V...
FAILED io/tests/test_io.py::test_imread_file_url - assert (245, 327) == (512,...
FAILED measure/tests/test_structural_similarity.py::test_gaussian_mssim_vs_IPOL
FAILED measure/tests/test_structural_similarity.py::test_gaussian_mssim_vs_author_ref
FAILED measure/tests/test_structural_similarity.py::test_gaussian_mssim_and_gradient_vs_Matlab
FAILED measure/tests/test_structural_similarity.py::test_mssim_vs_legacy - As...
FAILED metrics/tests/test_simple_metrics.py::test_PSNR_vs_IPOL - AssertionErr...
FAILED metrics/tests/test_structural_similarity.py::test_gaussian_structural_similarity_vs_IPOL
FAILED metrics/tests/test_structural_similarity.py::test_gaussian_mssim_vs_author_ref
FAILED metrics/tests/test_structural_similarity.py::test_gaussian_mssim_and_gradient_vs_Matlab
FAILED metrics/tests/test_structural_similarity.py::test_mssim_vs_legacy - As...
FAILED restoration/tests/test_restoration.py::test_wiener - AssertionError: 
FAILED restoration/tests/test_restoration.py::test_unsupervised_wiener - Asse...
FAILED restoration/tests/test_restoration.py::test_richardson_lucy - Assertio...
FAILED util/tests/test_random_noise.py::test_salt_and_pepper - assert (3052 /...
FAILED util/tests/test_random_noise.py::test_clip_speckle - assert (1.2706687...

Note that the tests probably fail on your machine too, it will be easier to fix them and run the tests locally.

alexdesiqueira · 2020-08-19T16:34:22Z

I'm on it 🙂 It seems we used cameraman too much... 😂

alexdesiqueira · 2020-09-29T05:03:54Z

Kindly pinging @grlee77 🙂 Could you help us with the coefficients for the latest image? Thanks!

grlee77 · 2020-09-29T11:54:51Z

Kindly pinging @grlee77 slightly_smiling_face Could you help us with the coefficients for the latest image? Thanks!

Here you go!

IPOL results
SSIM: 0.357959091663361
PSNR: 22.409353363576034

alexdesiqueira · 2020-09-29T20:05:23Z

All green again 🎉 Gotta point the first reviewers one more time (@emmanuelle @rfezzani @jni). Thanks again @grlee77 and @JDWarner for all your help!

jni · 2020-09-30T02:46:55Z

Whoo! I updated plot_glcm with the new sky and grass locations. The other example looks ok, not great, but master also looks ok, not great, so I say leave it for now. My approval from before still stands. Thank you everyone who has contributed to this (a lot of people now! 😅) and particularly @alexdesiqueira for the hard work here! I'm really happy with the end result.

jni · 2020-09-30T08:56:09Z

@scikit-image/core the travis failure is unrelated and should not hold up a merge. =)

sciunto · 2020-09-30T09:08:22Z

there is one line to be changed before merging.

rfezzani

Thank you @alexdesiqueira for your hard work on this 👏. Since the CI is green now, I approve this PR, but I think that we need to improve some gallery examples involving data.camera. Some examples where tuned for the old image. To illustrate this, please see:

Multi-Otsu Thresholding: new vs old
Markers for watershed transform: new vs old
Flood Fill: new vs old
Rank filters: new vs old

But this can be addressed in different PRs 😉

sciunto · 2020-09-30T09:51:58Z

But this can be addressed in different PRs

+100

alexdesiqueira · 2020-09-30T12:19:30Z

But this can be addressed in different PRs 😉

Sure thing :) I will open an issue to deal with them later; my ~~repo~~branch is breaking already, I'd need a rebase... 😂

sciunto · 2020-10-01T09:44:16Z

looks like there are some issues with checksums on azure, but not on travis...

alexdesiqueira · 2020-10-01T13:33:51Z

looks like there are some issues with checksums on azure, but not on travis...

@sciunto the errors are due to last commit, since we don't have that image on base yet (please see 3f24084).

emmanuelle · 2020-10-01T14:50:34Z

Yes a8cc0a9 was green.

sciunto · 2020-10-02T13:45:30Z

Of course... I'm stupid.

alexdesiqueira · 2020-10-02T14:10:01Z

Thanks everyone, we made it! 🎉

hmaarrfk · 2020-10-02T14:57:15Z

awesome job!

stefanv · 2020-10-02T17:36:45Z

Thank you very much, @alexdesiqueira !

Removing data/camera.png due to copyright

2e5e601

Starting to remove data.camera() from our tests

c7cab1e

alexdesiqueira mentioned this pull request Aug 13, 2020

Proposing a substitute for cameraman #4914

Closed

alexdesiqueira added 3 commits August 16, 2020 12:31

Replacing camera.png

7777915

Revert "Starting to remove data.camera() from our tests"

bd4f432

This reverts commit c7cab1e.

Revert "Removing data/camera.png due to copyright"

4eda039

This reverts commit 2e5e601.

alexdesiqueira changed the title ~~Removing data/camera.png due to copyright~~ Replacing data/camera.png due to copyright Aug 16, 2020

Setting own URL to test new camera.png

d63a4ce

Adding a 2-D, gray version of the new camera.png

4393e63

emmanuelle mentioned this pull request Aug 17, 2020

2020's calendar of community management #4486

Closed

alexdesiqueira added 🔧 type: Maintenance Refactoring and maintenance of internals 💪 Work in progress labels Aug 18, 2020

alexdesiqueira changed the title ~~Replacing data/camera.png due to copyright~~ [WIP] Replacing data/camera.png due to copyright Aug 18, 2020

emmanuelle reviewed Aug 19, 2020

View reviewed changes

skimage/data/__init__.py Outdated Show resolved Hide resolved

Update skimage/data/__init__.py

7b70421

alexdesiqueira added 2 commits August 19, 2020 08:53

Updating registry for new data/camera

a2ad1ee

Merge branch 'goodbye_cameraman' of https://github.com/alexdesiqueira…

5c2754d

…/scikit-image into goodbye_cameraman

alexdesiqueira added 2 commits September 24, 2020 17:33

Updating test_random_noise

90abad0

Upd metrics/tests/test_struct_sim::msssim_vs_leg

a5645ae

alexdesiqueira added 4 commits September 29, 2020 07:24

Fixing latest MSSIM, PSNR values

bb94ca9

FIxing doc/viewer errors

9f99053

Fixing viewer/tests/test_plugins::prof(max)

db4317f

Fixing viewer/tests/test_plugins:prof(mean)

78294a9

Update grass and sky locations in GLCM example

a8cc0a9

rfezzani approved these changes Sep 30, 2020

View reviewed changes

Back to the original URL

3f24084

alexdesiqueira mentioned this pull request Sep 30, 2020

Update documentation to new data.camera() #4993

Closed

sciunto merged commit 8eadc24 into scikit-image:master Oct 2, 2020

alexdesiqueira mentioned this pull request Oct 2, 2020

camera(man) image must be removed for license issues #3927

Closed

grlee77 mentioned this pull request Oct 11, 2020

replace cameraman image due to an uncertain rights PyWavelets/pywt#500

Closed

mdeff mentioned this pull request Dec 16, 2020

Print graphs and filters epfl-lts2/pygsp#79

Open

alexdesiqueira deleted the goodbye_cameraman branch February 18, 2021 19:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replacing data/camera.png due to copyright #4913

Replacing data/camera.png due to copyright #4913

alexdesiqueira commented Aug 13, 2020

grlee77 commented Aug 13, 2020

pep8speaks commented Aug 13, 2020 •

edited

Loading

alexdesiqueira commented Aug 13, 2020

grlee77 commented Aug 13, 2020

alexdesiqueira commented Aug 13, 2020 •

edited

Loading

stefanv commented Aug 14, 2020

alexdesiqueira commented Aug 16, 2020

emmanuelle commented Aug 16, 2020

alexdesiqueira commented Aug 17, 2020

emmanuelle commented Aug 19, 2020

emmanuelle commented Aug 19, 2020

emmanuelle commented Aug 19, 2020

alexdesiqueira commented Aug 19, 2020

alexdesiqueira commented Sep 29, 2020

grlee77 commented Sep 29, 2020

alexdesiqueira commented Sep 29, 2020

jni commented Sep 30, 2020

jni commented Sep 30, 2020

sciunto commented Sep 30, 2020

rfezzani left a comment

sciunto commented Sep 30, 2020

alexdesiqueira commented Sep 30, 2020 •

edited

Loading

sciunto commented Oct 1, 2020

alexdesiqueira commented Oct 1, 2020

emmanuelle commented Oct 1, 2020

sciunto commented Oct 2, 2020

alexdesiqueira commented Oct 2, 2020

hmaarrfk commented Oct 2, 2020

stefanv commented Oct 2, 2020

Replacing data/camera.png due to copyright #4913

Replacing data/camera.png due to copyright #4913

Conversation

alexdesiqueira commented Aug 13, 2020

Description

grlee77 commented Aug 13, 2020

pep8speaks commented Aug 13, 2020 • edited Loading

Comment last updated at 2020-09-30 12:15:11 UTC

alexdesiqueira commented Aug 13, 2020

grlee77 commented Aug 13, 2020

alexdesiqueira commented Aug 13, 2020 • edited Loading

stefanv commented Aug 14, 2020

alexdesiqueira commented Aug 16, 2020

emmanuelle commented Aug 16, 2020

alexdesiqueira commented Aug 17, 2020

emmanuelle commented Aug 19, 2020

emmanuelle commented Aug 19, 2020

emmanuelle commented Aug 19, 2020

alexdesiqueira commented Aug 19, 2020

alexdesiqueira commented Sep 29, 2020

grlee77 commented Sep 29, 2020

alexdesiqueira commented Sep 29, 2020

jni commented Sep 30, 2020

jni commented Sep 30, 2020

sciunto commented Sep 30, 2020

rfezzani left a comment

Choose a reason for hiding this comment

sciunto commented Sep 30, 2020

alexdesiqueira commented Sep 30, 2020 • edited Loading

sciunto commented Oct 1, 2020

alexdesiqueira commented Oct 1, 2020

emmanuelle commented Oct 1, 2020

sciunto commented Oct 2, 2020

alexdesiqueira commented Oct 2, 2020

hmaarrfk commented Oct 2, 2020

stefanv commented Oct 2, 2020

pep8speaks commented Aug 13, 2020 •

edited

Loading

alexdesiqueira commented Aug 13, 2020 •

edited

Loading

alexdesiqueira commented Sep 30, 2020 •

edited

Loading