Skip to content

Commit

Permalink
Master is main (i-pi#352)
Browse files Browse the repository at this point in the history
* Rename branch in workflows
* Continuing the decolonization of i-PI!!
* s/master/main where relevant
* small thing in the documentation
* Deleted file that was added in some previous commit and should not have been.
* Fixing small glitches in the docs (adding sections that were ommited)

---------

Co-authored-by: Mariana Rossi 2 <[email protected]>
  • Loading branch information
ceriottm and mahrossi authored Jun 17, 2024
1 parent 4656c96 commit b9f131e
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 9,842 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Documentation

on:
push:
branches: [master]
branches: [main]
tags: ["*"]
pull_request:
# Check all PR
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pytest for examples

on:
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
9,828 changes: 0 additions & 9,828 deletions doc/latex/manual.xml

This file was deleted.

1 change: 1 addition & 0 deletions docs/scripts/help.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"bias": forces.InputForces(),
"dynamics": motion.dynamics.InputDynamics(),
"constrained_dynamics": motion.constrained_dynamics.InputConstrainedDynamics(),
"driven_dynamics": motion.driven_dynamics.InputDrivenDynamics(),
"csolver": motion.constrained_dynamics.InputConstraintSolver(),
"constraint": motion.constrained_dynamics.InputConstraint(),
"t_ramp": motion.ramp.InputTemperatureRamp(),
Expand Down
2 changes: 1 addition & 1 deletion docs/src/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ What we expect from a contribution

To start contributing, note the following general guidelines:

* Your contribution should be based on the master branch of the repository
* Your contribution should be based on the main branch of the repository

* We expect you to fork the repository and make all the changes in your fork

Expand Down
2 changes: 1 addition & 1 deletion docs/src/distributed.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Obviously, most electronic-structure client codes provide a further
level of parallelisation, based on OpenMP and/or MPI. This is fully
compatible with i-PI, as it does not matter how the client does the
calculation since only the forces, potential and virial are sent to the
server, and the communication is typically performed by the master
server, and the communication is typically performed by the main
process of the client.

Sockets
Expand Down
2 changes: 1 addition & 1 deletion docs/src/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ which may lead to a significant overhead in case of electronic structure calcula
We recommend using the socket connection from the client code to ASE and then from ASE to i-PI, when possible. An example of a "double-socket" setup
can be found in:

``https://github.com/i-pi/i-pi/tree/master/examples/clients/ase_client``
``https://github.com/i-pi/i-pi/tree/main/examples/clients/ase_client``

How to run i-PI on a cluster?
-----------------------------
Expand Down
6 changes: 4 additions & 2 deletions docs/src/onlinereso.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.. _librarywebsites:

On-line resources
=================

Expand Down Expand Up @@ -51,6 +52,7 @@ at `www.fftw.org <www.fftw.org>`__,
`www.netlib.org/lapack <www.netlib.org/lapack>`__ respectively.

These codes do not come as part of the i-PI package, and must be
downloaded separately. See chapter :ref:`clientinstall` for more
details of how to do this.
downloaded separately.

.. See chapter :ref:`clientinstall` for more details of how to do this.
4 changes: 2 additions & 2 deletions ipi/engine/forces.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,9 +1060,9 @@ def transfer_forces(self, refforce):

# this is VERY subtle. beads in this force component are
# obtained as a contraction, and so are computed automatically.
# when we set the master q, these get marked as tainted.
# when we set the main q, these get marked as tainted.
# then we copy the force value, and set the force as untainted.
# next time we touch the master q, the tainting does not get
# next time we touch the main q, the tainting does not get
# propagated, because the contracted q is already marked as tainted,
# so the force does not get updated. we can fix this by copying
# the value of the contracted bead, so that it's marked as NOT
Expand Down
2 changes: 1 addition & 1 deletion ipi/engine/motion/dynamics.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(

super(Dynamics, self).__init__(fixcom=fixcom, fixatoms=fixatoms)

# initialize time step. this is the master time step that covers a full time step
# initialize time step. this is the main time step that covers a full time step
self._dt = depend_value(name="dt", value=timestep)

if thermostat is None:
Expand Down
6 changes: 3 additions & 3 deletions ipi/engine/thermostats.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def bind(
)

# must pipe all the dependencies in such a way that values for the nm thermostats
# are automatically updated based on the "master" thermostat
# are automatically updated based on the "main" thermostat
def make_taugetter(k):
return lambda: self.tauk[k - 1]

Expand Down Expand Up @@ -883,7 +883,7 @@ def bind(self, beads=None, atoms=None, pm=None, nm=None, prng=None, fixdof=None)
]

# must pipe all the dependencies in such a way that values for the nm
# thermostats are automatically updated based on the "master" thermostat
# thermostats are automatically updated based on the "main" thermostat
def make_Agetter(k):
return lambda: self.A[k]

Expand All @@ -901,7 +901,7 @@ def make_Cgetter(k):
dpipe(self._temp, t._temp)
dpipe(self._dt, t._dt)

# here we pipe the A and C of individual NM to the "master" arrays
# here we pipe the A and C of individual NM to the "main" arrays
t._A.add_dependency(self._A)
t._A._func = make_Agetter(it)
t._C.add_dependency(self._C)
Expand Down
2 changes: 1 addition & 1 deletion ipi/inputs/motion/planetary.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class InputPlanetary(InputDictionary):
{
"dtype": int,
"default": -1,
"help": "Number of beads for centroid-constrained dynamics (default same as master trajectory)",
"help": "Number of beads for centroid-constrained dynamics (default same as main trajectory)",
},
),
"screen": (
Expand Down

0 comments on commit b9f131e

Please sign in to comment.