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

Feature/prosit improvements dataset caching #34

Merged
merged 7 commits into from
May 3, 2024
+359 −979
Merged

Feature/prosit improvements dataset caching #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b65f13
improvements to prosit intensity + dataset caching + others
omsh Apr 28, 2024
b7e5562
removed extra notebook
omsh Apr 28, 2024
af50f3b
cleaned up print statements
omsh Apr 28, 2024
5f1d253
dev install command fix
omsh May 3, 2024
13f5956
added flag for tf dataset cache + notebook minor updates
omsh May 3, 2024
b701668
remove wandb from report init + notebook updates
omsh May 3, 2024
489f32f
uncommented notebook pip install
omsh May 3, 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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ coverage.xml
.hypothesis/
.pytest_cache/

# put all coverage in one place
cov/
# put all test results and coverage in one place
.test_results/

# Translations
*.mo
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ install-dev:
test:
make uninstall
make install
mkdir -p cov/
mkdir -p .test_results/cov/

python -m pytest tests/ --junitxml=junit/test-results.xml --cov=dlomix --cov-report html:cov/cov_html --cov-report xml:cov/cov.xml --cov-report lcov:cov/cov.info --cov-report annotate:cov/cov_annotate
python -m pytest tests/ --junitxml=.test_results/junit/test-results.xml --cov=dlomix --cov-report html:.test_results/cov/cov_html --cov-report xml:.test_results/cov/cov.xml --cov-report lcov:.test_results/cov/cov.info --cov-report annotate:.test_results/cov/cov_annotate

test-local:
make uninstall
make install-nodeps
mkdir -p cov/
mkdir -p .test_results/cov/

python -m pytest tests/ --junitxml=junit/test-results.xml --cov=dlomix --cov-report html:cov/cov_html --cov-report xml:cov/cov.xml --cov-report lcov:cov/cov.info --cov-report annotate:cov/cov_annotate
python -m pytest tests/ --junitxml=.test_results/junit/test-results.xml --cov=dlomix --cov-report html:.test_results/cov/cov_html --cov-report xml:.test_results/cov/cov.xml --cov-report lcov:.test_results/cov/cov.info --cov-report annotate:.test_results/cov/cov_annotate


format:
Expand Down
10 changes: 5 additions & 5 deletions docs/notes/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ DLOmix can be installed via pip:
pip install dlomix
To get the dev version, you can install directly from GitHub:
To get the dev version, you can install directly from GitHub (develop branch):

.. code-block:: bash
pip install git+https://github.com/wilhelmlab/dlomix.git
pip install git+https://github.com/wilhelm-lab/dlomix.git@develop
If you decide to use Weights & Biases for reporting, you can use the extra install command:
If you decide to use Weights & Biases for reporting, you can use the extra install command:

.. code-block:: bash
.. code-block:: bash
pip install dlomix[wandb]
Loading