Changeset 467

Timestamp:

09/13/10 12:41:18 (21 months ago)

Author:

mpereira

bzr:base-revision:

michael.fsp@gmail.com-20100910190108-eqrby15xsyr8br4e

bzr:committer:

Michael Pereira <michael.fsp@gmail.com>

bzr:file-ids:

src/__init__.py 106@400bb3d0-8d2e-0410-a2c0-f692ac833539:trunk%2Fsrc%2F__init__.py
src/signals/analogs.py 375@400bb3d0-8d2e-0410-a2c0-f692ac833539:trunk%2Fsrc%2Fsignals%2Fanalogs.py
src/signals/spikes.py 375@400bb3d0-8d2e-0410-a2c0-f692ac833539:trunk%2Fsrc%2Fsignals%2Fspikes.py

bzr:mapping-version:

v4

bzr:repository-uuid:

400bb3d0-8d2e-0410-a2c0-f692ac833539

bzr:revision-id:

michael.fsp@gmail.com-20100913104227-b0bdupz01cwgqf1z

bzr:revno:

411

bzr:revprop:branch-nick:

NeuroTools_branch

bzr:root:

trunk

bzr:timestamp:

2010-09-13 12:42:27.492000103 +0200

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-09-13T10:42:27.492000Z

Message:

conditional check of psyco (now only for 32-bit)

Location:

trunk/src

Files:

• __init__.py (modified) (3 diffs)
• signals/analogs.py (modified) (1 diff)
• signals/spikes.py (modified) (2 diffs)

trunk/src/__init__.py

@@ -39 +39 @@
 __version__ = "0.1.0 (Asynchronous Astrocyte)"
 import warnings
+import platform
 from operator import __or__
 
@@ -72 +73 @@
 #########################################################
 
+ARCH = platform.machine()
+
 class DependencyWarning(UserWarning):
     pass
@@ -97 +100 @@
    if tables.__version__<= 2: #1.4: #v[0] < 1 or (v[0] == 1 and v[1] < 4):
        raise Exception('PyTables version must be >= 1.4, installed version is %s' % __version__)
+
+def check_psyco_compatibility():
+    if ARCH == 'x86_64':
+        return False
+    else:
+        return True
 
 def check_dependency(name):

trunk/src/signals/analogs.py

@@ -32 +32 @@
 
 import os, re, numpy
-from NeuroTools import check_dependency, check_numpy_version
+from NeuroTools import check_dependency, check_numpy_version, check_psyco_compatibility
 from NeuroTools.io import *
 from NeuroTools.plotting import get_display, set_axis_limits, set_labels, SimpleMultiplot
 
-
-if check_dependency('psyco'):
-    import psyco
-    psyco.full()
+if check_psyco_compatibility():
+    if check_dependency('psyco'):
+        import psyco
+        psyco.full()
 
 from NeuroTools import check_dependency

trunk/src/signals/spikes.py

@@ -28 +28 @@
 import os, re, numpy
 import logging
-from NeuroTools import check_dependency, check_numpy_version
+from NeuroTools import check_dependency, check_numpy_version, check_psyco_compatibility
 try:
     from NeuroTools import analysis
@@ -39 +39 @@
 from intervals import *
 
-
-if check_dependency('psyco'):
-    import psyco
-    psyco.full()
+if check_psyco_compatibility():
+    if check_dependency('psyco'):
+        import psyco
+        psyco.full()
 
 from NeuroTools import check_dependency