Skip to content

Commit 3d58045

Browse files
change remaining instances of 'master' to 'main' (#261)
* change remaining instances of 'master' to 'main' * update a few URLs to https, fix a few spelling errors * more doc fixes
1 parent 78b3eca commit 3d58045

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

.github/workflows/charm4py.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Charm4py
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
schedule:
99
- cron: "5 0 * * *" # Runs at 00:05 UTC every day.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Charm4py
66
.. image:: https://github.com/charmplusplus/charm4py/actions/workflows/charm4py.yml/badge.svg?event=push
77
:target: https://github.com/charmplusplus/charm4py/actions/workflows/charm4py.yml
88

9-
.. image:: http://readthedocs.org/projects/charm4py/badge/?version=latest
9+
.. image:: https://readthedocs.org/projects/charm4py/badge/?version=latest
1010
:target: https://charm4py.readthedocs.io/
1111

1212
.. image:: https://img.shields.io/pypi/v/charm4py.svg

docs/charm-api.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Start and exit
5858

5959
.. note::
6060
Calling Python's ``exit()`` function from a chare has the same effect (Charm4py
61-
intercepts the SystemExit exception and calls ``charm.exit()``.
61+
intercepts the SystemExit exception and calls ``charm.exit()``).
6262

6363
* **charm.abort(message)**:
6464

@@ -155,7 +155,7 @@ completion (see :ref:`Proxies <proxy-api-label>`).
155155
called from coroutines.
156156

157157
.. warning::
158-
Do not suspend the coroutine until ``iawait`` has finished yielding
158+
Do not suspend the coroutine until ``iwait`` has finished yielding
159159
all the objects.
160160

161161
* **charm.startQD(callback)**

docs/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Examples
33
========
44

55
There are several examples in the source code repository, with documentation
6-
and comments: https://github.com/charmplusplus/charm4py/tree/master/examples
6+
and comments: https://github.com/charmplusplus/charm4py/tree/main/examples
77

88
These include:
99

docs/features.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Features
1212
This contributes to better resource utilization and overlap of computation and communication.
1313

1414
- **Concurrency**: multiple concurrency features are seamlessly integrated into the actor model,
15-
including couroutines, channels and futures, that facilitate writing in direct or
15+
including coroutines, channels and futures, that facilitate writing in direct or
1616
sequential style.
1717
See the :doc:`introduction` for a quick overview.
1818

@@ -41,4 +41,4 @@ Features
4141

4242

4343

44-
.. _Charm++: http://charmplusplus.org/
44+
.. _Charm++: https://charmplusplus.org/

docs/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ that run on a wide range of devices: from small multi-core devices up
1111
to the largest supercomputers.
1212

1313

14-
.. _Charm++: http://charmplusplus.org/
14+
.. _Charm++: https://charmplusplus.org/
1515

16-
.. _NAMD: http://www.ks.uiuc.edu/Research/namd/
16+
.. _NAMD: https://www.ks.uiuc.edu/Research/namd/
1717

1818

1919

docs/install.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ following Python implementations:
1212
CPython (most common implementation) and PyPy_.
1313

1414

15-
.. _PyPy: http://pypy.org
15+
.. _PyPy: https://pypy.org
1616

1717

1818
Installing Charm4Py on a laptop/personal machine
@@ -41,13 +41,13 @@ into that folder::
4141

4242
Once this is done, there are two ways to build Charm4py. The first way is to change back up
4343
into the Charm4Py directory and run the install script::
44-
44+
4545
$ cd ..
4646
$ python3 setup.py install
4747

4848
The other option is to manually build Charm++ before building Charm4py. To do this, change to
4949
the charm directory and run the following build command::
50-
50+
5151
$ cd charm
5252
$ ./build charm4py netlrts-<os>-<architecture> -j<N> --with-production
5353

@@ -61,7 +61,7 @@ Then, return to the charm4py directory and run setup.py::
6161
$ python3 setup.py install
6262

6363

64-
After building, you can run Charm4py examples. One example you can try is
64+
After building, you can run Charm4py examples. One example you can try is
6565
array_hello.py, which can be run as follows::
6666

6767
$ cd examples/hello

docs/perf-tips.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ the scope of this section.
7575

7676
- Charm4py can access the Charm++ shared library using three different technologies:
7777
ctypes, cffi and cython. If you are using CPython (the most common
78-
implemention of Python), make sure you are using the Cython layer (this is
78+
implementation of Python), make sure you are using the Cython layer (this is
7979
what the pip version of Charm4py uses). If you are using PyPy,
8080
make sure you are using the CFFI layer. Charm4py will warn at startup if you
8181
are not using the most efficient layer.
8282

8383

8484

8585

86-
.. _numpy: http://www.numpy.org/
86+
.. _numpy: https://www.numpy.org/
8787

88-
.. _Numba: http://numba.pydata.org/
88+
.. _Numba: https://numba.pydata.org/
8989

9090
.. _Cython: https://cython.org/
9191

92-
.. _PyPy: http://pypy.org/
92+
.. _PyPy: https://pypy.org/

0 commit comments

Comments
 (0)