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

Vcs3 d fix 2.2 interaction problems #1138

Merged
merged 8 commits into from
Mar 11, 2015

Conversation

ThomasMaxwell
Copy link
Contributor

Fixes the broken interactions in the 3D plots.

@doutriaux1
Copy link
Contributor

thanks @ThomasMaxwell
@chaosphere2112 said he will take a look tomorrw to make sure his branch and yours don't clash.

@aashish24
Copy link
Contributor

Looks good to me ( I haven't built the branch but looked at the code). @ThomasMaxwell did you run ctest?

@doutriaux1 we don't need to worry about conflicts when two branches are up for the development. When the first goes in the second has to resolve the conflicts. The changes here seems mostly orthogonal.

@ThomasMaxwell
Copy link
Contributor Author

This branch passed all ctests yesterday with the master at that time.

From: Aashish Chaudhary <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Wednesday, March 11, 2015 at 8:42 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] Vcs3 d fix 2.2 interaction problems (#1138)

Looks good to me ( I haven't built the branch but looked at the code). @ThomasMaxwellhttps://github.com/ThomasMaxwell did you run ctest?

@doutriaux1https://github.com/doutriaux1 we don't need to worry about conflicts when two branches are up for the development. When the first goes in the second has to resolve the conflicts. The changes here seems mostly orthogonal.


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

@doutriaux1
Copy link
Contributor

works for me. Merging

doutriaux1 added a commit that referenced this pull request Mar 11, 2015
@doutriaux1 doutriaux1 merged commit e48e5f9 into master Mar 11, 2015
@doutriaux1 doutriaux1 deleted the vcs3D-fix_2.2_interaction_problems branch March 11, 2015 17:38
@aashish24
Copy link
Contributor

Great. Thanks @doutriaux1.Yes @ThomasMaxwell the branch looked good to me.

@ThomasMaxwell
Copy link
Contributor Author

I’m now getting the following errors building python in the current master branch in OS X 10.10:

/usr/bin/gcc -bundle -undefined dynamic_lookup -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -Wl,-rpath,/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/lib -Wl,-rpath,/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -bind_at_load -mmacosx-version-min=10.10 -fno-strict-aliasing -fno-common -dynamic -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/include -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -bind_at_load -mmacosx-version-min=10.10 -fPIC -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes build/temp.macosx-10.4-x86_64-2.7/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/pyexpat.o build/temp.macosx-10.4-x86_64-2.7/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/expat/xmlparse.o build/temp.macosx-10.4-x86_64-2.7/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/expat/xmlrole.o build/temp.macosx-10.4-x86_64-2.7/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/expat/xmltok.o -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -L/usr/local/lib -o build/lib.macosx-10.4-x86_64-2.7/pyexpat.so

*** WARNING: renaming "pyexpat" since importing it failed: dlopen(build/lib.macosx-10.4-x86_64-2.7/pyexpat.so, 2): Symbol not found: _XML_ErrorString

Referenced from: build/lib.macosx-10.4-x86_64-2.7/pyexpat.so

Expected in: flat namespace

in build/lib.macosx-10.4-x86_64-2.7/pyexpat.so

building '_elementtree' extension

/usr/bin/gcc -fno-strict-aliasing -fno-common -dynamic -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/include -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -bind_at_load -mmacosx-version-min=10.10 -fPIC -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes -DHAVE_EXPAT_CONFIG_H=1 -DUSE_PYEXPAT_CAPI -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/./Modules/expat -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Mac/Include -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Mac/Include -I. -IInclude -I./Include -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include -I/usr/local/include -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Include -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python -c /Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/_elementtree.c -o build/temp.macosx-10.4-x86_64-2.7/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/_elementtree.o

clang: warning: argument unused during compilation: '-L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib'

clang: warning: argument unused during compilation: '-L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources'

clang: warning: argument unused during compilation: '-bind_at_load'

/usr/bin/gcc -bundle -undefined dynamic_lookup -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -Wl,-rpath,/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/lib -Wl,-rpath,/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -bind_at_load -mmacosx-version-min=10.10 -fno-strict-aliasing -fno-common -dynamic -I/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/include -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -bind_at_load -mmacosx-version-min=10.10 -fPIC -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes build/temp.macosx-10.4-x86_64-2.7/Developer/Projects/EclipseWorkspace/uvcdat/master/build/build/Python/Modules/_elementtree.o -L/Developer/Projects/EclipseWorkspace/uvcdat/master/build/install/Externals/lib -L/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources -L/usr/local/lib -o build/lib.macosx-10.4-x86_64-2.7/_elementtree.so

*** WARNING: renaming "_elementtree" since importing it failed: PyCapsule_Import could not import module "pyexpat"

Python build finished, but the necessary bits to build these modules were not found:

_bsddb dl gdbm

imageop linuxaudiodev ossaudiodev

spwd sunaudiodev

To find the necessary bits, look in setup.py in detect_modules() for the module's name.

Failed to build these modules:

_elementtree pyexpat

@chaosphere2112
Copy link
Contributor

@ThomasMaxwell Was this meant for the uvcdat-devel mailing list? Or maybe #1183 ?

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.

4 participants