[Yt-svn] yt: 2 new changesets
hg at spacepope.org
hg at spacepope.org
Mon Jan 24 11:41:34 PST 2011
hg Repository: yt
details: yt/rev/801c166a7ddc
changeset: 3685:801c166a7ddc
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 24 14:41:18 2011 -0500
description:
Updating to mercurial 1.7.3 from 1.7.1 to fix problem on Nautilus
hg Repository: yt
details: yt/rev/b0e7bcae3f5d
changeset: 3686:b0e7bcae3f5d
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Jan 24 14:41:18 2011 -0500
description:
Updating to mercurial 1.7.3 from 1.7.1 to fix problem on Nautilus
diffstat:
.hgtags | 2 +
README | 2 +-
doc/install_script.sh | 6 +-
setup.py | 68 +-
yt/frontends/ramses/_ramses_reader.cpp | 11579 ++++++++++
yt/frontends/ramses/setup.py | 9 +-
yt/utilities/amr_utils.c | 35083 +++++++++++++++++++++++++++++++
yt/utilities/setup.py | 10 +-
8 files changed, 46675 insertions(+), 84 deletions(-)
diffs (truncated from 46854 to 300 lines):
diff -r 21f0c500199d -r b0e7bcae3f5d .hgtags
--- a/.hgtags Mon Jan 24 14:17:32 2011 -0500
+++ b/.hgtags Mon Jan 24 14:41:18 2011 -0500
@@ -5152,3 +5152,5 @@
0000000000000000000000000000000000000000 svn.993
fff7118f00e25731ccf37cba3082b8fcb73cf90e svn.371
0000000000000000000000000000000000000000 svn.371
+ca6e536c15a60070e6988fd472dc771a1897e170 yt-2.0
+882c41eed5dd4a3cdcbb567bcb79b833e46b1f42 yt-2.0.1
diff -r 21f0c500199d -r b0e7bcae3f5d README
--- a/README Mon Jan 24 14:17:32 2011 -0500
+++ b/README Mon Jan 24 14:41:18 2011 -0500
@@ -1,4 +1,4 @@
-Hi there! You've just downloaded yt, an analysis tool for 3D Enzo adaptive
+Hi there! You've just downloaded yt, an analysis tool for Enzo adaptive
mesh refinement datasets. It's written in python and based on the NumPy and
Matplotlib components.
diff -r 21f0c500199d -r b0e7bcae3f5d doc/install_script.sh
--- a/doc/install_script.sh Mon Jan 24 14:17:32 2011 -0500
+++ b/doc/install_script.sh Mon Jan 24 14:41:18 2011 -0500
@@ -17,7 +17,7 @@
DEST_SUFFIX="yt-`uname -p`"
DEST_DIR="`pwd`/${DEST_SUFFIX/ /}" # Installation location
-BRANCH="yt" # This is the branch to which we will forcibly update.
+BRANCH="stable" # This is the branch to which we will forcibly update.
# Here's where you put the HDF5 path if you like; otherwise it'll download it
# and install it on its own
@@ -265,7 +265,7 @@
get_enzotools Python-2.6.3.tgz
get_enzotools numpy-1.5.1.tar.gz
get_enzotools matplotlib-1.0.0.tar.gz
-get_enzotools mercurial-1.7.1.tar.gz
+get_enzotools mercurial-1.7.3.tar.gz
get_enzotools ipython-0.10.tar.gz
get_enzotools h5py-1.2.0.tar.gz
get_enzotools Cython-0.14.tar.gz
@@ -378,7 +378,7 @@
if [ $INST_HG -eq 1 ]
then
echo "Installing Mercurial."
- do_setup_py mercurial-1.7.1
+ do_setup_py mercurial-1.7.3
export HG_EXEC=${DEST_DIR}/bin/hg
else
# We assume that hg can be found in the path.
diff -r 21f0c500199d -r b0e7bcae3f5d setup.py
--- a/setup.py Mon Jan 24 14:17:32 2011 -0500
+++ b/setup.py Mon Jan 24 14:41:18 2011 -0500
@@ -5,76 +5,10 @@
import distribute_setup
distribute_setup.use_setuptools()
-from numpy.distutils.misc_util import appendpath
-from numpy.distutils import log
-
-# Verify that we have Cython installed
-try:
- import Cython
-except ImportError as e:
- print "Received error on importing Cython:"
- print e
- print "Now attempting to install Cython"
- import pip
- rv = pip.main(["install",
- "http://yt.enzotools.org/dependencies/Cython-latest.tar.gz"])
- if rv == 1:
- print "Unable to install Cython. Please report this bug to yt-users."
- sys.exit(1)
-
-######
-# This next bit comes from Matthew Brett, to get Cython working with NumPy
-# distutils. I added a bit to get C++ Cython working.
-from os.path import join as pjoin, dirname
-from distutils.dep_util import newer_group
-from distutils.errors import DistutilsError
-
-
-def generate_a_pyrex_source(self, base, ext_name, source, extension):
- ''' Monkey patch for numpy build_src.build_src method
-
- Uses Cython instead of Pyrex.
-
- Assumes Cython is present
- '''
- if self.inplace:
- target_dir = dirname(base)
- else:
- target_dir = appendpath(self.build_src, dirname(base))
- if extension.language == "c++":
- cplus = True
- file_ext = ".cpp"
- else:
- cplus = False
- file_ext = ".c"
- target_file = pjoin(target_dir, ext_name + file_ext)
- depends = [source] + extension.depends
- if self.force or newer_group(depends, target_file, 'newer'):
- import Cython.Compiler.Main
- log.info("cythonc:> %s" % (target_file))
- self.mkpath(target_dir)
- options = Cython.Compiler.Main.CompilationOptions(
- defaults=Cython.Compiler.Main.default_options,
- include_path=extension.include_dirs,
- language=extension.language, cplus = cplus,
- output_file=target_file)
- cython_result = Cython.Compiler.Main.compile(source,
- options=options)
- if cython_result.num_errors != 0:
- raise DistutilsError("%d errors while compiling %r with Cython" \
- % (cython_result.num_errors, source))
- return target_file
-
-
-from numpy.distutils.command import build_src
-build_src.build_src.generate_a_pyrex_source = generate_a_pyrex_source
-# End snippet
-######
-
import setuptools
DATA_FILES = []
-VERSION = "2.1dev"
+VERSION = "2.0stable"
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
diff -r 21f0c500199d -r b0e7bcae3f5d yt/frontends/ramses/_ramses_reader.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/yt/frontends/ramses/_ramses_reader.cpp Mon Jan 24 14:41:18 2011 -0500
@@ -0,0 +1,11579 @@
+/* Generated by Cython 0.13.beta0 on Wed Dec 1 13:02:43 2010 */
+
+#define PY_SSIZE_T_CLEAN
+#include "Python.h"
+#ifndef Py_PYTHON_H
+ #error Python headers needed to compile C extensions, please install development version of Python.
+#else
+
+#include <stddef.h> /* For offsetof */
+#ifndef offsetof
+#define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
+#endif
+
+#if !defined(WIN32) && !defined(MS_WINDOWS)
+ #ifndef __stdcall
+ #define __stdcall
+ #endif
+ #ifndef __cdecl
+ #define __cdecl
+ #endif
+ #ifndef __fastcall
+ #define __fastcall
+ #endif
+#endif
+
+#ifndef DL_IMPORT
+ #define DL_IMPORT(t) t
+#endif
+#ifndef DL_EXPORT
+ #define DL_EXPORT(t) t
+#endif
+
+#ifndef PY_LONG_LONG
+ #define PY_LONG_LONG LONG_LONG
+#endif
+
+#if PY_VERSION_HEX < 0x02040000
+ #define METH_COEXIST 0
+ #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
+ #define PyDict_Contains(d,o) PySequence_Contains(d,o)
+#endif
+
+#if PY_VERSION_HEX < 0x02050000
+ typedef int Py_ssize_t;
+ #define PY_SSIZE_T_MAX INT_MAX
+ #define PY_SSIZE_T_MIN INT_MIN
+ #define PY_FORMAT_SIZE_T ""
+ #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
+ #define PyInt_AsSsize_t(o) PyInt_AsLong(o)
+ #define PyNumber_Index(o) PyNumber_Int(o)
+ #define PyIndex_Check(o) PyNumber_Check(o)
+ #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
+#endif
+
+#if PY_VERSION_HEX < 0x02060000
+ #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
+ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+ #define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size)
+ #define PyVarObject_HEAD_INIT(type, size) \
+ PyObject_HEAD_INIT(type) size,
+ #define PyType_Modified(t)
+
+ typedef struct {
+ void *buf;
+ PyObject *obj;
+ Py_ssize_t len;
+ Py_ssize_t itemsize;
+ int readonly;
+ int ndim;
+ char *format;
+ Py_ssize_t *shape;
+ Py_ssize_t *strides;
+ Py_ssize_t *suboffsets;
+ void *internal;
+ } Py_buffer;
+
+ #define PyBUF_SIMPLE 0
+ #define PyBUF_WRITABLE 0x0001
+ #define PyBUF_FORMAT 0x0004
+ #define PyBUF_ND 0x0008
+ #define PyBUF_STRIDES (0x0010 | PyBUF_ND)
+ #define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
+ #define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
+ #define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
+ #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
+
+#endif
+
+#if PY_MAJOR_VERSION < 3
+ #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
+#else
+ #define __Pyx_BUILTIN_MODULE_NAME "builtins"
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define Py_TPFLAGS_CHECKTYPES 0
+ #define Py_TPFLAGS_HAVE_INDEX 0
+#endif
+
+#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
+ #define Py_TPFLAGS_HAVE_NEWBUFFER 0
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define PyBaseString_Type PyUnicode_Type
+ #define PyStringObject PyUnicodeObject
+ #define PyString_Type PyUnicode_Type
+ #define PyString_Check PyUnicode_Check
+ #define PyString_CheckExact PyUnicode_CheckExact
+#endif
+
+#if PY_VERSION_HEX < 0x02060000
+ #define PyBytesObject PyStringObject
+ #define PyBytes_Type PyString_Type
+ #define PyBytes_Check PyString_Check
+ #define PyBytes_CheckExact PyString_CheckExact
+ #define PyBytes_FromString PyString_FromString
+ #define PyBytes_FromStringAndSize PyString_FromStringAndSize
+ #define PyBytes_FromFormat PyString_FromFormat
+ #define PyBytes_DecodeEscape PyString_DecodeEscape
+ #define PyBytes_AsString PyString_AsString
+ #define PyBytes_AsStringAndSize PyString_AsStringAndSize
+ #define PyBytes_Size PyString_Size
+ #define PyBytes_AS_STRING PyString_AS_STRING
+ #define PyBytes_GET_SIZE PyString_GET_SIZE
+ #define PyBytes_Repr PyString_Repr
+ #define PyBytes_Concat PyString_Concat
+ #define PyBytes_ConcatAndDel PyString_ConcatAndDel
+ #define PySet_Check(obj) PyObject_TypeCheck(obj, &PySet_Type)
+ #define PyFrozenSet_Check(obj) PyObject_TypeCheck(obj, &PyFrozenSet_Type)
+#endif
+
+#ifndef PySet_CheckExact
+# define PySet_CheckExact(obj) (Py_TYPE(obj) == &PySet_Type)
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define PyInt_Type PyLong_Type
+ #define PyInt_Check(op) PyLong_Check(op)
+ #define PyInt_CheckExact(op) PyLong_CheckExact(op)
+ #define PyInt_FromString PyLong_FromString
+ #define PyInt_FromUnicode PyLong_FromUnicode
+ #define PyInt_FromLong PyLong_FromLong
+ #define PyInt_FromSize_t PyLong_FromSize_t
+ #define PyInt_FromSsize_t PyLong_FromSsize_t
+ #define PyInt_AsLong PyLong_AsLong
+ #define PyInt_AS_LONG PyLong_AS_LONG
+ #define PyInt_AsSsize_t PyLong_AsSsize_t
+ #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
+ #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
+#else
+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)
+#endif
+
+#if PY_MAJOR_VERSION >= 3
+ #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
+#endif
+
+#if PY_VERSION_HEX < 0x02050000
+ #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))
+ #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
More information about the yt-svn
mailing list