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

Vcs3D features for v2.1.1 #951

Merged
merged 67 commits into from Feb 26, 2015

Conversation

Projects
None yet
6 participants
@ThomasMaxwell
Contributor

ThomasMaxwell commented Jan 7, 2015

Fixes a number of minor issues- mostly focussed on plot provenance and initialization from scripts and .vt files.

ThomasMaxwell added some commits Dec 5, 2014

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 24, 2015

It appears the the seg fault in the dv3d_constituents_test is being caused by the VTK upgrade. Were there any changes to the VTK API that I should be accounting for in my code?

From: , "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Date: Monday, February 23, 2015 4:10 PM
To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

When I attempt to start uvcdat with my branches merged I get the following error. Is this a known issue?:

Uncaught exception on initialization: Exception: Error: 'outfill' is not a valid vcs element
Valid vcs elements are: ['projection', 'isofill', 'marker', '3d_dual_scalar', 'texttable', 'template', 'fillarea', 'font', '3d_vector', '1d', 'textorientation', 'textcombined', '3d_scalar', 'xvsy', 'xyvsy', 'isoline', 'boxfill', 'colormap', 'line', 'meshfill', 'yxvsx', 'taylordiagram', 'list', 'fontNumber', 'display', 'vector', 'scatter']
Traceback (most recent call last):
File "/Developer/Projects/EclipseWorkspace/vistrails/vistrails/uvcdat.py", line 89, in
v = gui.application.start_application()
File "/Developer/Projects/EclipseWorkspace/vistrails/vistrails/gui/application.py", line 703, in start_application
x = VistrailsApplication.init(optionsDict)
File "/Developer/Projects/EclipseWorkspace/vistrails/vistrails/gui/application.py", line 166, in init
self.initialize_uvcdat_plots()
File "/Developer/Projects/EclipseWorkspace/vistrails/vistrails/gui/application.py", line 680, in initialize_uvcdat_plots
self._plot_manager.load_plots()
File "/Developer/Projects/EclipseWorkspace/vistrails/vistrails/core/uvcdat/plotmanager.py", line 90, in load_plots
self.load_vcs_plots()
File "/Developer/Projects/EclipseWorkspace/vistrails/vistrails/core/uvcdat/plotmanager.py", line 148, in load_vcs_plots
for m in get_canvas().listelements(str(pl).lower()):
File "/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/vcs/Canvas.py", line 4439, in listelements
L = apply(f, args)
File "/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/vcs/utils.py", line 164, in listelements
raise Exception,"Error: '%s' is not a valid vcs element\nValid vcs elements are: %s" % (typ,vcs.elements.keys())
Exception: Error: 'outfill' is not a valid vcs element
Valid vcs elements are: ['projection', 'isofill', 'marker', '3d_dual_scalar', 'texttable', 'template', 'fillarea', 'font', '3d_vector', '1d', 'textorientation', 'textcombined', '3d_scalar', 'xvsy', 'xyvsy', 'isoline', 'boxfill', 'colormap', 'line', 'meshfill', 'yxvsx', 'taylordiagram', 'list', 'fontNumber', 'display', 'vector', 'scatter']

From: , "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Date: Monday, February 23, 2015 3:23 PM
To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

I just ran the ctests on local merges of the vcs3D-features_for_v2.1.1 uvcdat and vistrails branches- all vcs3D tests passed except for dv3d_constituents_test which seg faulted. Working on fixing that one now.

-- Tom

From: , "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Date: Monday, February 23, 2015 3:11 PM
To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

BTW, as noted in the pull request, there is an associated vistrails branch uvcdat-vcs3D-features_for_v2.1.1. Testing the uvcdat vcs3D-features_for_v2.1.1 branch with the current vistrails uvcdat-master branch could cause seg faults. Sorry for not making this more obvious. I did a local merge with the current uvcdat master and am doing my own testing now.

From: David Lonie <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Monday, February 23, 2015 1:29 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

There were a number of test failures: https://www.cdash.org/viewTest.php?onlyfailed&buildid=3706810

The VCS ones I checked are due to the new tick-label format, so they should be ok. The 3D test should be looked at, though -- the vector test looks like it's improved, but there were some segfaults on the others.


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#issuecomment-75601549.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 25, 2015

Is this ready to "rereview"? I have some free cycles I can use to build/test.

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 25, 2015

Yes, the vcs3D_features_for_v2.1.1 branch is now ready for re-review. Please note that the baseline images have been updated and there is an associated vistrails branch uvcdat-vcs3D-features_for_v2.1.1.

Thanks,
Tom

From: David Lonie <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Wednesday, February 25, 2015 12:21 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

Is this ready to "rereview"? I have some free cycles I can use to build/test.


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#issuecomment-76008680.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 25, 2015

Is there a pull request for the testdata repository?

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 25, 2015

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 25, 2015

Ah...let's try not to do that. It puts the baselines out of sync for everyone else until these changes get merged. See https://github.com/UV-CDAT/uvcdat/wiki/Dashboard,-Testing,-and-Validation#testdata-repository

Testing now.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 25, 2015

Still failing tests for me:

https://www.cdash.org/viewTest.php?onlyfailed&buildid=3709751

It looks like most of the issues in vcs are due to difference in master, but there are conflict when I try to merge master in. Please merge master in, resolve the conflicts, and push the resolved branch to this PR.

Outside of VCS, one of the dv3d tests is still failing:

https://www.cdash.org/testDetails.php?test=316072771&build=3709751

