Merge pull request #57 from gmrukwa/fixup-nested-pool

Remove nested parallel pools
gmrukwa · Mar 16, 2020 · cdfb8e1 · cdfb8e1
2 parents 0fc7dc5 + 8852d66
commit cdfb8e1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,7 +12,7 @@ on:
 env:
   MAJOR: ${{ 2 }}
   MINOR: ${{ 5 }}
-  FIXUP: ${{ 0 }}
+  FIXUP: ${{ 1 }}
   PACKAGE_INIT_FILE: ${{ 'divik/__init__.py' }}
   PACKAGE_INIT_FILE_VERSION_LINE: ${{ 1 }}
   PACKAGE_SETUP_FILE: ${{ 'setup.py' }}

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ docker pull gmrukwa/divik
 To install specific version, you can specify it in the command, e.g.:
 
 ```bash
-docker pull gmrukwa/divik:2.5.0
+docker pull gmrukwa/divik:2.5.1
 ```
 
 ## Python package
@@ -79,7 +79,7 @@ pip install divik
 or any stable tagged version, e.g.:
 
 ```bash
-pip install divik==2.5.0
+pip install divik==2.5.1
 ```
 
 If you want to have compatibility with

diff --git a/divik/__init__.py b/divik/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.5.0'
+__version__ = '2.5.1'
 
 from ._summary import plot, reject_split
 

diff --git a/divik/cluster/_kmeans/_dunn.py b/divik/cluster/_kmeans/_dunn.py
@@ -138,7 +138,7 @@ def _n_ops(self, data):
 
     def _sampled_dunn(self, kmeans, data, inter, intra):
         return sampled_dunn(kmeans, data, inter=inter, intra=intra,
-                            sample_size=self.sample_size, n_jobs=self.n_jobs,
+                            sample_size=self.sample_size, n_jobs=1,
                             seed=self.seed, n_trials=self.n_trials)
 
     def _dunn(self, kmeans, data):

diff --git a/docs/instructions/installation.rst b/docs/instructions/installation.rst
@@ -14,7 +14,7 @@ To install latest stable version use::
 
 To install specific version, you can specify it in the command, e.g.::
 
-    docker pull gmrukwa/divik:2.5.0
+    docker pull gmrukwa/divik:2.5.1
 
 Python package
 --------------
@@ -31,7 +31,7 @@ package::
 
 or any stable tagged version, e.g.::
 
-    pip install divik==2.5.0
+    pip install divik==2.5.1
 
 If you want to have compatibility with
 `gin-config <https://github.com/google/gin-config>`_, you can install

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import sys
 import numpy
 
-__version__ = '2.5.0'
+__version__ = '2.5.1'
 
 LINUX_OPTS = {
     'extra_link_args': [