[Yt-svn] yt: 2 new changesets
hg at spacepope.org
hg at spacepope.org
Wed Apr 21 07:57:39 PDT 2010
hg Repository: yt
details: yt/rev/8182af85a00c
changeset: 1580:8182af85a00c
user: Matthew Turk <matthewturk at gmail.com>
date:
Wed Apr 21 06:55:21 2010 -0700
description:
Changing all places where fields_to_get is assigned from self.fields to be
assigned from self.fields[:]. This should fix a bug with pre-assigning field
lists.
hg Repository: yt
details: yt/rev/0f31a1751845
changeset: 1581:0f31a1751845
user: Matthew Turk <matthewturk at gmail.com>
date:
Wed Apr 21 07:57:34 2010 -0700
description:
Adding a -D to get rid of setjmp problems on linux with older libpng libraries.
diffstat:
yt/lagos/BaseDataTypes.py | 14 +++++++-------
yt/setup.py | 5 +++++
2 files changed, 12 insertions(+), 7 deletions(-)
diffs (83 lines):
diff -r 8190256cc360 -r 0f31a1751845 yt/lagos/BaseDataTypes.py
--- a/yt/lagos/BaseDataTypes.py Wed Apr 21 06:44:11 2010 -0700
+++ b/yt/lagos/BaseDataTypes.py Wed Apr 21 07:57:34 2010 -0700
@@ -405,7 +405,7 @@
self._get_list_of_grids()
points = []
if not fields:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(fields)
if not self.sort_by in fields_to_get and \
@@ -574,7 +574,7 @@
if not self.has_key('pdx'):
self._generate_coords()
if fields == None:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(fields)
temp_data = {}
@@ -1615,7 +1615,7 @@
self._get_list_of_grids()
points = []
if not fields:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(fields)
mylog.debug("Going to obtain %s", fields_to_get)
@@ -2401,7 +2401,7 @@
self._get_list_of_grids()
# We don't generate coordinates here.
if field == None:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(field)
for grid in self._grids:
@@ -2503,7 +2503,7 @@
self._get_list_of_grids()
# We don't generate coordinates here.
if field == None:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(field)
for field in fields_to_get:
@@ -2640,7 +2640,7 @@
self._get_list_of_grids()
# We don't generate coordinates here.
if field == None:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(field)
for grid in self._grids:
@@ -2699,7 +2699,7 @@
self._get_list_of_grids()
# We don't generate coordinates here.
if field == None:
- fields_to_get = self.fields
+ fields_to_get = self.fields[:]
else:
fields_to_get = ensure_list(field)
for field in fields_to_get:
diff -r 8190256cc360 -r 0f31a1751845 yt/setup.py
--- a/yt/setup.py Wed Apr 21 06:44:11 2010 -0700
+++ b/yt/setup.py Wed Apr 21 07:57:34 2010 -0700
@@ -63,8 +63,13 @@
png_inc, png_lib = check_for_png()
include_dirs=[png_inc]
library_dirs=[png_lib]
+ # Because setjmp.h is included by lots of things, and because libpng hasn't
+ # always properly checked its header files (see
+ # https://bugzilla.redhat.com/show_bug.cgi?id=494579 ) we simply disable
+ # support for setjmp.
config.add_extension("amr_utils",
["yt/amr_utils.c", "yt/_amr_utils/FixedInterpolator.c"],
+ define_macros=[("PNG_SETJMP_NOT_SUPPORTED", True)],
include_dirs=["yt/_amr_utils/", png_inc],
library_dirs=[png_lib],
libraries=["m", "png"])
More information about the yt-svn
mailing list