Looks like the Valid image is wrong, and the Test image is correct in this case?

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 25, 2015

Ah, I just remembered #950, which would explain why the "Valid" image has the error.

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 25, 2015

The ctests all passed for me. I'm guessing this is a merge issue. My merged branches are: master_with_vcs3D_features_for_v2.1.1 (uvcdat) and uvcdat-master-with-vcs3D-features_for_v2.1.1 (vistrails).

From: David Lonie <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Wednesday, February 25, 2015 2:42 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

Still failing tests for me:

https://www.cdash.org/viewTest.php?onlyfailed&buildid=3709751

It looks like most of the issues in vcs are due to difference in master, but there are conflict when I try to merge master in. Please merge master in, resolve the conflicts, and push the resolved branch to this PR.

Outside of VCS, one of the dv3d tests is still failing:

https://www.cdash.org/testDetails.php?test=316072771&build=3709751

Looks like the Valid image is wrong, and the Test image is correct in this case?


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#issuecomment-76039783.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 25, 2015

Can we try again with master merged back in? It currently can't be merged with the existing conflicts so we'll need to do this anyway.

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 25, 2015

I've regenerated uvcdat master_with_vcs3D_features_for_v2.1.1 by merging uvcdat master into vcs3D_features_for_v2.1.1.
I've also regenerated vistrails uvcdat-master-with-vcs3D-features_for_v2.1.1 by merging vistrails uvcdat-master into uvcdat-vcs3D-features_for_v2.1.1.
With these new merged branches all the vcs3D ctests pass for me.

-- Tom

From: David Lonie <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Wednesday, February 25, 2015 2:57 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

Can we try again with master merged back in? It currently can't be merged with the existing conflicts so we'll need to do this anyway.


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#issuecomment-76042860.

ThomasMaxwell added some commits Feb 25, 2015

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 26, 2015

Testing the new branches.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 26, 2015

Much closer. I still see a couple of failures:

https://www.cdash.org/viewTest.php?onlyfailed&buildid=3711104

vcs_test_vectors_amplitude was recently changed by @doutriaux1 in CDAT/uvcdat-testdata@79b06ec, so that's probably just a syncing issue with the code and the testdata repo.

dv3d_vector_test still has that weird random line across the rendering.

I'd like to see that fixed before merging into master, but I have a feeling I'm in the minority on this. @doutriaux1 @aashish24 feel free to merge if you're ok with this branch.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Feb 26, 2015

I am ok with this. one test fail is fixed, the other one seems like a minor issue.

aashish24 added a commit that referenced this pull request Feb 26, 2015

@aashish24 aashish24 merged commit 034fa3c into master Feb 26, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@aashish24 aashish24 deleted the vcs3D_features_for_v2.1.1 branch Feb 26, 2015

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 26, 2015

Remi,

I'm surprised that you're seeing weird random lines in the vector test. I've inserted what I see below. Not seeing random lines. What OS are you running in?

-- Tom

[cid:ED77F7E2-4F89-41E3-AB54-9ED0CF9956E8]

From: David Lonie <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Thursday, February 26, 2015 11:10 AM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

Much closer. I still see a couple of failures:

https://www.cdash.org/viewTest.php?onlyfailed&buildid=3711104

vcs_test_vectors_amplitude was recently changed by @doutriaux1https://github.com/doutriaux1 in UV-CDAT/uvcdat-testdata@79b06echttps://github.com/UV-CDAT/uvcdat-testdata/commit/79b06ec38a652673e43012131db867bbb54d9062, so that's probably just a syncing issue with the code and the testdata repo.

dv3d_vector_test still has that weird random line across the rendering.

I'd like to see that fixed before merging into master, but I have a feeling I'm in the minority on this. @doutriaux1https://github.com/doutriaux1 @aashish24https://github.com/aashish24 feel free to merge if you're ok with this branch.


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#issuecomment-76206011.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 26, 2015

(This is Dave ;) )

I'm using arch linux.

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 26, 2015

Hi Dave,
Sorry about the case of mistaken identity. :-) If you get a chance it would be helpful to see a screen shot of the weird lines you are encountering in linux.

From: David Lonie <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Thursday, February 26, 2015 12:28 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

(This is Dave ;) )

I'm using arch linux.


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#issuecomment-76223533.

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 26, 2015

Here's the link with the images (I posted it on the PR on github, but maybe it didn't go through?)

https://www.cdash.org/viewTest.php?onlyfailed&buildid=3711104

@allisonvacanti

This comment has been minimized.

Contributor

allisonvacanti commented Feb 26, 2015

The images are accessed by clicking on the "Failed" text.

@ThomasMaxwell

This comment has been minimized.

Contributor

ThomasMaxwell commented Feb 26, 2015

Thanks Aashish and Dave. I believe the corresponding vistrails PR still needs to be merged: CDAT/VisTrails#15

-- Tom

From: Aashish Chaudhary <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Thursday, February 26, 2015 12:23 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Vcs3D features for v2.1.1 (#951)

Merged #951#951.


Reply to this email directly or view it on GitHubhttps://github.com//pull/951#event-242657486.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Feb 26, 2015

@doutriaux1 merged it.

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented on .gitignore in 9c4ff52 Feb 27, 2015

@ThomasMaxwell we need the hook pre-commit files, putting them back in via @chaosphere2112 PR

This comment has been minimized.

Contributor

ThomasMaxwell replied Feb 27, 2015

@durack1 durack1 added the Enhancement label May 6, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment