From f57a72190d0fb6618bd77190c860707b1eb71ec7 Mon Sep 17 00:00:00 2001 From: tommoral Date: Tue, 9 Apr 2024 09:54:25 +0200 Subject: [PATCH] MTN handle changes from master->main + remove master process terminology --- README.rst | 6 +++--- azure-pipelines.yml | 4 ++-- doc/parallel.rst | 4 ++-- joblib/externals/loky/process_executor.py | 2 +- joblib/pool.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 975ae0f9f..5880d6629 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ :target: https://badge.fury.io/py/joblib :alt: Joblib version -.. |Azure| image:: https://dev.azure.com/joblib/joblib/_apis/build/status/joblib.joblib?branchName=master +.. |Azure| image:: https://dev.azure.com/joblib/joblib/_apis/build/status/joblib.joblib?branchName=main :target: https://dev.azure.com/joblib/joblib/_build?definitionId=3&_a=summary&branchFilter=40 :alt: Azure CI status @@ -12,7 +12,7 @@ :target: https://joblib.readthedocs.io/en/latest/?badge=latest :alt: Documentation Status -.. |Codecov| image:: https://codecov.io/gh/joblib/joblib/branch/master/graph/badge.svg +.. |Codecov| image:: https://codecov.io/gh/joblib/joblib/branch/main/graph/badge.svg :target: https://codecov.io/gh/joblib/joblib :alt: Codecov coverage @@ -29,7 +29,7 @@ To get the latest code using git, simply type:: git clone https://github.com/joblib/joblib.git If you don't have git installed, you can download a zip -of the latest code: https://github.com/joblib/joblib/archive/refs/heads/master.zip +of the latest code: https://github.com/joblib/joblib/archive/refs/heads/main.zip Installing ========== diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 936fabd92..8f985a011 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,10 +9,10 @@ schedules: displayName: Daily build branches: include: - - master + - main trigger: -- master +- main jobs: - job: linting diff --git a/doc/parallel.rst b/doc/parallel.rst index d288fad8c..9901fff22 100644 --- a/doc/parallel.rst +++ b/doc/parallel.rst @@ -260,7 +260,7 @@ The backend factory can be any callable that returns an instance of ``ParallelBackendBase``. Please refer to the `default backends source code`_ as a reference if you want to implement your own custom backend. -.. _`default backends source code`: https://github.com/joblib/joblib/blob/master/joblib/_parallel_backends.py +.. _`default backends source code`: https://github.com/joblib/joblib/blob/main/joblib/_parallel_backends.py Note that it is possible to register a backend class that has some mandatory constructor parameters such as the network address and connection credentials @@ -418,4 +418,4 @@ does not exist (but multiprocessing has more overhead). .. autoclass:: joblib.parallel.ParallelBackendBase -.. autoclass:: joblib.parallel.AutoBatchingMixin \ No newline at end of file +.. autoclass:: joblib.parallel.AutoBatchingMixin diff --git a/joblib/externals/loky/process_executor.py b/joblib/externals/loky/process_executor.py index 1e08cc21f..304071957 100644 --- a/joblib/externals/loky/process_executor.py +++ b/joblib/externals/loky/process_executor.py @@ -494,7 +494,7 @@ def _process_worker( # The GC managed to free the memory: everything is fine. continue - # The process is leaking memory: let the master process + # The process is leaking memory: let the main process # know that we need to start a new worker. mp.util.info("Memory leak detected: shutting down worker") result_queue.put(pid) diff --git a/joblib/pool.py b/joblib/pool.py index 72a6baa3a..c0c3549c1 100644 --- a/joblib/pool.py +++ b/joblib/pool.py @@ -265,11 +265,11 @@ class MemmappingPool(PicklingPool): Memmapping mode for numpy arrays passed to workers. See 'max_nbytes' parameter documentation for more details. forward_reducers: dictionary, optional - Reducers used to pickle objects passed from master to worker + Reducers used to pickle objects passed from main process to worker processes: see below. backward_reducers: dictionary, optional Reducers used to pickle return values from workers back to the - master process. + main process. verbose: int, optional Make it possible to monitor how the communication of numpy arrays with the subprocess is handled (pickling or memmapping)