Skip to content

Commit

Permalink
Feature/prosit improvements dataset caching (#34)
Browse files Browse the repository at this point in the history
* improvements to prosit intensity + dataset caching + others

* removed extra notebook

* cleaned up print statements

* dev install command fix

* added flag for tf dataset cache + notebook minor updates

* remove wandb from report init + notebook updates

* uncommented notebook pip install
  • Loading branch information
omsh authored May 3, 2024
1 parent aaa5b7a commit 7251282
Show file tree
Hide file tree
Showing 16 changed files with 359 additions and 979 deletions.
4 changes: 2 additions & 2 deletions .gitignore
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
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
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

0 comments on commit 7251282

Please sign in to comment.