Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions opensfm/context.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import logging
import os
import resource
import psutil
import sys

import cv2
Expand Down Expand Up @@ -78,4 +78,5 @@ def processes_that_fit_in_memory(desired, per_process):


def current_memory_usage():
return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * rusage_unit
return psutil.Process(os.getpid()).memory_info().rss
#return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * rusage_unit
33 changes: 17 additions & 16 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
cloudpickle==0.4.0
exifread==2.1.2
gpxpy==1.1.2
joblib==0.13.2
loky==1.2.1
networkx==1.11
numpy
Pillow==6.2.0
pyproj==1.9.5.1
pytest==3.0.7
python-dateutil==2.6.0
pyyaml==5.1
repoze.lru==0.7
scipy
six
xmltodict==0.10.2
cloudpickle==0.4.0
exifread==2.1.2
gpxpy==1.1.2
joblib==0.13.2
loky==1.2.1
networkx==1.11
numpy
Pillow==6.2.0
pyproj==1.9.5.1
pytest==3.0.7
python-dateutil==2.6.0
pyyaml==5.1
repoze.lru==0.7
scipy
six
xmltodict==0.10.2
psutil