[pyfr] 21/88: Cleanups.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Nov 16 12:05:26 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository pyfr.

commit e29f2cfe1177e92662fab401b2482c606d4adec3
Author: Freddie Witherden <freddie at witherden.org>
Date:   Sat Apr 23 17:48:24 2016 -0700

    Cleanups.
---
 pyfr/backends/cuda/cublas.py        | 2 +-
 pyfr/backends/mic/compiler.py       | 2 +-
 pyfr/backends/mic/packing.py        | 2 +-
 pyfr/backends/mic/types.py          | 1 -
 pyfr/integrators/std/controllers.py | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pyfr/backends/cuda/cublas.py b/pyfr/backends/cuda/cublas.py
index 8f3ee06..183f336 100644
--- a/pyfr/backends/cuda/cublas.py
+++ b/pyfr/backends/cuda/cublas.py
@@ -77,7 +77,7 @@ class CUBLASWrappers(object):
             try:
                 raise self._statuses[status]
             except KeyError:
-                raise CublasError
+                raise CUBLASError
 
 
 class CUDACUBLASKernels(object):
diff --git a/pyfr/backends/mic/compiler.py b/pyfr/backends/mic/compiler.py
index f550ce7..393ef38 100644
--- a/pyfr/backends/mic/compiler.py
+++ b/pyfr/backends/mic/compiler.py
@@ -48,7 +48,7 @@ class MICSourceModule(object):
             # Load
             self._mod = dev.load_library(os.path.join(tmpdir, ln))
         finally:
-            pass #rm(tmpdir)
+            rm(tmpdir)
 
     def function(self, name, argtypes, restype=None):
         return getattr(self._mod, name)
diff --git a/pyfr/backends/mic/packing.py b/pyfr/backends/mic/packing.py
index 043975d..361965c 100644
--- a/pyfr/backends/mic/packing.py
+++ b/pyfr/backends/mic/packing.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from pyfr.backends.base import ComputeKernel, NullComputeKernel
+from pyfr.backends.base import ComputeKernel
 from pyfr.backends.base.packing import BasePackingKernels
 from pyfr.backends.mic.provider import MICKernelProvider
 
diff --git a/pyfr/backends/mic/types.py b/pyfr/backends/mic/types.py
index c29ccf4..7abe53f 100644
--- a/pyfr/backends/mic/types.py
+++ b/pyfr/backends/mic/types.py
@@ -3,7 +3,6 @@
 import numpy as np
 
 import pyfr.backends.base as base
-from pyfr.util import lazyprop
 
 
 class MICMatrixBase(base.MatrixBase):
diff --git a/pyfr/integrators/std/controllers.py b/pyfr/integrators/std/controllers.py
index 8875edf..45370ff 100644
--- a/pyfr/integrators/std/controllers.py
+++ b/pyfr/integrators/std/controllers.py
@@ -150,8 +150,8 @@ class StdPIController(BaseStdController):
         saff = self._saffac
         sord = self._stepper_order
 
-        expa = self._alpha / self._stepper_order
-        expb = self._beta / self._stepper_order
+        expa = self._alpha / sord
+        expb = self._beta / sord
 
         while self.tcurr < t:
             # Decide on the time step

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfr.git



More information about the debian-science-commits mailing list