Skip to content

Commit 4e89d5b

Browse files
authoredSep 15, 2021
Update URLs/paths with new repo name (facebookresearch#685)
* Replace facebookresearch/droidlet with facebookresearch/fairo * Update droidlet to fairo for facebookresearch.github.io pages * Update PyRBGT to reflect new name * Try to fix Docker absolute path
1 parent 4212e64 commit 4e89d5b

38 files changed

+108
-108
lines changed
 

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
- run:
162162
name: CraftAssist Python unit tests
163163
command: |
164-
docker run --name mc-tests -v $(pwd):/shared -w /droidlet --entrypoint="/bin/bash" craftassist -c "python3 setup.py develop && /droidlet/.circleci/craftassist_tests.sh"
164+
docker run --name mc-tests -v $(pwd):/shared -w /fairo --entrypoint="/bin/bash" craftassist -c "python3 setup.py develop && /fairo/.circleci/craftassist_tests.sh"
165165
pip3 install codecov
166166
export CODECOV_TOKEN='6cff57e1-08ce-4d98-8f28-63797d90107f'
167167
codecov -n "craftassist tests"|| echo "Codecov did not collect coverage reports"

‎.circleci/habitat_docker/locobot_assistant.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ RUN conda create -n droidlet_env python=3.7 \
4040
conda init bash && \
4141
source ~/.bashrc && \
4242
source activate /root/miniconda3/envs/droidlet_env && \
43-
curl https://raw.githubusercontent.com/facebookresearch/droidlet/main/requirements.txt -o requirements_1.txt && \
44-
curl https://raw.githubusercontent.com/facebookresearch/droidlet/main/locobot/requirements.txt -o requirements_2.txt && \
43+
curl https://raw.githubusercontent.com/facebookresearch/fairo/main/requirements.txt -o requirements_1.txt && \
44+
curl https://raw.githubusercontent.com/facebookresearch/fairo/main/locobot/requirements.txt -o requirements_2.txt && \
4545
echo -en '\n' >> requirements_1.txt && \
4646
tail --lines=+2 requirements_2.txt >> requirements_1.txt && \
4747
pip install -r requirements_1.txt

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You want to do one of three things:
3333
<td colspan="3" align="left">
3434
1. Clone the source code
3535
<sub><pre lang="bash">
36-
git clone --recursive https://github.com/facebookresearch/droidlet.git
36+
git clone --recursive https://github.com/facebookresearch/fairo.git
3737
cd droidlet
3838
</pre></sub>
3939
</td>
@@ -83,32 +83,32 @@ pip install -r requirements.txt
8383
</pre></sub></td>
8484
</tr>
8585
<tr valign="top">
86-
<td> 4. <a href="https://github.com/facebookresearch/droidlet/blob/main/agents/locobot/README.md"> Instructions for running the Locobot agent</a>
86+
<td> 4. <a href="https://github.com/facebookresearch/fairo/blob/main/agents/locobot/README.md"> Instructions for running the Locobot agent</a>
8787
</td>
8888
<td>
89-
<a href='https://github.com/facebookresearch/droidlet/blob/main/agents/craftassist/README.md'> Instructions for running the Craftassist agent</a>
89+
<a href='https://github.com/facebookresearch/fairo/blob/main/agents/craftassist/README.md'> Instructions for running the Craftassist agent</a>
9090
</td>
9191
<td>
9292
<br/>
9393
</td>
9494
</tr>
9595
<tr valign="top">
96-
<td colspan=3> 5. <a href="https://github.com/facebookresearch/droidlet/blob/main/tutorials"> Tutorials, runnable in Google Colab (more coming soon).</a><p> The tutorials introduce the `base_agent` architecture and take you through the 4 components of an Agent</p>
96+
<td colspan=3> 5. <a href="https://github.com/facebookresearch/fairo/blob/main/tutorials"> Tutorials, runnable in Google Colab (more coming soon).</a><p> The tutorials introduce the `base_agent` architecture and take you through the 4 components of an Agent</p>
9797
</td>
9898
</tr>
9999
<tr valign="top" align="center">
100-
<td colspan=3> 6. <a href="https://facebookresearch.github.io/droidlet/"> API Documentation</a>
100+
<td colspan=3> 6. <a href="https://facebookresearch.github.io/fairo/"> API Documentation</a>
101101
</td>
102102
</tr>
103103
<tr valign="top" align="center">
104104
<td colspan=3> 7. Agent-specific API Documentation</a>
105105
</td>
106106
</tr>
107107
<tr valign="top">
108-
<td align="center"><br/><a href="https://facebookresearch.github.io/droidlet/droidlet_agents.html#locobot"> Locobot agent API</a>
108+
<td align="center"><br/><a href="https://facebookresearch.github.io/fairo/droidlet_agents.html#locobot"> Locobot agent API</a>
109109
</td>
110110
<td align="center">
111-
<br/><a href="https://facebookresearch.github.io/droidlet/droidlet_agents.html#craftassist"> CraftAssist agent API</a>
111+
<br/><a href="https://facebookresearch.github.io/fairo/droidlet_agents.html#craftassist"> CraftAssist agent API</a>
112112
</td>
113113
<td align="center">
114114
<br/>

‎agents/locobot/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ docker pull theh1ghwayman/locobot-assistant:8.0
3333
</pre></sub></td>
3434
</tr>
3535
<tr valign="top">
36-
<td> 2. Launch Pyro4 <p> Copy the <a href="https://github.com/facebookresearch/droidlet/tree/main/droidlet/lowlevel/locobot/remote"> remote<a/> folder onto the Locobot and then do the following: </p>
36+
<td> 2. Launch Pyro4 <p> Copy the <a href="https://github.com/facebookresearch/fairo/tree/main/droidlet/lowlevel/locobot/remote"> remote<a/> folder onto the Locobot and then do the following: </p>
3737
<sub><pre lang="bash">
3838
cd remote
3939
chmod +x launch_pyro.sh

‎agents/locobot/coordinates.MD

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ We translate between two separate coordinate systems. The locobot co-ordinate ax
77
The conventions for yaw and pitch are the same across both - `yaw` is assumed to be in the range `[-pi, pi]`, and increasing `yaw` moves *counterclockwise*. `pitch` is assumed to be in the range `[-pi/2, pi/2]`. `pi/2` is down, `-pi/2` is up.
88

99
This means we do the following transformations -
10-
* the point cloud `(x_l, y_l, z_l)` is saved in locobot world coords, but [retrieved in droidlet world coords](https://github.com/facebookresearch/droidlet/blob/main/locobot/agent/perception/handlers/core.py#L91).
10+
* the point cloud `(x_l, y_l, z_l)` is saved in locobot world coords, but [retrieved in droidlet world coords](https://github.com/facebookresearch/fairo/blob/main/locobot/agent/perception/handlers/core.py#L91).
1111
`(x_d = -y_l, y_d = z_l, z_d = x_l)`
12-
* the state of the base of the robot `(x_l, y_l, yaw_l)` is fetched in locobot world coords from the robot and [transformed to droidlet world coords](https://github.com/facebookresearch/droidlet/blob/main/locobot/agent/locobot_mover.py#L282).
12+
* the state of the base of the robot `(x_l, y_l, yaw_l)` is fetched in locobot world coords from the robot and [transformed to droidlet world coords](https://github.com/facebookresearch/fairo/blob/main/locobot/agent/locobot_mover.py#L282).
1313
`(x_d = -y_l, y_d = z_l, yaw_d = yaw_l)`

‎docs/push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rm -rf docpush
2-
git clone --depth=1 git@github.com:facebookresearch/droidlet.git -b gh-pages docpush
2+
git clone --depth=1 git@github.com:facebookresearch/fairo.git -b gh-pages docpush
33

44
cp -r build/html/* docpush/
55

‎docs/source/controller.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
In the "abstract" droidlet agent, the controller chooses whether to put Tasks on the Task Stack based on the memory state. In the locobot agent and the craftassist agent subclasses, it consists of
77

8-
* a [DSL](https://github.com/facebookresearch/droidlet/blob/main/droidlet/documents/Action_Dictionary_Spec.md)
8+
* a [DSL](https://github.com/facebookresearch/fairo/blob/main/droidlet/documents/Action_Dictionary_Spec.md)
99
* a neural semantic parser, which translates natural language into partially specified programs over the DSL
1010
* a Dialogue Manager, Dialogue Stack, and Dialogue objects.
1111
* the Intepreter, a special Dialogue Object that takes partially specified programs from the DSL and fully specifies them using the Memory
@@ -14,7 +14,7 @@ In the "abstract" droidlet agent, the controller chooses whether to put Tasks on
1414
Dialogue Objects behave similarly to :ref:`tasks_label` , except they only affect the agent's environment directly by causing the agent to issue utterances (or indirectly by pushing Task Objects onto the Task Stack). In particular, each Dialogue Object has a .step() that is run when it is the highest priority object on the Stack. Dialogue Objects, like Task Objects are modular: a learned model or a heuristic can mediate the Dialogue Object, and the same model or heuristic script can be used across many different agents.
1515
```
1616

17-
The Dialogue Manager puts Dialogue Objects on the Dialogue Stack, either on its own, or at the request of a Dialogue Object. In the locobot and craftassist agent, the manager is powered by a [neural semantic parser](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dialog/ttad/).
17+
The Dialogue Manager puts Dialogue Objects on the Dialogue Stack, either on its own, or at the request of a Dialogue Object. In the locobot and craftassist agent, the manager is powered by a [neural semantic parser](https://github.com/facebookresearch/fairo/blob/main/droidlet/dialog/ttad/).
1818

1919
A sketch of the controller's operation is then
2020
```
@@ -43,7 +43,7 @@ The Dialogue Manager operates the Stack, and chooses whether to place Dialogue o
4343
:members: step
4444
```
4545
### Semantic Parser ###
46-
The training of the semantic parsing model we use is described in detail [here](https://github.com/facebookresearch/droidlet/tree/main/droidlet/dialog/ttad/); the interface is
46+
The training of the semantic parsing model we use is described in detail [here](https://github.com/facebookresearch/fairo/tree/main/droidlet/dialog/ttad/); the interface is
4747
```eval_rst
4848
.. autoclass:: droidlet.dialog.ttad.ttad_transformer_model.query_model.TTADBertModel
4949
:members: parse
@@ -69,7 +69,7 @@ Some others:
6969

7070

7171
### Interpreter ###
72-
The [Interpreter](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dialog/dialogue_objects/intepreter.py) is responsible for using the world state \(via [memory](memory.md)\) and a natural language utterance that has been parsed into a logical form over the agent's DSL from the semantic parser to choose a [Task](memory.md) to put on the Task Stack. The [locobot](https://github.com/fairinternal/minecraft/blob/master/locobot/agent/dialogue_objects/loco_intepreter.py) and [craftassist](https://github.com/fairinternal/minecraft/blob/master/craftassist/agent/dialogue_objects/mc_intepreter.py) Interpreters are not the same, but the bulk of the work is done by the shared subinterpreters (in the files \*\_helper.py) [here](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dialog/dialogue_objects/). The subinterpreters, registered in the main Interpreter [here](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dialog/dialogue_objects/intepreter.py#L55) \(and for the specialized versions [here](https://github.com/fairinternal/minecraft/blob/master/locobot/agent/dialogue_objects/loco_intepreter.py#L56) and [here](https://github.com/fairinternal/minecraft/blob/master/craftassist/agent/dialogue_objects/mc_intepreter.py#L61)\), roughly follow the structure of the DSL. This arrangement is to allow replacing the (currently heuristic) subinterpreters with learned versions or specializing them to new agents.
72+
The [Interpreter](https://github.com/facebookresearch/fairo/blob/main/droidlet/dialog/dialogue_objects/intepreter.py) is responsible for using the world state \(via [memory](memory.md)\) and a natural language utterance that has been parsed into a logical form over the agent's DSL from the semantic parser to choose a [Task](memory.md) to put on the Task Stack. The [locobot](https://github.com/fairinternal/minecraft/blob/master/locobot/agent/dialogue_objects/loco_intepreter.py) and [craftassist](https://github.com/fairinternal/minecraft/blob/master/craftassist/agent/dialogue_objects/mc_intepreter.py) Interpreters are not the same, but the bulk of the work is done by the shared subinterpreters (in the files \*\_helper.py) [here](https://github.com/facebookresearch/fairo/blob/main/droidlet/dialog/dialogue_objects/). The subinterpreters, registered in the main Interpreter [here](https://github.com/facebookresearch/fairo/blob/main/droidlet/dialog/dialogue_objects/intepreter.py#L55) \(and for the specialized versions [here](https://github.com/fairinternal/minecraft/blob/master/locobot/agent/dialogue_objects/loco_intepreter.py#L56) and [here](https://github.com/fairinternal/minecraft/blob/master/craftassist/agent/dialogue_objects/mc_intepreter.py#L61)\), roughly follow the structure of the DSL. This arrangement is to allow replacing the (currently heuristic) subinterpreters with learned versions or specializing them to new agents.
7373

7474
```eval_rst
7575
.. autoclass:: droidlet.dialog.dialogue_objects.interpreter.Interpreter

‎docs/source/droidlet_agents.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.. _droidlet_agents:
33
```
44
# Agents
5-
We instantiate a droidlet [agent](https://github.com/facebookresearch/droidlet/tree/agent_docs/locobot/agent) on a [Locobot](http://www.locobot.org/) and an [agent](https://github.com/facebookresearch/droidlet/tree/agent_docs/craftassist/agent) in Minecraft using the [Craftassist](https://arxiv.org/abs/1907.08584) framework (the droidlet project evolved from Craftassist).
5+
We instantiate a droidlet [agent](https://github.com/facebookresearch/fairo/tree/agent_docs/locobot/agent) on a [Locobot](http://www.locobot.org/) and an [agent](https://github.com/facebookresearch/fairo/tree/agent_docs/craftassist/agent) in Minecraft using the [Craftassist](https://arxiv.org/abs/1907.08584) framework (the droidlet project evolved from Craftassist).
66

77
## Locobot ##
88

@@ -75,7 +75,7 @@ Additionally, on the server-side, we have a `LoCoBotMover` class that communicat
7575
```
7676

7777
## Craftassist ##
78-
Details for setting up and running the Cuberite server and Craftassist agent are [here](https://github.com/facebookresearch/droidlet/tree/agent_docs/craftassist/)
78+
Details for setting up and running the Cuberite server and Craftassist agent are [here](https://github.com/facebookresearch/fairo/tree/agent_docs/craftassist/)
7979

8080
### Craftassist Perception ###
8181

@@ -88,7 +88,7 @@ The craftassist perception modules are mostly heuristic.
8888
:members: perceive
8989
```
9090

91-
However, there are voxel models for semantic segmentation, one is [here](https://github.com/facebookresearch/droidlet/tree/agent_docs/craftassist/agent/voxel_models/detection-transformer). Its interface is:
91+
However, there are voxel models for semantic segmentation, one is [here](https://github.com/facebookresearch/fairo/tree/agent_docs/craftassist/agent/voxel_models/detection-transformer). Its interface is:
9292
```eval_rst
9393
.. autoclass:: craftassist.agent.voxel_models.subcomponent_classifier.SubcomponentClassifierWrapper
9494
:members: perceive

‎droidlet/dashboard/web/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ This section has moved here: https://facebook.github.io/create-react-app/docs/tr
127127

128128
### New React component
129129
If you want to add a new React component to the project:
130-
1. Add the corresponding React component `js` and `css` files to the [components folder under `src`](https://github.com/facebookresearch/droidlet/tree/main/droidlet/dashboard/web/src/components).
131-
2. Add your component to [index.js](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dashboard/web/src/index.js) to render it in the layout. If you want to add another stacked column check how `Memory 2D` component is added in the layout to be rendered on top right (or `Navigator` on bottom right). The ordering of components in `index.js` is consistent with how these are rendered in the frontend.
132-
3. Manage and set the state of your component [in `StateManager`](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dashboard/web/src/StateManager.js).
130+
1. Add the corresponding React component `js` and `css` files to the [components folder under `src`](https://github.com/facebookresearch/fairo/tree/main/droidlet/dashboard/web/src/components).
131+
2. Add your component to [index.js](https://github.com/facebookresearch/fairo/blob/main/droidlet/dashboard/web/src/index.js) to render it in the layout. If you want to add another stacked column check how `Memory 2D` component is added in the layout to be rendered on top right (or `Navigator` on bottom right). The ordering of components in `index.js` is consistent with how these are rendered in the frontend.
132+
3. Manage and set the state of your component [in `StateManager`](https://github.com/facebookresearch/fairo/blob/main/droidlet/dashboard/web/src/StateManager.js).
133133
- An example snippet of how to receive and process information from backend on this component :
134134
1. First define the method in `StateManager` :
135135
```
@@ -146,8 +146,8 @@ If you want to add a new React component to the project:
146146
socket.on("setComponentState", this.setComponent);
147147
```
148148
Your method will now be called when the backend sends the socket event : `"setComponentState"`.
149-
- An example of how to send information from this component to backend is [here](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dashboard/web/src/components/QuerySemanticParser.js#L29). The individual components should always send socket events via the `StateManager`.
150-
4. Add new dependencies introduced by your component to [package.json](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dashboard/web/package.json) and [yarn.lock](https://github.com/facebookresearch/droidlet/blob/main/droidlet/dashboard/web/yarn.lock) using `yarn add [package name]`.
149+
- An example of how to send information from this component to backend is [here](https://github.com/facebookresearch/fairo/blob/main/droidlet/dashboard/web/src/components/QuerySemanticParser.js#L29). The individual components should always send socket events via the `StateManager`.
150+
4. Add new dependencies introduced by your component to [package.json](https://github.com/facebookresearch/fairo/blob/main/droidlet/dashboard/web/package.json) and [yarn.lock](https://github.com/facebookresearch/fairo/blob/main/droidlet/dashboard/web/yarn.lock) using `yarn add [package name]`.
151151
152152
### Frontend changes
153153

‎droidlet/lowlevel/locobot/locobot_mover_utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def get_move_target_for_point(base_pos, target, eps=1):
9191

9292

9393
"""
94-
Co-ordinate transform utils. Read more at https://github.com/facebookresearch/droidlet/blob/main/locobot/coordinates.MD
94+
Co-ordinate transform utils. Read more at https://github.com/facebookresearch/fairo/blob/main/locobot/coordinates.MD
9595
"""
9696

9797
pyrobot_to_canonical_frame = np.array([[0.0, 0.0, 1.0], [-1.0, 0.0, 0.0], [0.0, 1.0, 0.0]])

‎droidlet/lowlevel/locobot/tests/test_utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_assert_turn_degree(self):
5252

5353
class LocoboMoverUtilsTest(unittest.TestCase):
5454
"""
55-
Coordinate transform related tests https://github.com/facebookresearch/droidlet/blob/main/locobot/coordinates.MD
55+
Coordinate transform related tests https://github.com/facebookresearch/fairo/blob/main/locobot/coordinates.MD
5656
"""
5757

5858
def test_pyrobot_to_canonical_to_pyrobot(self):

‎droidlet/lowlevel/minecraft/craftassist_specs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Not found: "
1212
+ PATH
1313
+ "\n\nDid you follow the instructions at "
14-
+ "https://github.com/facebookresearch/droidlet#getting-started"
14+
+ "https://github.com/facebookresearch/fairo#getting-started"
1515
)
1616

1717

‎droidlet/perception/robot/tests/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def get_rand_pixel(rgb_d):
7272
h = rgb_d.rgb.shape[0]
7373
w = rgb_d.rgb.shape[1]
7474
# return in (w,h) format, since that is the currently followed convention for points
75-
# See https://github.com/facebookresearch/droidlet/issues/358
75+
# See https://github.com/facebookresearch/fairo/issues/358
7676
return [np.random.randint(0, w), np.random.randint(0, h)]
7777

7878

‎droidlet/tools/crowdsourcing/servermgr/run.withagent.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ S3_DEST=s3://craftassist/turk_interactions_with_agent
55

66
function background_agent() (
77
echo "Running craftassist agent"
8-
python3 /droidlet/droidlet/lowlevel/minecraft/craftassist_cuberite_utils/wait_for_cuberite.py --host localhost --port 25565
9-
python3 /droidlet/agents/craftassist/craftassist_agent.py --no_default_behavior --agent_debug_mode --log_level debug --dev 1>agent.log 2>agent.log
8+
python3 /fairo/droidlet/lowlevel/minecraft/craftassist_cuberite_utils/wait_for_cuberite.py --host localhost --port 25565
9+
python3 /fairo/agents/craftassist/craftassist_agent.py --no_default_behavior --agent_debug_mode --log_level debug --dev 1>agent.log 2>agent.log
1010
)
1111

1212
echo "Installing Droidlet as a module"
1313

14-
cd /droidlet && python3 setup.py develop && cd /
14+
cd /fairo && python3 setup.py develop && cd /
1515

16-
python3 /droidlet/droidlet/lowlevel/minecraft/cuberite_process.py \
16+
python3 /fairo/droidlet/lowlevel/minecraft/cuberite_process.py \
1717
--mode creative \
1818
--workdir . \
1919
--config flat_world \

0 commit comments

Comments
 (0)
Please sign in to comment.