Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dev Containers Docs #39

Merged
merged 38 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c97caed
Merge pull request #33 from FR-DC/frml-82
Eve-ning Dec 19, 2023
f7ad610
Move common functions to utils
Eve-ning Dec 20, 2023
01b9849
Suppress gcs environ warning
Eve-ning Dec 20, 2023
643a98d
Fix missing label-studio-sdk
Eve-ning Dec 20, 2023
dd8a18d
Set default LABEL_STUDIO_API_KEY
Eve-ning Dec 20, 2023
e16480b
Fix bad typing version
Eve-ning Dec 20, 2023
69e99a9
Merge pull request #34 from FR-DC/FRML-83
Eve-ning Dec 20, 2023
6a85fa7
Unignore shell files, add cml entrypoint
Eve-ning Dec 20, 2023
8e71ad1
Update model-tests.yml
Eve-ning Dec 20, 2023
68effdb
Update model-tests.yml
Eve-ning Dec 20, 2023
046e140
Attempt to fix tests not found
Eve-ning Dec 20, 2023
79c3a99
Attempt to connect to label studio in cml
Eve-ning Dec 20, 2023
4bb29e3
Remove network line
Eve-ning Dec 20, 2023
6084fbb
Update docker-compose.yml
Eve-ning Dec 20, 2023
9a7f408
Force owner
Eve-ning Dec 20, 2023
2ebc298
don't mount rsc
Eve-ning Dec 20, 2023
4b13ce7
Attempt to get label-studio via docker host
Eve-ning Dec 20, 2023
ede2a5c
Update conf and compose
Eve-ning Dec 20, 2023
2d1efdd
Fix incorrect git config
Eve-ning Dec 20, 2023
b55afdd
Add a check for Label Studio server up
Eve-ning Dec 20, 2023
2de41eb
Improve formatting for report
Eve-ning Dec 20, 2023
a4f00c2
Fix issue with env substitution
Eve-ning Dec 20, 2023
bf92c2c
Remove unused evaluate script
Eve-ning Dec 26, 2023
77ba78a
Make GCS error clearer
Eve-ning Dec 26, 2023
5c4a36c
Fix missing default on exception
Eve-ning Dec 26, 2023
d46f4e3
Add dev container spec
Eve-ning Dec 26, 2023
c2ba141
Delete rsc.dvc
Eve-ning Dec 26, 2023
60e5c2a
Merge branch '0.0.8' into FRML-93
Eve-ning Dec 26, 2023
276fa17
Get api key from host
Eve-ning Dec 26, 2023
70b275e
Add missing lightning dep
Eve-ning Dec 26, 2023
a1d79c1
Add uncommentable local W&B setup
Eve-ning Dec 26, 2023
5d457ab
Update getting started docs for dev container
Eve-ning Dec 26, 2023
3ad231b
Update README.md
Eve-ning Dec 26, 2023
3eb0b40
Update devcontainer.json
Eve-ning Dec 26, 2023
d021af7
Attempt to fix codespace problem
Eve-ning Dec 26, 2023
2636cf1
Update Dockerfile
Eve-ning Dec 26, 2023
bac614a
Force Dockerfile to LF
Eve-ning Dec 27, 2023
399fc54
Force Dockerfile to LF
Eve-ning Dec 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Attempt to connect to label studio in cml
  • Loading branch information
Eve-ning committed Dec 20, 2023
commit 79c3a99118b625b22a7ab39fd4e54ef946cb3f5e
7 changes: 5 additions & 2 deletions .github/workflows/model-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ on:

jobs:
build:

runs-on: self-hosted
container:
image: docker://ghcr.io/iterative/cml:0-dvc2-base1-gpu
volumes:
# This mounts and persists the venv between runs
- /home/runner/work/frdc-ml/_github_home:/root
# This mounts the resources folder
- /home/runner/work/frdc-ml/_github_home/rsc:/__w/FRDC-ML/FRDC-ML/rsc
env:
# This is where setup-python will install and cache the venv
AGENT_TOOLSDIRECTORY: "/root/venv"
options: --gpus all

options: --gpus all --network label-studio
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -74,6 +76,7 @@ jobs:
- name: Run Model Training
working-directory: ${{ github.workspace }}/tests
run: |
git config --global --add safe.directory /__w/FRDC-ML/FRDC-ML'
python3 -m model_tests.chestnut_dec_may.train

- name: Comment results via CML
Expand Down
2 changes: 1 addition & 1 deletion src/frdc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
GCS_PROJECT_ID = "frmodel"
GCS_BUCKET_NAME = "frdc-ds"
GCS_CREDENTIALS = None
LABEL_STUDIO_URL = "http://localhost:8080"
LABEL_STUDIO_URL = "http://label-studio:8080"

if not (LABEL_STUDIO_API_KEY := os.environ.get("LABEL_STUDIO_API_KEY", None)):
logger.warning("LABEL_STUDIO_API_KEY not set")
Expand Down
Loading