fix merge conflict

nv-morpheus · Aug 15, 2024 · 472f0b9 · 472f0b9
1 parent c8361fe
commit 472f0b9
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/python/morpheus/morpheus/utils/downloader.py b/python/morpheus/morpheus/utils/downloader.py
@@ -102,25 +102,12 @@ def get_dask_cluster(self):
             if Downloader._dask_cluster is None:
                 import dask
                 import dask.distributed
-<<<<<<< HEAD:morpheus/utils/downloader.py
-                import dask_cuda.utils
-=======
->>>>>>> 5fdbcb91d717e4eabb74ab3f5392861b30c8c4fc:python/morpheus/morpheus/utils/downloader.py
 
                 logger.debug("Creating dask cluster...")
 
                 Downloader._dask_cluster = dask.distributed.LocalCluster(start=True,
                                                                          processes=self.download_method
                                                                          != "dask_thread")
-<<<<<<< HEAD:morpheus/utils/downloader.py
-
-                # n_workers = dask_cuda.utils.get_n_gpus()
-                # threads_per_worker = mp.cpu_count() // n_workers
-
-                # Downloader._dask_cluster = dask_cuda.LocalCUDACluster(n_workers=n_workers,
-                #                                                       threads_per_worker=threads_per_worker)
-=======
->>>>>>> 5fdbcb91d717e4eabb74ab3f5392861b30c8c4fc:python/morpheus/morpheus/utils/downloader.py
 
                 logger.debug("Creating dask cluster... Done. Dashboard: %s", Downloader._dask_cluster.dashboard_link)