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

Commit the files that should have gone into #8612 #8613

Merged
merged 4 commits into from
Nov 13, 2024
Merged

Conversation

joa-quim
Copy link
Member

@joa-quim joa-quim commented Nov 11, 2024

(Fix the variable transparency case that was broken by the #8612 commit.)

(Fix the variable transparency case that was broken by the #8255 commit.)
@seisman
Copy link
Member

seisman commented Nov 11, 2024

The CI jobs tell me that test/grdimage/transp_mix.sh still passes, but test/grdimage/image_vartrans.sh fails.

@joa-quim
Copy link
Member Author

I failed to commit also the modified tests. You should now see the opposite situation. test/grdimage/transp_mix.sh fails (because I removed the KNOWN_FAILURE) and test/grdimage/image_vartrans.sh passes. What I ask you is to replace the transp_mix.ps original by the new one.

@seisman
Copy link
Member

seisman commented Nov 11, 2024

I'm on macOS. Both fail for me.

test/grdimage/transp_mix.sh:
image

test/grdimage/image_vartrans.sh
image

@seisman
Copy link
Member

seisman commented Nov 11, 2024

It's like something different with macOS preview.

Using the Adobe PDF Reader, I've

image image

@joa-quim
Copy link
Member Author

But what do you get when running the tests? I get

C:\v\build>ctest -R image_vartrans
Test project C:/v/build
    Start 523: test/grdimage/image_vartrans.sh
1/1 Test #523: test/grdimage/image_vartrans.sh ...   Passed    3.44 sec

100% tests passed, 0 tests failed out of 1

Total Test time (real) =   3.47 sec

C:\v\build>ctest -R transp_mix
Test project C:/v/build
    Start 536: test/grdimage/transp_mix.sh
1/1 Test #536: test/grdimage/transp_mix.sh ......***Failed    5.17 sec

@seisman
Copy link
Member

seisman commented Nov 11, 2024

 ctest -R test/grdimage/image_vartrans.sh
Test project /Users/seisman/OSS/gmt/gmt/build/debug
    Start 532: test/grdimage/image_vartrans.sh
1/1 Test #532: test/grdimage/image_vartrans.sh ...***Failed   14.86 sec

@joa-quim
Copy link
Member Author

joa-quim commented Nov 11, 2024

Did you update for this PR? I latter added the modified scripts. Note that now to have variable transparency we must now use the option -Q+t. i.e., gmt grdimage rgba.tif -Q+t

@seisman
Copy link
Member

seisman commented Nov 11, 2024

Here is what I have in my log file:

Start testing: Nov 11 22:06 CST
----------------------------------------------------------
532/1186 Testing: test/grdimage/image_vartrans.sh
532/1186 Test: test/grdimage/image_vartrans.sh
Command: "/bin/bash" "gmtest" "test/grdimage/image_vartrans.sh"
Directory: /Users/seisman/OSS/gmt/gmt/build/debug/test
"test/grdimage/image_vartrans.sh" start time: Nov 11 22:06 CST
Output:
----------------------------------------------------------
Set GMT_SESSION_NAME = 70298
/usr/local/bin/gm compare: image difference exceeds limit (0.0140282 > 0.003).
ERROR: gmtest:171
memtrack errors: 0
exit status: 1
test/grdimage/image_vartrans.ps: RMS Error = 0.0140 [FAIL]
memtrack errors: 0
exit status: 1
<end of output>
Test time =  15.60 sec
----------------------------------------------------------
Test Failed.
"test/grdimage/image_vartrans.sh" end time: Nov 11 22:06 CST
"test/grdimage/image_vartrans.sh" time elapsed: 00:00:15
----------------------------------------------------------

End testing: Nov 11 22:06 CST

@joa-quim
Copy link
Member Author

/Users/seisman/OSS/gmt/gmt/build/debug

Hmm, my runs were done with a release build. Could it be the reason?

@seisman
Copy link
Member

seisman commented Nov 11, 2024

Did you update for this PR? I latter added the modified scripts. Note that now to have variable transparency we must now use the option -Q+t. i.e., gmt grdimage rgba.tif -Q+t

I've updated to the latest version.

/Users/seisman/OSS/gmt/gmt/build/debug

Hmm, my runs were done with a release build. Could it be the reason?

I also tried the release build. The image is still different from the baseline image, so it fails.

@joa-quim
Copy link
Member Author

Can't make sense out of this. I am using GMT_DATA_SERVER static at compile time (the only one that works for me). And before this PR the variable transparency had to fail always because code use completely broken.

@joa-quim
Copy link
Member Author

How can we have this in the original PS? It's impossible. Nothing in the image_vartrans.sh puts a BACKGROUND word as a kind of watermark. And this disappears when we convert the orig in .png or .pdf

image

@seisman
Copy link
Member

seisman commented Nov 11, 2024

The "BACKGROUND" word is likely added by macOS Preview. I don't see it in the Adobe PDF reader.

@joa-quim
Copy link
Member Author

Yes, likely but the SC I posted was taken in my computer as seen from Ghostscript.
The CI's help nothing. image_vartrans fails on Linux and passes on Mac & Windows.

@joa-quim
Copy link
Member Author

Any reason to not to merge this PR?

Copy link
Contributor

Summary of changed images

This is an auto-generated report of images that have changed on the DVC remote

Status Path
modified test/baseline/grdimage/
modified test/baseline/grdimage/transp_mix.ps

Image diff(s)

Added images

Modified images

Path Old New
test/baseline/grdimage/transp_mix.ps

Report last updated at commit d0c540b

@seisman
Copy link
Member

seisman commented Nov 13, 2024

I've updated the baseline image for transp_mix.sh and the image comparison is available at #8613 (comment). The old and new images seem almost the same, except that the new image looks more blurry than the old one. Is it expected?

@joa-quim
Copy link
Member Author

I can’t see a difference between the two. And note that only the second row, first col subplot has changed.

@joa-quim joa-quim merged commit dd1a02f into master Nov 13, 2024
16 of 19 checks passed
@joa-quim joa-quim deleted the transp-fixes2 branch November 13, 2024 10:23
@joa-quim
Copy link
Member Author

When I do a dvc pull my transp_mix.ps file does not get updated and dvc tells me that everything is Everything is up to date.

We need to find a solution/replacement to this DVC thing. I simply can't get it to work.

@seisman
Copy link
Member

seisman commented Nov 14, 2024

What's the dvc version you're using?

@joa-quim
Copy link
Member Author

joa-quim commented Nov 14, 2024

C:\progs_cygw\GMTdev\gmt5\master>dvc --version
3.28.0

But note that all 3 OSs fail this CI test.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants