Commits

Chris Mutel committed eccc1f0

0.8.2: Can manually specify number of CPUs in Monte Carlo

  • Participants
  • Parent commits 06dcd3c

Comments (0)

Files changed (2)

File bw2calc/monte_carlo.py

 
 class ParallelMonteCarlo(object):
     """Split a Monte Carlo calculation into parallel jobs"""
-    def __init__(self, demand, method, iterations=1000, chunk_size=None):
+    def __init__(self, demand, method, iterations=1000, chunk_size=None, cpus=None):
         self.demand = demand
         self.method = method
         if chunk_size:
             if iterations % self.chunk_size:
                 self.num_jobs += 1
         else:
-            self.num_jobs = max(multiprocessing.cpu_count() - 1, 1)
+            self.num_jobs = cpus or multiprocessing.cpu_count()
             self.chunk_size = (iterations // self.num_jobs) + 1
 
     def calculate(self):
 
 setup(
   name='bw2calc',
-  version="0.8.1.1",
+  version="0.8.2",
   packages=["bw2calc", "bw2calc.tests"],
   author="Chris Mutel",
   author_email="cmutel@gmail.com",