-
Notifications
You must be signed in to change notification settings - Fork 68
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
Issue 1763 lambert #1768
Issue 1763 lambert #1768
Conversation
@aashish24 please review. Failing test are due to the proj4 bug. |
@sankhesh @danlipsa @chaosphere2112 please review as well. proj4 bug is causing failures. |
projName = pname | ||
pd.SetName(projName) | ||
if projection.type == 'aeqd': | ||
# this is a temporary branch to keep the same |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this comment seems absurd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree but since it was here before I left it in. I might mean something to someone...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would say remove it. Its not useful anymore.
if ((not hasattr(projection, 'centralmeridian') or | ||
numpy.allclose(projection.centralmeridian, 1e+20))): | ||
pd.SetCentralMeridian(float(xm + xM) / 2.0) | ||
apply_proj_parameters(pd, projection, xm, xM, ym, yM) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 Good to remove code duplication
@aashish24 ok will remove comments and repush |
@aashish24 pushed. Please review again and merge at your convenience |
thanks @doutriaux1 looks great! Also thanks for removing duplicated code BIG 👍 from me. LGTM 👍 |
since proj4 has issue with it on some systems
@aashish24 I'm adding the bit to turn off |
@aashish24 tests seem to now pass on my mac. |
optional param over needs to ACTIVELY be set to false in order to get rid of the bug
@doutriaux1 I am wondering why other bots are stuck? |
me too... I keep restarting them... something to do with the Queueing system when a new PR goes to the Queue it seems to seriously mess up the macs especially... Had to kill everything a few times... |
wow... On my mac I HAD TO set "over" to false in order to consistently get correct result for |
@doutriaux1 @danlipsa I have added support newer proj4 (#1773), as of writing this I am still waiting on dashbords to finish. |
Here is the corresponding VTK pull request: https://github.com/UV-CDAT/VTK/pull/14/files |
That is great when newer proj4 is in let me update this PR so that over iscalways on. |
cannot do a global lambert it makes no sense lambert breaks on apple
@aashish24 @danlipsa @chaosphere2112 I'm done with the code, I merged the noticklabel elliptical branch in this so we only need to update the baseline once. It's mostly there but animation baselines need update and a few others. I probably won't have time to look into this tomorrw, so feel free to at least review the code now and if you could update the baselines it would be awesome to! Thanks. |
@doutriaux1 the polar tests are failing: Look here: I am not even sure what the test is testing as the baseline itself is looking pretty bad and the new image is worse. |
I didn't look at animation test. I'll look in the morning. |
@@ -21,6 +21,9 @@ | |||
round_projections = ['polar (non gctp)', 'stereographic', | |||
'orthographic', "ortho", ] | |||
|
|||
no_over_proj4_parameter_projections = round_projections+["aeqd", "lambert conformal c"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my original pull request I also did not pass +over for 'polar stereographic'. Maybe this is the reason why this you are failing some polar tests. Besides that looks good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't be, because polar do not go to the part of the code that uses no_over_proj4_parameter_projections
I will take a look at the animation test now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok i see the issue, the parameter passed to the projection should not be polar
, it should be polar (non gctp)
or -3
The animation test are sol long I'm removing the polar projection from anim test. I don't think animating many projections is useful anyway, one test on an animated projection is enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The animation test are sol long I'm removing the polar projection from anim test. I don't think animating many projections is useful anyway, one test on an animated projection is enough.
Sounds good but make sure that other polar projections are still working.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did, they work, or at least they work so that they do not exhibit the bug...
projection have their own tests, one test of a animated plot with projection should be enough
@aashish24 @chaosphere2112 @danlipsa I think we should be good know, let's see what the bots think. |
OK rh full issues are most likely vnc server issues, the failed tests are the ones that open a window to the screeb |
@doutriaux1 looks like this test is a genuine failure: https://open.cdash.org/testDetails.php?test=409325568&build=4186478 |
Also, @doutriaux1 if you can please squash your commits or update the comments: For example: even height could use more words. Other than that, its looks okay to me. I am going to test the projection stuff some more post 2.4. |
@aashish24 updating files for Mac failures. Test failure look very similar to vtkweb issue. Not a show stopper, but I will double check it tomorrow. Will try to squash but probably won't get to it until tomorrow. |
@aashish crunchy is acting up and has been started over vpn and xfvb I'm not too concerned about the test failure. Updated Mac baselines. Restarting bots to make sure it's all green. |
@aashish24 why aren't your machine ctest results visible? |
@doutriaux1 There was a timeout cloning a repo during the build. I just retriggered it. |
@jbeezley thx! My mac bot also got hanged, restarting them now... |
6a17ae3
to
3d751cc
Compare
@aashish24 squashed commit and retriggered build for macs. Let's merge as soon as possible, double checking the crunchy issue |
@aashish24 macs are happy now, Ubunutu and RH6 as well. We should merge so we can tag 2.4.0 |
@doutriaux1 looking into it right now. |
@aashish24 thx! |
@doutriaux1 Looks good thanks for updating the commits. |
@doutriaux1 you are welcome. Okay if I go ahead and create and tag the release branch? like we discussed last time. |
@aashish24 let's wait a couple of days for the tag I would like @williams13 and @potter2 to take a look first. |
Okay, will wait. But if that process takes longer than 1-2 days we would have to start merging other pending work (or new work) in master. We can always pick a older sha for release so that's not a problem. |
No description provided.