From cc59da2e85b81db25dd52e56f9f2c0bef9d2db17 Mon Sep 17 00:00:00 2001 From: KJMappers Date: Thu, 9 Apr 2020 14:32:39 +0900 Subject: [PATCH 1/3] change resource to psutil for Windows --- opensfm/context.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/opensfm/context.py b/opensfm/context.py index 891825435..0b0e98299 100644 --- a/opensfm/context.py +++ b/opensfm/context.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import logging import os -import resource +import psutil import sys import cv2 @@ -78,4 +78,6 @@ def processes_that_fit_in_memory(desired, per_process): def current_memory_usage(): - return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * rusage_unit + ps = psutil.Process(os.getpid()) + return ps.memory_info().rss + #return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * rusage_unit From 5d46ddd3e62756144f8d8496d372dee48b2ac8aa Mon Sep 17 00:00:00 2001 From: KJMappers Date: Thu, 9 Apr 2020 14:37:26 +0900 Subject: [PATCH 2/3] change resource to psutil for Windows --- opensfm/context.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opensfm/context.py b/opensfm/context.py index 0b0e98299..c56fb9930 100644 --- a/opensfm/context.py +++ b/opensfm/context.py @@ -78,6 +78,5 @@ def processes_that_fit_in_memory(desired, per_process): def current_memory_usage(): - ps = psutil.Process(os.getpid()) - return ps.memory_info().rss + return psutil.Process(os.getpid()).memory_info().rss #return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * rusage_unit From b54741c0d2cd3a48d3218a03040edc00fc807186 Mon Sep 17 00:00:00 2001 From: KwangJun Kim <36073566+kjkim-kr@users.noreply.github.com> Date: Fri, 17 Apr 2020 09:49:47 +0900 Subject: [PATCH 3/3] add psutil dependency --- requirements.txt | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index d89fb1090..216eec713 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 \ No newline at end of file