Skip to content

Commit

Permalink
MTN handle changes from master->main + remove master process terminology
Browse files Browse the repository at this point in the history
  • Loading branch information
tomMoral committed Apr 9, 2024
1 parent ba1d3da commit f57a721
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions README.rst
Expand Up @@ -4,15 +4,15 @@
: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

.. |ReadTheDocs| image:: https://readthedocs.org/projects/joblib/badge/?version=latest
: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

Expand All @@ -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
==========
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Expand Up @@ -9,10 +9,10 @@ schedules:
displayName: Daily build
branches:
include:
- master
- main

trigger:
- master
- main

jobs:
- job: linting
Expand Down
4 changes: 2 additions & 2 deletions doc/parallel.rst
Expand Up @@ -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
Expand Down Expand Up @@ -418,4 +418,4 @@ does not exist (but multiprocessing has more overhead).

.. autoclass:: joblib.parallel.ParallelBackendBase

.. autoclass:: joblib.parallel.AutoBatchingMixin
.. autoclass:: joblib.parallel.AutoBatchingMixin
2 changes: 1 addition & 1 deletion joblib/externals/loky/process_executor.py
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions joblib/pool.py
Expand Up @@ -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)
Expand Down

0 comments on commit f57a721

Please sign in to comment.