Merge d2a69c1 into d214e5d

lmcinnes · Oct 10, 2019 · 71cf631 · 71cf631
2 parents d214e5d + d2a69c1
commit 71cf631
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -2,3 +2,4 @@ numpy>=1.13
 scipy>=1.0
 scikit-learn>=0.20
 numba>=0.42
+tbb>=2019.0
diff --git a/setup.py b/setup.py
@@ -35,7 +35,8 @@ def readme():
     'install_requires': ['numpy >= 1.13',
                          'scikit-learn >= 0.20',
                           'scipy >= 1.0',
-                         'numba >= 0.42'],
+                         'numba >= 0.42',
+                         'tbb >= 2019.0'],
     'ext_modules' : [],
     'cmdclass' : {},
     'test_suite' : 'nose.collector',

diff --git a/umap/__init__.py b/umap/__init__.py
@@ -3,8 +3,6 @@
 # Workaround: https://github.com/numba/numba/issues/3341
 import numba
 
-numba.config.THREADING_LAYER = "workqueue"
-
 import pkg_resources
 
 __version__ = pkg_resources.get_distribution("umap-learn").version