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.

Sign up for GitHub

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

Jump to bottom

Update from dev #85

Merged
merged 2 commits into from
Aug 30, 2024
Merged

Update from dev #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99a2ff6
refactor(renaming): Rename `.environement` to `.env`
KarhouTam Aug 30, 2024
e62d620
docs(config): Erase some comments
KarhouTam Aug 30, 2024
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
2 changes: 1 addition & 1 deletion .environment/Dockerfile → .env/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt update && \

WORKDIR /root

COPY .environment/requirements.txt /tmp
COPY .env/requirements.txt /tmp

RUN pip install --upgrade pip && \
pip install -r /tmp/requirements.txt
Expand Down
0 .environment/poetry.lock → .env/poetry.lock
View file
Open in desktop
File renamed without changes.
0 .environment/pyproject.toml → .env/pyproject.toml
View file
Open in desktop
File renamed without changes.
0 .environment/requirements.txt → .env/requirements.txt
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker Image Publish
on:
push:
paths:
- ".environment/**"
- ".env/**"
- ".github/workflows/docker-publish.yml"

env:
Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: .environment/Dockerfile
file: .env/Dockerfile
push: false
tags: |
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_LOWERCASE_OWNER }}/${{ env.IMAGE_LOWERCASE_NAME }}:${{ env.IMAGE_TAG }}
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: .environment/Dockerfile
file: .env/Dockerfile
push: true
tags: |
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_LOWERCASE_OWNER }}/${{ env.IMAGE_LOWERCASE_NAME }}:${{ env.IMAGE_TAG }}
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: .environment/Dockerfile
file: .env/Dockerfile
push: true
tags: |
${{ env.ALIYUN_REGISTRY }}/${{ env.IMAGE_LOWERCASE_OWNER }}/${{ env.IMAGE_LOWERCASE_NAME }}:${{ env.IMAGE_TAG }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@ FL-bench welcomes PR on everything that can make this project better.

### PyPI 🐍
```sh
pip install -r .environment/requirements.txt
pip install -r .env/requirements.txt
```

### Poetry 🎶
For those China mainland users
```sh
poetry install --no-root -C .environment
poetry install --no-root -C .env
```
For others
```sh
cd .environment && sed -i "10,14d" pyproject.toml && poetry lock --no-update && poetry install --no-root
cd .env && sed -i "10,14d" pyproject.toml && poetry lock --no-update && poetry install --no-root
```

### Docker 🐳
Expand Down
2 changes: 0 additions & 2 deletions config/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ common:

# You can set specific arguments for FL methods also
# FL-bench uses FL method arguments by args.<method>.<arg>
# e.g.
fedprox:
mu: 0.01
pfedsim:
warmup_round: 0.7
# ...

# NOTE: For those unmentioned arguments, the default values are set in `get_hyperparams()` in `class <method>Server` in `src/server/<method>.py`