[yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Mon Feb 4 17:08:41 PST 2013
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/5b2a3ce6e130/
changeset: 5b2a3ce6e130
branch: yt
user: ngoldbaum
date: 2013-02-05 02:07:27
summary: Removing ranger from the install script. RIP.
affected #: 1 file
diff -r 3617719a777f7d0d0509c06f45c5cf27438b4cf5 -r 5b2a3ce6e130d1a2601640759b1a1ab4f2331b93 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -159,18 +159,6 @@
echo " $ module swap PE-pgi PE-gnu"
echo
fi
- if [ "${MYHOSTLONG%%ranger}" != "${MYHOSTLONG}" ]
- then
- echo "Looks like you're on Ranger."
- echo
- echo "NOTE: YOU MUST BE IN THE GNU PROGRAMMING ENVIRONMENT"
- echo "These commands should take care of that for you:"
- echo
- echo " $ module unload mvapich2"
- echo " $ module swap pgi gcc"
- echo " $ module load mvapich2"
- echo
- fi
if [ "${MYHOST##steele}" != "${MYHOST}" ]
then
echo "Looks like you're on Steele."
https://bitbucket.org/yt_analysis/yt/commits/5794d91ad696/
changeset: 5794d91ad696
branch: yt
user: ngoldbaum
date: 2013-02-05 02:08:14
summary: Merging
affected #: 3 files
diff -r 5b2a3ce6e130d1a2601640759b1a1ab4f2331b93 -r 5794d91ad696569ad43c004ed7880887ec041f58 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -819,7 +819,7 @@
for k, v in data_label_factors.items():
self.conversion_factors[data_labels[k]] = v
self.refine_by = self.parameters["RefineBy"]
- self.periodicity = ensure_tuple(self.parameters["LeftFaceBoundaryCondition"] == 3))
+ self.periodicity = ensure_tuple(self.parameters["LeftFaceBoundaryCondition"] == 3)
self.dimensionality = self.parameters["TopGridRank"]
if self.dimensionality > 1:
self.domain_dimensions = self.parameters["TopGridDimensions"]
diff -r 5b2a3ce6e130d1a2601640759b1a1ab4f2331b93 -r 5794d91ad696569ad43c004ed7880887ec041f58 yt/utilities/lib/png_writer.pyx
--- a/yt/utilities/lib/png_writer.pyx
+++ b/yt/utilities/lib/png_writer.pyx
@@ -93,6 +93,7 @@
int filter_method)
cdef int PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE
+ cdef int PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_ADAM7
cdef int PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE
void png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
@@ -240,7 +241,8 @@
cdef public void my_png_flush(png_structp png_ptr):
return
-def write_png_to_string(np.ndarray[np.uint8_t, ndim=3] buffer, int dpi=100):
+def write_png_to_string(np.ndarray[np.uint8_t, ndim=3] buffer, int dpi=100,
+ int gray = 0):
# This is something of a translation of the matplotlib _png module
cdef png_byte *pix_buffer = <png_byte *> buffer.data
@@ -263,16 +265,27 @@
# Um we are ignoring setjmp sorry guys
+ cdef int im_type, interlace_type
+ interlace_type = PNG_INTERLACE_NONE
+ if gray == 0:
+ im_type = PNG_COLOR_TYPE_RGB_ALPHA
+ sig_bit.gray = 0
+ sig_bit.red = sig_bit.green = sig_bit.blue = sig_bit.alpha = 8
+ elif gray == 1:
+ im_type = PNG_COLOR_TYPE_GRAY
+ sig_bit.gray = 8
+ sig_bit.red = sig_bit.green = sig_bit.blue = sig_bit.alpha = 0
+ else:
+ raise RuntimeError
+
png_set_IHDR(png_ptr, info_ptr, width, height, 8,
- PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
+ im_type, interlace_type,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE)
cdef size_t dots_per_meter = <size_t> (dpi / (2.54 / 100.0))
png_set_pHYs(png_ptr, info_ptr, dots_per_meter, dots_per_meter,
PNG_RESOLUTION_METER)
- sig_bit.gray = 0
- sig_bit.red = sig_bit.green = sig_bit.blue = sig_bit.alpha = 8
png_set_sBIT(png_ptr, info_ptr, &sig_bit)
diff -r 5b2a3ce6e130d1a2601640759b1a1ab4f2331b93 -r 5794d91ad696569ad43c004ed7880887ec041f58 yt/utilities/logger.py
--- a/yt/utilities/logger.py
+++ b/yt/utilities/logger.py
@@ -6,7 +6,7 @@
Affiliation: KIPAC/SLAC/Stanford
Homepage: http://yt-project.org/
License:
- Copyright (C) 2007-2011 Matthew Turk. All Rights Reserved.
+ Copyright (C) 2007-2013 Matthew Turk. All Rights Reserved.
This file is part of yt.
@@ -24,31 +24,31 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-import logging, os
-import logging.handlers as handlers
+import logging
from yt.config import ytcfg
# This next bit is grabbed from:
# http://stackoverflow.com/questions/384076/how-can-i-make-the-python-logging-output-to-be-colored
+
+
def add_coloring_to_emit_ansi(fn):
# add methods we need to the class
def new(*args):
levelno = args[1].levelno
- if(levelno>=50):
- color = '\x1b[31m' # red
- elif(levelno>=40):
- color = '\x1b[31m' # red
- elif(levelno>=30):
- color = '\x1b[33m' # yellow
- elif(levelno>=20):
- color = '\x1b[32m' # green
- elif(levelno>=10):
- color = '\x1b[35m' # pink
+ if(levelno >= 50):
+ color = '\x1b[31m' # red
+ elif(levelno >= 40):
+ color = '\x1b[31m' # red
+ elif(levelno >= 30):
+ color = '\x1b[33m' # yellow
+ elif(levelno >= 20):
+ color = '\x1b[32m' # green
+ elif(levelno >= 10):
+ color = '\x1b[35m' # pink
else:
- color = '\x1b[0m' # normal
+ color = '\x1b[0m' # normal
ln = color + args[1].levelname + '\x1b[0m'
args[1].levelname = ln
- #print "after"
return fn(*args)
return new
@@ -61,29 +61,38 @@
)
rootLogger = logging.getLogger()
+ytLogger = logging.getLogger("yt")
-ytLogger = logging.getLogger("yt")
def disable_stream_logging():
# We just remove the root logger's handlers
for handler in rootLogger.handlers:
if isinstance(handler, logging.StreamHandler):
rootLogger.removeHandler(handler)
+ h = logging.NullHandler()
+ ytLogger.addHandler(h)
original_emitter = logging.StreamHandler.emit
+
+
def colorize_logging():
f = logging.Formatter(cfstring)
- if len(rootLogger.handlers) > 0: rootLogger.handlers[0].setFormatter(f)
- logging.StreamHandler.emit = add_coloring_to_emit_ansi(logging.StreamHandler.emit)
+ if len(rootLogger.handlers) > 0:
+ rootLogger.handlers[0].setFormatter(f)
+ logging.StreamHandler.emit = add_coloring_to_emit_ansi(
+ logging.StreamHandler.emit)
+
+
def uncolorize_logging():
f = logging.Formatter(ufstring)
- if len(rootLogger.handlers) > 0: rootLogger.handlers[0].setFormatter(f)
+ if len(rootLogger.handlers) > 0:
+ rootLogger.handlers[0].setFormatter(f)
logging.StreamHandler.emit = original_emitter
-if ytcfg.getboolean("yt","coloredlogs"):
+if ytcfg.getboolean("yt", "coloredlogs"):
colorize_logging()
-if ytcfg.getboolean("yt","suppressStreamLogging"):
+if ytcfg.getboolean("yt", "suppressStreamLogging"):
disable_stream_logging()
ytLogger.debug("Set log level to %s", level)
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list