Skip to content

Commit

Permalink
merge icml_push into main --squash
Browse files Browse the repository at this point in the history
  • Loading branch information
FNTwin committed Jul 22, 2024
1 parent e649bee commit e2bb77a
Show file tree
Hide file tree
Showing 103 changed files with 3,460 additions and 673 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
os: ["ubuntu-latest"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
os: ["ubuntu-latest", "macos-latest"] #,"windows-latest"

runs-on: ${{ matrix.os }}
timeout-minutes: 30
Expand Down Expand Up @@ -53,5 +53,5 @@ jobs:
- name: Run tests
run: python -m pytest

#- name: Test building the doc
# run: mkdocs build
- name: Test building the doc
run: mkdocs build
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,6 @@ cookie.txt
*.txt
*.sh
.DS_Store
*.zarr/
scripts/
notebooks/
352 changes: 352 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions docs/API/available_datasets.md

This file was deleted.

1 change: 1 addition & 0 deletions docs/API/basedataset.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.base
1 change: 1 addition & 0 deletions docs/API/datasets/alchemy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.alchemy
1 change: 1 addition & 0 deletions docs/API/datasets/ani.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.ani
1 change: 1 addition & 0 deletions docs/API/datasets/comp6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.comp6
1 change: 1 addition & 0 deletions docs/API/datasets/des.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.interaction.des
1 change: 1 addition & 0 deletions docs/API/datasets/gdml.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.gdml
1 change: 1 addition & 0 deletions docs/API/datasets/geom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.geom.GEOM
1 change: 1 addition & 0 deletions docs/API/datasets/iso_17.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.iso_17
1 change: 1 addition & 0 deletions docs/API/datasets/l7.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.interaction.l7
1 change: 1 addition & 0 deletions docs/API/datasets/md22.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.md22
1 change: 1 addition & 0 deletions docs/API/datasets/metcalf.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.interaction.metcalf
1 change: 1 addition & 0 deletions docs/API/datasets/molecule3d.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.molecule3d
1 change: 1 addition & 0 deletions docs/API/datasets/multixcqm9.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.multixcqm9
1 change: 1 addition & 0 deletions docs/API/datasets/nabladft.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.nabladft
1 change: 1 addition & 0 deletions docs/API/datasets/orbnet_denali.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.orbnet_denali
1 change: 1 addition & 0 deletions docs/API/datasets/pcqm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.pcqm
1 change: 1 addition & 0 deletions docs/API/datasets/proteinfragments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.proteinfragments
1 change: 1 addition & 0 deletions docs/API/datasets/qm1b.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.qm1b
1 change: 1 addition & 0 deletions docs/API/datasets/qm7x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.qm7x
1 change: 1 addition & 0 deletions docs/API/datasets/qmugs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.qmugs
1 change: 1 addition & 0 deletions docs/API/datasets/qmx.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.qmx
1 change: 1 addition & 0 deletions docs/API/datasets/revmd17.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.revmd17
1 change: 1 addition & 0 deletions docs/API/datasets/sn2_rxn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.sn2_rxn
1 change: 1 addition & 0 deletions docs/API/datasets/solvated_peptides.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.solvated_peptides
2 changes: 2 additions & 0 deletions docs/API/datasets/spice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

::: openqdc.datasets.potential.spice
1 change: 1 addition & 0 deletions docs/API/datasets/splinter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.interaction.splinter
1 change: 1 addition & 0 deletions docs/API/datasets/tmqm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.tmqm
1 change: 1 addition & 0 deletions docs/API/datasets/transition1x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.transition1x
1 change: 1 addition & 0 deletions docs/API/datasets/vqm24.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.vqm24
1 change: 1 addition & 0 deletions docs/API/datasets/waterclusters.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.waterclusters
1 change: 1 addition & 0 deletions docs/API/datasets/waterclusters3_30.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.potential.waterclusters3_30
1 change: 1 addition & 0 deletions docs/API/datasets/x40.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.interaction.x40
1 change: 1 addition & 0 deletions docs/API/formats.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.datasets.structure
6 changes: 5 additions & 1 deletion docs/API/methods.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# QM Methods

::: openqdc.methods
::: openqdc.methods.enums

# Isolated Atom Energies

::: openqdc.methods.atom_energies
1 change: 1 addition & 0 deletions docs/API/regressor.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.utils.regressor
3 changes: 3 additions & 0 deletions docs/API/units.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# UNITS

::: openqdc.utils.units
1 change: 1 addition & 0 deletions docs/API/utils.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
::: openqdc.utils
46 changes: 0 additions & 46 deletions docs/_overrides/main.html

This file was deleted.

Binary file added docs/assets/StorageView.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/qdc_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
113 changes: 113 additions & 0 deletions docs/cli.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
# CLI for dataset downloading and uploading
You can quickly download, fetch, preprocess and upload openQDC datasets using the command line interface (CLI).

## Datasets
Print a formatted table of the available openQDC datasets and some informations.

Usage:

openqdc datasets [OPTIONS]

Options:

--help Show this message and exit.

## Cache
Get the current local cache path of openQDC

Usage:

openqdc cache [OPTIONS]

Options:

--help Show this message and exit.


## Download
Download preprocessed ml-ready datasets from the main openQDC hub.

Usage:

openqdc download DATASETS... [OPTIONS]

Options:

--help Show this message and exit.
--overwrite Whether to force the re-download of the datasets and overwrite the current cached dataset. [default: no-overwrite]
--cache-dir Path to the cache. If not provided, the default cache directory (.cache/openqdc/) will be used. [default: None]
--as-zarr Whether to use a zarr format for the datasets instead of memmap. [default: no-as-zarr]
--gs Whether source to use for downloading. If True, Google Storage will be used.Otherwise, AWS S3 will be used [default: no-gs]

Example:

openqdc download Spice

## Fetch
Download the raw datasets files from the main openQDC hub

Note:

Special case: if the dataset is "all", "potential", "interaction".

Usage:

openqdc fetch DATASETS... [OPTIONS]

Options:

--help Show this message and exit.
--overwrite Whether to overwrite or force the re-download of the raw files. [default: no-overwrite]
--cache-dir Path to the cache. If not provided, the default cache directory (.cache/openqdc/) will be used. [default: None]

Example:

openqdc fetch Spice

## Preprocess
Preprocess a raw dataset (previously fetched) into a openqdc dataset and optionally push it to remote.

Usage:

openqdc preprocess DATASETS... [OPTIONS]

Options:

--help Show this message and exit.
--overwrite Whether to overwrite the current cached datasets. [default: overwrite]
--upload Whether to attempt the upload to the remote storage. Must have write permissions. [default: no-upload]
--as-zarr Whether to preprocess as a zarr format or a memmap format. [default: no-as-zarr]

Example:

openqdc preprocess Spice QMugs

## Upload
Upload a preprocessed dataset to the remote storage

Usage:

openqdc upload DATASETS... [OPTIONS]

Options:

--help Show this message and exit.
--overwrite Whether to overwrite the remote files if they are present. [default: overwrite]
--as-zarr Whether to upload the zarr files if available. [default: no-as-zarr]

Example:

openqdc upload Spice --overwrite

## Convert
Convert a preprocessed dataset from a memmap dataset to a zarr dataset.

Usage:

openqdc convert DATASETS... [OPTIONS]

Options:

--help Show this message and exit.
--overwrite Whether to overwrite the current zarr cached datasets. [default: no-overwrite]
--download Whether to force the re-download of the memmap datasets. [default: no-download]
59 changes: 59 additions & 0 deletions docs/contribute.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Contribute

The below documents the development lifecycle of OpenQDC.

## Setup a dev environment

```bash
mamba env create -n openqdc -f env.yml
mamba activate datamol
pip install -e .
```

## Pre commit installation

```bash
pre-commit install
pre-commit run --all-files
```

## Continuous Integration

OpenQDC uses Github Actions to:

- **Build and test** `openQDC`.
- Multiple combinations of OS and Python versions are tested.
- **Check** the code:
- Formatting with `black`.
- Static type check with `mypy`.
- Modules import formatting with `isort`.
- Pre-commit hooks.
- **Documentation**:
- Google docstring format.
- build and deploy the documentation on `main` and for every new git tag.


## Run tests

```bash
pytest
```

## Build the documentation

You can build and serve the documentation locally with:

```bash
# Build and serve the doc
mike serve
```

or with

```bash
mkdocs serve
```

### Multi-versionning

The doc is built for eash push on `main` and every git tags using [mike](https://github.com/jimporter/mike). Everything is automated using Github Actions. Please refer to the official mike's documentation for the details.
Loading

0 comments on commit e2bb77a

Please sign in to comment.