Skip to content

Commit

Permalink
Make sure package is actually buildable
Browse files Browse the repository at this point in the history
  • Loading branch information
GLJS committed Dec 18, 2023
1 parent 88e9165 commit 7556bb1
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install dependencies
run: |
pip install --upgrade pip
pip install setuptools wheel twine
pip install setuptools wheel twine build
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Build and publish
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ output
cache*
lib
.hypothesis
pycocoevalcap/tokenizer/tmp*
pycocoevalcap/tokenizer/tmp*
.DS_Store
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ score = get_aces_score(candidates, references, average=True)
```

## Evaluation
All the code that is used to evaluate different models for the research paper can be found in the `evaluation` folder. Particularly,
the model evaluation can be found in `evaluation/eval.py`, and information about the FENSE experiment can be found in `evaluation/fense_experiment/main.py`.
All the code that is used to evaluate different models for the research paper can be found in the `evaluation` folder on the [github](https://github.com/GlJS/ACES). Particularly, the model evaluation can be found in `evaluation/eval.py`, and information about the FENSE experiment can be found in `evaluation/fense_experiment/main.py`.
2 changes: 1 addition & 1 deletion evaluation/eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import string

from bert_score import score
from src.aces.aces import ACES, get_aces_score
from src.aces import ACES, get_aces_score
from evaluation.eval_metrics import evaluate_metrics_from_lists
from transformers import pipeline
from fense.evaluator import Evaluator
Expand Down
2 changes: 1 addition & 1 deletion evaluation/fense_experiment/experiment/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
os.environ["CUDA_VISIBLE_DEVICES"] = "2,1"
import sys
sys.path.insert(0, os.getcwd())
from src.aces.aces import get_aces_score, ACES
from src.aces import get_aces_score, ACES
import json
import numpy as np
import pandas as pd
Expand Down
6 changes: 1 addition & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,4 @@ description = "ACES metric for evaluating automated audio captioning models base
readme = "README.md"
authors = [{name = "Gijs Wijngaard", email = "hi@gijs.me"}]
license = {file = "LICENSE"}
requires-python = ">=3.9"

[tool.setuptools]
include-package-data = true
packages = ["aces"]
requires-python = ">=3.9"
File renamed without changes.
2 changes: 1 addition & 1 deletion test_aces.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import torch
os.environ["CUDA_VISIBLE_DEVICES"] = "0,1,2"

from src.aces.aces import get_aces_score, ACES
from src.aces import get_aces_score, ACES
from transformers import pipeline
import time
from evaluation.fense_experiment.experiment.sweep import get_aces_score as get_aces_score_old
Expand Down

0 comments on commit 7556bb1

Please sign in to comment.