Merge pull request #372 from rapidsai/branch-0.15

[gpuCI] Auto-merge branch-0.15 to branch-0.16 [skip ci]
rapidsai · Aug 14, 2020 · 5123f79 · 5123f79
2 parents 11a21a5 + 1579b3b
commit 5123f79
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/dask_cuda/benchmarks/utils.py b/dask_cuda/benchmarks/utils.py
@@ -187,7 +187,7 @@ def get_scheduler_workers(dask_scheduler=None):
 def setup_memory_pool(pool_size=None, disable_pool=False):
     import cupy
 
-    os.environ['RMM_NO_INITIALIZE'] = 'True'
+    os.environ["RAPIDS_NO_INITIALIZE"] = "True"
     import rmm
 
     rmm.reinitialize(

diff --git a/dask_cuda/cuda_worker.py b/dask_cuda/cuda_worker.py
@@ -133,7 +133,7 @@ def del_pid_file():
 
         if rmm_pool_size is not None or rmm_managed_memory:
             try:
-                os.environ['RMM_NO_INITIALIZE'] = 'True'
+                os.environ["RAPIDS_NO_INITIALIZE"] = "True"
                 import rmm  # noqa F401
             except ImportError:
                 raise ValueError(

diff --git a/dask_cuda/initialize.py b/dask_cuda/initialize.py
@@ -47,7 +47,7 @@ def initialize(
 ):
     if create_cuda_context:
         try:
-            os.environ['RMM_NO_INITIALIZE'] = 'True'
+            os.environ["RAPIDS_NO_INITIALIZE"] = "True"
             numba.cuda.current_context()
         except Exception:
             logger.error("Unable to start CUDA Context", exc_info=True)
@@ -107,7 +107,7 @@ def dask_setup(
 ):
     if create_cuda_context:
         try:
-            os.environ['RMM_NO_INITIALIZE'] = 'True'
+            os.environ["RAPIDS_NO_INITIALIZE"] = "True"
             numba.cuda.current_context()
         except Exception:
             logger.error("Unable to start CUDA Context", exc_info=True)
diff --git a/dask_cuda/local_cuda_cluster.py b/dask_cuda/local_cuda_cluster.py
@@ -168,7 +168,7 @@ def __init__(
         self.rmm_managed_memory = rmm_managed_memory
         if rmm_pool_size is not None or rmm_managed_memory:
             try:
-                os.environ['RMM_NO_INITIALIZE'] = 'True'
+                os.environ["RAPIDS_NO_INITIALIZE"] = "True"
                 import rmm  # noqa F401
             except ImportError:
                 raise ValueError(

diff --git a/dask_cuda/utils.py b/dask_cuda/utils.py
@@ -35,7 +35,7 @@ def __init__(self, nbytes, managed_memory):
 
     def setup(self, worker=None):
         if self.nbytes is not None or self.managed_memory is True:
-            os.environ['RMM_NO_INITIALIZE'] = 'True'
+            os.environ["RAPIDS_NO_INITIALIZE"] = "True"
             import rmm
 
             pool_allocator = False if self.nbytes is None else True