Download as
Browse Code »

Commit a41b332cda6631e4fde498e4e0589d100b73d0f5

Authored by ruppert
1 parent 1aaf2ccb
Exists in master and in 67 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: compatibility with older psutil versions

Showing 1 changed file with 16 additions and 9 deletions   Show diff stats
invesalius/utils.py
  Diff comments   View file @a41b332
@@ -224,15 +224,22 @@ def calculate_resizing_tofitmemory(x_size,y_size,n_slices,byte): @@ -224,15 +224,22 @@ def calculate_resizing_tofitmemory(x_size,y_size,n_slices,byte):
224 224
225 # USING PSUTIL 225 # USING PSUTIL
226 import psutil 226 import psutil
227 - if (psutil.version_info<(0,6,0)):  
228 - ram_free = psutil.phymem_usage().free + psutil.cached_phymem() + psutil.phymem_buffers()  
229 - ram_total = psutil.phymem_usage().total  
230 - swap_free = psutil.virtmem_usage().free  
231 - else:  
232 - ram_free = psutil.virtual_memory().available  
233 - ram_total = psutil.virtual_memory().total  
234 - swap_free = psutil.swap_memory().free  
235 - 227 +
  228 + try:
  229 + if (psutil.version_info>=(0,6,0)):
  230 + ram_free = psutil.virtual_memory().available
  231 + ram_total = psutil.virtual_memory().total
  232 + swap_free = psutil.swap_memory().free
  233 + else:
  234 + ram_free = psutil.phymem_usage().free + psutil.cached_phymem() + psutil.phymem_buffers()
  235 + ram_total = psutil.phymem_usage().total
  236 + swap_free = psutil.virtmem_usage().free
  237 + except:
  238 + print "Exception! psutil version < 0.3 (not recommended)"
  239 + ram_total = psutil.TOTAL_PHYMEM # this is for psutil < 0.3
  240 + ram_free = 0.8 * psutil.TOTAL_PHYMEM
  241 + swap_free = psutil.avail_virtmem()
  242 +
236 print "RAM_FREE=", ram_free 243 print "RAM_FREE=", ram_free
237 print "RAM_TOTAL=", ram_total 244 print "RAM_TOTAL=", ram_total
238 245