Skip to content

Commit 5906cb4

Browse files
Perch Teamsdenton4
Perch Team
authored and
sdenton4
committed
Various fixes.
PiperOrigin-RevId: 713472731
1 parent 5ce6ac8 commit 5906cb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1234
-861
lines changed

‎.github/workflows/ci_pip.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
pip install requests
3131
pip install tensorflow-cpu
3232
pip install tensorflow-hub
33-
pip install git+https://github.com/google-research/hoplite.git
33+
pip install git+https://github.com/google-research/perch-hoplite.git
3434
- name: Test db with unittest
35-
run: python -m unittest discover -s hoplite/db/tests -p "*test.py"
35+
run: python -m unittest discover -s perch_hoplite/db/tests -p "*test.py"
3636
- name: Test taxonomy with unittest
37-
run: python -m unittest discover -s hoplite/taxonomy -p "*test.py"
37+
run: python -m unittest discover -s perch_hoplite/taxonomy -p "*test.py"
3838
- name: Test zoo with unittest
39-
run: python -m unittest discover -s hoplite/zoo -p "*test.py"
39+
run: python -m unittest discover -s perch_hoplite/zoo -p "*test.py"
4040
- name: Test zoo tensorflow models with unittest
41-
run: python -m unittest discover -s hoplite/zoo/tests_tf -p "*test.py"
41+
run: python -m unittest discover -s perch_hoplite/zoo/tests_tf -p "*test.py"
4242
- name: Test agile with unittest
43-
run: python -m unittest discover -s hoplite/agile/tests -p "*test.py"
43+
run: python -m unittest discover -s perch_hoplite/agile/tests -p "*test.py"

‎.github/workflows/ci_poetry.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
sudo apt-get install libsndfile1 ffmpeg
3232
poetry install
3333
- name: Test db with unittest
34-
run: poetry run python -m unittest discover -s hoplite/db/tests -p "*test.py"
34+
run: poetry run python -m unittest discover -s perch_hoplite/db/tests -p "*test.py"
3535
- name: Test taxonomy with unittest
36-
run: poetry run python -m unittest discover -s hoplite/taxonomy -p "*test.py"
36+
run: poetry run python -m unittest discover -s perch_hoplite/taxonomy -p "*test.py"
3737
- name: Test zoo with unittest
38-
run: poetry run python -m unittest discover -s hoplite/zoo -p "*test.py"
38+
run: poetry run python -m unittest discover -s perch_hoplite/zoo -p "*test.py"
3939
- name: Test zoo tensorflow models with unittest
40-
run: poetry run python -m unittest discover -s hoplite/zoo/tests_tf -p "*test.py"
40+
run: poetry run python -m unittest discover -s perch_hoplite/zoo/tests_tf -p "*test.py"
4141
- name: Test agile with unittest
42-
run: poetry run python -m unittest discover -s hoplite/agile/tests -p "*test.py"
42+
run: poetry run python -m unittest discover -s perch_hoplite/agile/tests -p "*test.py"

‎.github/workflows/ci_poetry_with_jax.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ci_poetry
1+
name: ci_poetry_with_jax
22

33
on:
44
push:
@@ -31,12 +31,12 @@ jobs:
3131
sudo apt-get install libsndfile1 ffmpeg
3232
poetry install --with jax
3333
- name: Test db with unittest
34-
run: poetry run python -m unittest discover -s hoplite/db/tests -p "*test.py"
34+
run: poetry run python -m unittest discover -s perch_hoplite/db/tests -p "*test.py"
3535
- name: Test taxonomy with unittest
36-
run: poetry run python -m unittest discover -s hoplite/taxonomy -p "*test.py"
36+
run: poetry run python -m unittest discover -s perch_hoplite/taxonomy -p "*test.py"
3737
- name: Test zoo with unittest
38-
run: poetry run python -m unittest discover -s hoplite/zoo -p "*test.py"
38+
run: poetry run python -m unittest discover -s perch_hoplite/zoo -p "*test.py"
3939
- name: Test zoo tensorflow models with unittest
40-
run: poetry run python -m unittest discover -s hoplite/zoo/tests_tf -p "*test.py"
40+
run: poetry run python -m unittest discover -s perch_hoplite/zoo/tests_tf -p "*test.py"
4141
- name: Test agile with unittest
42-
run: poetry run python -m unittest discover -s hoplite/agile/tests -p "*test.py"
42+
run: poetry run python -m unittest discover -s perch_hoplite/agile/tests -p "*test.py"

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Perch Hoplite
22

