From ac5095984ee90a563f786c4c566118c21ba6a85e Mon Sep 17 00:00:00 2001 From: bpinsard Date: Thu, 12 Sep 2013 09:29:48 +0200 Subject: [PATCH 1/3] fix:total_seconds_python2.6 --- nipype/interfaces/base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nipype/interfaces/base.py b/nipype/interfaces/base.py index d60e8a2486..b6ae429453 100644 --- a/nipype/interfaces/base.py +++ b/nipype/interfaces/base.py @@ -996,8 +996,8 @@ def run(self, **inputs): runtime = self._run_interface(runtime) outputs = self.aggregate_outputs(runtime) runtime.endTime = dt.isoformat(dt.utcnow()) - runtime.duration = (parseutc(runtime.endTime) - - parseutc(runtime.startTime)).total_seconds() + timediff = parseutc(runtime.endTime) - parseutc(runtime.startTime) + runtime.duration = timediff.days * 86400 + timediff.seconds results = InterfaceResult(interface, runtime, inputs=self.inputs.get_traitsfree(), outputs=outputs) @@ -1005,8 +1005,8 @@ def run(self, **inputs): results.provenance = prov_record except Exception, e: runtime.endTime = dt.isoformat(dt.utcnow()) - runtime.duration = (parseutc(runtime.endTime) - - parseutc(runtime.startTime)).total_seconds() + timediff = parseutc(runtime.endTime) - parseutc(runtime.startTime) + runtime.duration = timediff.days * 86400 + timediff.seconds if len(e.args) == 0: e.args = ("") From 930f9c765206e8521060e5353a3800d5c5984eda Mon Sep 17 00:00:00 2001 From: bpinsard Date: Thu, 12 Sep 2013 14:19:51 +0200 Subject: [PATCH 2/3] microseconds --- nipype/interfaces/base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/base.py b/nipype/interfaces/base.py index b6ae429453..648fb06926 100644 --- a/nipype/interfaces/base.py +++ b/nipype/interfaces/base.py @@ -997,7 +997,8 @@ def run(self, **inputs): outputs = self.aggregate_outputs(runtime) runtime.endTime = dt.isoformat(dt.utcnow()) timediff = parseutc(runtime.endTime) - parseutc(runtime.startTime) - runtime.duration = timediff.days * 86400 + timediff.seconds + runtime.duration = timediff.days * 86400 + timediff.seconds + \ + timediff..microseconds/100000. results = InterfaceResult(interface, runtime, inputs=self.inputs.get_traitsfree(), outputs=outputs) @@ -1006,7 +1007,8 @@ def run(self, **inputs): except Exception, e: runtime.endTime = dt.isoformat(dt.utcnow()) timediff = parseutc(runtime.endTime) - parseutc(runtime.startTime) - runtime.duration = timediff.days * 86400 + timediff.seconds + runtime.duration = timediff.days * 86400 + timediff.seconds + \ + timediff..microseconds/100000. if len(e.args) == 0: e.args = ("") From 8eb387bea1fc79e8fe1122db31884f95dad11e6c Mon Sep 17 00:00:00 2001 From: bpinsard Date: Thu, 12 Sep 2013 14:20:54 +0200 Subject: [PATCH 3/3] microseconds --- nipype/interfaces/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/base.py b/nipype/interfaces/base.py index 648fb06926..5221646f15 100644 --- a/nipype/interfaces/base.py +++ b/nipype/interfaces/base.py @@ -998,7 +998,7 @@ def run(self, **inputs): runtime.endTime = dt.isoformat(dt.utcnow()) timediff = parseutc(runtime.endTime) - parseutc(runtime.startTime) runtime.duration = timediff.days * 86400 + timediff.seconds + \ - timediff..microseconds/100000. + timediff.microseconds/100000. results = InterfaceResult(interface, runtime, inputs=self.inputs.get_traitsfree(), outputs=outputs) @@ -1008,7 +1008,7 @@ def run(self, **inputs): runtime.endTime = dt.isoformat(dt.utcnow()) timediff = parseutc(runtime.endTime) - parseutc(runtime.startTime) runtime.duration = timediff.days * 86400 + timediff.seconds + \ - timediff..microseconds/100000. + timediff.microseconds/100000. if len(e.args) == 0: e.args = ("")