Full GPU only support\!\!\!, OpenGL disables CUDA

Author: John Mora

cpyrit/cpyrit.py

@@ -432,14 +432,15 @@ def __init__(self):
         self.cores = []
         self.CUDAs = []
         self.OpCL = []
+        self.all = []
         self.cv = threading.Condition()
 
         # CUDA
-        if config.cfg['use_CUDA'] == 'true' and 'cpyrit._cpyrit_cuda' in sys.modules:
+        if config.cfg['use_CUDA'] == 'true' and 'cpyrit._cpyrit_cuda' in sys.modules and config.cfg['use_OpenCL'] == 'false':
 
             CUDA =  cpyrit_cuda.listDevices()
 
-            for dev_idx, device in enumerate(CUDAs):
+            for dev_idx, device in enumerate(CUDA):
                 self.CUDAs.append(CUDACore(queue=self, dev_idx=dev_idx))
                 CUDA -= 1
 
@@ -463,6 +464,8 @@ def __init__(self):
         for i in xrange(util.ncpus):
             self.cores.append(CPUCore(queue=self))
 
+    
+
         #Network
         if config.cfg['rpc_server'] == 'true':
             for port in xrange(17935, 18000):
@@ -485,9 +488,18 @@ def __init__(self):
                 self.ncore_uuid = None
         else:
             self.ncore_uuid = None
+                
 
-    def _check_cores(self):
         for core in self.cores:
+            self.all.append(core)
+        for OCL in self.OpCL:
+            self.all.append(OCL)
+        for CD in self.CUDAs:
+            self.all.append(CD)
+
+    def _check_cores(self):
+        all = []
+        for core in self.all:
             if not core.shallStop and not core.isAlive():
                 raise SystemError("The core '%s' has died unexpectedly" % core)
 
@@ -518,13 +530,13 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.shutdown()
 
     def shutdown(self):
-        for core in self.cores:
+        for core in self.all:
             core.shallStop = True
-        for core in self.cores:
+        for core in self.all:
             core.shutdown()
 
     def isAlive(self):
-        return all(core.isAlive() for core in self.cores)
+        return all(core.isAlive() for core in self.all)
 
     def waitForSchedule(self, maxBufferSize):
         """Block until less than the given number of passwords wait for being
@@ -538,7 +550,7 @@ def waitForSchedule(self, maxBufferSize):
 
     def resetStatistics(self):
         """Reset all cores' statistics"""
-        for core in self.cores:
+        for core in self.all:
             core.resetStatistics()
 
     def getPeakPerformance(self):
@@ -548,7 +560,7 @@ def getPeakPerformance(self):
            with 100% occupancy. The real performance is lower if the caller
            fails to keep the pipeline filled.
         """
-        return sum([c.resCount / c.compTime for c in self.cores if c.compTime])
+        return sum([c.resCount / c.compTime for c in self.all if c.compTime])
 
     def enqueue(self, essid, passwords, block=True):
         """Enqueue the given ESSID and iterable of passwords for processing.

cpyrit/util.py

@@ -87,7 +87,8 @@ def _limit_ncpus():
     except ValueError:
         raise ValueError("Invalid 'limit_ncpus' in configuration")
     if limited_ncpus < 0:
-        raise ValueError("Invalid 'limit_ncpus' in configuration")
+    #raise ValueError("Invalid 'limit_ncpus' in configuration")
+        return 0;
     if limited_ncpus > 0 and limited_ncpus < detected_ncpus:
         return limited_ncpus
     return detected_ncpus

pyrit_cli.py

@@ -292,20 +292,25 @@ def list_cores(self):
            pyrit list_cores
         """
         with cpyrit.cpyrit.CPyrit() as cp:
-            self.tell("The following cores seem available...")
+            if int(cpyrit.config.cfg['limit_ncpus']) < 0:
+                self.tell("CPUs disabled in config...")
+            else:
+                self.tell("The following cores seem available...")
             for i, core in enumerate(cp.cores):
                 self.tell("#%i:  '%s'" % (i + 1, core))
-            if cpyrit.config.cfg['use_CUDA'] == 'true':
-                if len(cp.CUDAs) != 0:
-                    self.tell("\nThe following CUDA GPUs seem aviable...")
-                    for i, CD in enumerate(cp.CUDAs):
-                        self.tell("#%i:  '%s'" % (i + 1, CD))
 
             if cpyrit.config.cfg['use_OpenCL'] == 'true':
+                if cpyrit.config.cfg['use_CUDA'] == 'true':
+                    self.tell("\nWARNING: OpenCL disables CUDA!\n")
                 if len(cp.OpCL) != 0:
                     self.tell("\nThe following OpenCL GPUs seem aviable...")
                     for i, OCL in enumerate(cp.OpCL):
                         self.tell("#%i:  '%s'" % (i + 1, OCL))
+            elif cpyrit.config.cfg['use_OpenCL'] == 'false' and cpyrit.config.cfg['use_CUDA'] == 'true':
+                if len(cp.CUDAs) != 0:
+                    self.tell("\nThe following CUDA GPUs seem aviable...")
+                    for i, CD in enumerate(cp.CUDAs):
+                        self.tell("#%i:  '%s'" % (i + 1, CD))
     list_cores.cli_options = ((), ())
 
     def list_essids(self, storage):

setup.py

@@ -26,7 +26,7 @@
 import sys
 import re
 
-VERSION = '0.4.1-dev'
+VERSION = '0.4.6'
 
 UnixCCompiler.src_extensions.append('.S')