3-
![CI](https://github.com/google-research/hoplite/actions/workflows/ci_pip.yml/badge.svg)
3+
![CI](https://github.com/google-research/perch-hoplite/actions/workflows/ci_pip.yml/badge.svg)
44

55
Hoplite is a system for storing large volumes of embeddings from machine
66
perception models. We focus on combining vector search with active learning
77
workflows, aka [agile modeling](https://arxiv.org/abs/2302.12948).
88

99
While we get this documentation ready, we recommend checking out the main
10-
[Perch repository](https://github.com/google-research/perch).
10+
[Perch repository](https://github.com/google-research/perch), which includes
11+
embedding model training code.
1112

1213
This repository consists of four sub-libraries:
1314

@@ -47,7 +48,7 @@ pip install tensorflow-hub
4748

4849
Then to install with pip:
4950
```bash
50-
pip install git+https://github.com/google-research/hoplite.git
51+
pip install git+https://github.com/google-research/perch-hoplite.git
5152
```
5253

5354
Then run the tests and check that they pass:

‎hoplite/agile/1_embed_audio_v2.ipynb renamed to ‎perch_hoplite/agile/1_embed_audio_v2.ipynb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"import numpy as np\n",
1515
"from etils import epath\n",
1616
"\n",
17-
"from hoplite.agile import colab_utils\n",
18-
"from hoplite.agile import embed\n",
19-
"from hoplite.agile import source_info\n",
20-
"from hoplite.db import interface\n",
21-
"from hoplite.db import brutalism\n",
22-
"from hoplite.db import db_loader\n",
23-
"from hoplite.db import sqlite_usearch_impl\n"
17+
"from perch_hoplite.agile import colab_utils\n",
18+
"from perch_hoplite.agile import embed\n",
19+
"from perch_hoplite.agile import source_info\n",
20+
"from perch_hoplite.db import interface\n",
21+
"from perch_hoplite.db import brutalism\n",
22+
"from perch_hoplite.db import db_loader\n",
23+
"from perch_hoplite.db import sqlite_usearch_impl\n"
2424
]
2525
},
2626
{

‎hoplite/agile/2_agile_modeling_v2.ipynb renamed to ‎perch_hoplite/agile/2_agile_modeling_v2.ipynb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
"from matplotlib import pyplot as plt\n",
1616
"import numpy as np\n",
1717
"\n",
18-
"from hoplite.agile import audio_loader\n",
19-
"from hoplite.agile import classifier\n",
20-
"from hoplite.agile import classifier_data\n",
21-
"from hoplite.agile import embedding_display\n",
22-
"from hoplite.agile import source_info\n",
23-
"from hoplite.db import brutalism\n",
24-
"from hoplite.db import score_functions\n",
25-
"from hoplite.db import search_results\n",
26-
"from hoplite.db import sqlite_usearch_impl\n",
27-
"from hoplite.zoo import model_configs\n"
18+
"from perch_hoplite.agile import audio_loader\n",
19+
"from perch_hoplite.agile import classifier\n",
20+
"from perch_hoplite.agile import classifier_data\n",
21+
"from perch_hoplite.agile import embedding_display\n",
22+
"from perch_hoplite.agile import source_info\n",
23+
"from perch_hoplite.db import brutalism\n",
24+
"from perch_hoplite.db import score_functions\n",
25+
"from perch_hoplite.db import search_results\n",
26+
"from perch_hoplite.db import sqlite_usearch_impl\n",
27+
"from perch_hoplite.zoo import model_configs\n"
2828
]
2929
},
3030
{

‎hoplite/agile/audio_loader.py renamed to ‎perch_hoplite/agile/audio_loader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from typing import Callable
2020

2121
from etils import epath
22-
from hoplite import audio_io
23-
from hoplite.agile import source_info
2422
import numpy as np
23+
from perch_hoplite import audio_io
24+
from perch_hoplite.agile import source_info
2525

2626

2727
def make_filepath_loader(

‎hoplite/agile/classifier.py renamed to ‎perch_hoplite/agile/classifier.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
from typing import Any, Iterator, Sequence
2323

2424
from etils import epath
25-
from hoplite.agile import classifier_data
26-
from hoplite.agile import metrics
27-
from hoplite.db import interface as db_interface
2825
from ml_collections import config_dict
2926
import numpy as np
27+
from perch_hoplite.agile import classifier_data
28+
from perch_hoplite.agile import metrics
29+
from perch_hoplite.db import interface as db_interface
3030
import tensorflow as tf
3131
import tqdm
3232

‎hoplite/agile/classifier_data.py renamed to ‎perch_hoplite/agile/classifier_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import itertools
2020
from typing import Any, Iterator, Sequence
2121

22-
from hoplite.db import interface
2322
import numpy as np
23+
from perch_hoplite.db import interface
2424

2525

2626
@dataclasses.dataclass

‎hoplite/agile/colab_utils.py renamed to ‎perch_hoplite/agile/colab_utils.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import dataclasses
1919

2020
from etils import epath
21-
from hoplite.agile import embed
22-
from hoplite.agile import source_info
23-
from hoplite.db import db_loader
24-
from hoplite.db import sqlite_usearch_impl
25-
from hoplite.zoo import model_configs
2621
from ml_collections import config_dict
22+
from perch_hoplite.agile import embed
23+
from perch_hoplite.agile import source_info
24+
from perch_hoplite.db import db_loader
25+
from perch_hoplite.db import sqlite_usearch_impl
26+
from perch_hoplite.zoo import model_configs
2727

2828

2929
@dataclasses.dataclass

0 commit comments

Comments
 (0)