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.

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

Merge with private #24

Merged
merged 45 commits into from
Dec 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
d98926c
Kill python 2.7 style super (#496)
zasdfgbnm Jul 2, 2020
42442af
Specify dtype for species (#502)
zasdfgbnm Jul 10, 2020
267f4bc
Include model parameter placeholders in site-packages (#500)
farhadrgh Jul 20, 2020
f2bf5fb
Update JCIM issue numer, year (#506)
zasdfgbnm Jul 27, 2020
2fcc648
Distribute source tarball and wheel to PyPI (#508)
zasdfgbnm Aug 4, 2020
19882c6
Disable Final for 3.6 (#509)
zasdfgbnm Aug 15, 2020
5fbd9ed
Update aev.py (#510)
yueyericardo Sep 7, 2020
31bf913
Raise error for unknown species (#512)
farhadrgh Sep 8, 2020
ca6e325
Use torch.linalg.norm instead of torch.norm (#515)
alongd Sep 26, 2020
d0ab8a8
Use handwritten cosine similarity (#520)
zasdfgbnm Nov 2, 2020
29606ef
Simplify pair computation on AEV (#519)
zasdfgbnm Nov 2, 2020
b683765
Update CODEOWNERS (#523)
zasdfgbnm Nov 5, 2020
52091d3
Add clang-format ci (#524)
zasdfgbnm Nov 5, 2020
9ba0929
Update installation guide to mention conda (#525)
zasdfgbnm Nov 6, 2020
db9573c
Add dummy cuda extension build (#521)
zasdfgbnm Nov 7, 2020
99df98c
Rename pipelines so that they are better displayed (#526)
zasdfgbnm Nov 7, 2020
0f8eb38
Update cuda.yml (#528)
yueyericardo Nov 7, 2020
0b354c1
Update setup.py (#529)
yueyericardo Nov 11, 2020
dec9c0e
Make CUDA extension TorchScript compatible (#527)
zasdfgbnm Nov 11, 2020
ea51fad
Add mypy coverage (#530)
zasdfgbnm Nov 11, 2020
bd9d888
Use PyTorch autograd's hessian (#532)
zasdfgbnm Nov 13, 2020
a07d9c9
delete old commented code (#7) (#536)
zasdfgbnm Nov 13, 2020
648c970
Faster tests (#8) (#537)
zasdfgbnm Nov 13, 2020
25bd59f
Using the lalr parser loads networks x2 faster (#9) (#538)
zasdfgbnm Nov 13, 2020
2e5032a
Small modifications in code and comments to clarify (#11) (#539)
zasdfgbnm Nov 13, 2020
86ac402
delete all python2 style super calls (#14) (#540)
zasdfgbnm Nov 13, 2020
d47f39c
Add sync before functions and print a warning if not synching (#17) …
zasdfgbnm Nov 13, 2020
30f4ec4
Fix periodic table (#23) (#544)
zasdfgbnm Nov 13, 2020
55e6d4f
Revert "Use PyTorch autograd's hessian (#532)" (#534)
zasdfgbnm Nov 13, 2020
20b5746
Intuitive aev computer classmethod (#18) (#543)
zasdfgbnm Nov 13, 2020
13f53da
Cherry-pick roitberg-group#10 (#545)
zasdfgbnm Nov 13, 2020
ec35c7d
Use PyTorch's TestCase to compare tensor (#533)
zasdfgbnm Nov 13, 2020
b270d59
Cherry-pick roitberg-group#15 (#541)
zasdfgbnm Nov 13, 2020
e67a2ad
Cherry-pick roitberg-group#22 (#546)
zasdfgbnm Nov 13, 2020
12422dd
More about cuaev (#547)
zasdfgbnm Nov 14, 2020
57dd26b
Add code snippet to save validation and training sets in nnp_training…
IgnacioJPickering Nov 17, 2020
656aa03
CUDA port for AEV computation (#516)
akkamesh Nov 17, 2020
5ff2f8f
provide better error message (#550)
IgnacioJPickering Nov 19, 2020
a6d819e
clang-format line-limit to 120 (#552)
yueyericardo Nov 21, 2020
d2d6305
CRLF to LF (#553)
yueyericardo Nov 24, 2020
5fe2682
fix cuaev angular kernel when center atom pairs are more than 32 (#555)
yueyericardo Nov 27, 2020
a8ab0ea
Update docs.yml (#557)
zasdfgbnm Nov 27, 2020
d384789
Do no require grad in ASE calculator (#559)
zubatyuk Dec 7, 2020
5b02747
Merge branch 'master' into merge_with_private
IgnacioJPickering Dec 16, 2020
2bbd200
flake8
IgnacioJPickering Dec 16, 2020
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
88 changes: 88 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
---
AccessModifierOffset: -1
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
AlignOperands: false
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: true
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: false
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ForEachMacros: [ FOR_EACH_RANGE, FOR_EACH, ]
IncludeCategories:
- Regex: '^<.*\.h(pp)?>'
Priority: 1
- Regex: '^<.*'
Priority: 2
- Regex: '.*'
Priority: 3
IndentCaseLabels: true
IndentWidth: 2
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: false
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 2000000
PointerAlignment: Left
ReflowComments: true
SortIncludes: true
SpaceAfterCStyleCast: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
...
26 changes: 26 additions & 0 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: clang-format

on:
pull_request:
push:
branches:
- master
schedule:
- cron: '0 0 * * *'

jobs:
clang-format:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Lint with clang-format
run: |
find -name '*.cpp' -o -name '*.h' -o -name '*.cu' -o -name '*.cuh' | xargs clang-format -i
GIT_DIFF=$(git diff)
if [[ -z $GIT_DIFF ]]; then
exit 0
fi
echo $GIT_DIFF
exit 1
41 changes: 41 additions & 0 deletions .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: cuda

on:
pull_request:
push:
branches:
- master
paths:
- 'setup.py'
- 'torchani/cuaev/**'
- 'torchani/aev.py'
- 'ci/**'
- 'test/test_cuaev.py'
schedule:
- cron: '0 0 * * *'

jobs:
cuda:

runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.8]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Fetch submodules
run: git submodule update --init
- name: Install cuda
run: ci/install_cuda.sh
- name: Install dependencies
run: ci/install_dependencies.sh
- name: Install TorchANI
run: python setup.py install --cuaev
- name: Run cuaev test
run: pytest tests/test_cuaev.py -v
9 changes: 4 additions & 5 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [published]

jobs:
build:
deploy-docs:

runs-on: ubuntu-latest
strategy:
Expand All @@ -20,10 +20,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
ci/install_dependencies.sh
pip install h5py tb-nightly sphinx sphinx_rtd_theme matplotlib pillow sphinx-gallery
pip install .
run: ci/install_dependencies.sh
- name: Install TorchANI
run: python setup.py install
- name: Download data files
run: ./download.sh
# double check that this is indeed run under a release
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [published]

jobs:
build:
deploy-pypi:

runs-on: ubuntu-latest
strategy:
Expand All @@ -22,9 +22,7 @@ jobs:
- name: Fail build on non-release commits
run: git describe --exact-match --tags HEAD
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install twine wheel
run: ci/install_dependencies.sh
- name: Deploy
run: |
rm -rf dist/*
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/deploy-test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ on:
- cron: '0 0 * * *'

jobs:
deploy-test:
deploy-test-pypi:


runs-on: ubuntu-latest
strategy:
Expand All @@ -24,9 +25,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install twine wheel
run: ci/install_dependencies.sh
- name: Deploy
run: |
rm -rf dist/*
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ on:
- cron: '0 0 * * *'

jobs:
build:
docs:

runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.8]
python-version: [3.8]
tag: ["build", "push"]

steps:
- uses: actions/checkout@v1
Expand All @@ -24,10 +25,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
ci/install_dependencies.sh
pip install h5py tb-nightly sphinx sphinx_rtd_theme matplotlib pillow sphinx-gallery
pip install .
run: ci/install_dependencies.sh
- name: Install TorchANI
run: python setup.py install
- name: Download data files
run: ./download.sh
# build docs
Expand All @@ -45,13 +45,12 @@ jobs:
git config --global user.name "zasdfgbnm-bot"
- name: Deploy
run: |
[ ! -z "$GITHUB_HEAD_REF" ] && exit
[ ${{ matrix.tag }} == "push" ] || exit 0 # exit when build
git clone git@github.com:aiqm/torchani-test-docs.git deploy_dir -b gh-pages
rm -rf deploy_dir/*
touch deploy_dir/.nojekyll
cp -r build/* deploy_dir
cd deploy_dir
git add .
git commit -m "update"
sh -c 'git push --force || true'

git push --force
10 changes: 4 additions & 6 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- cron: '0 0 * * *'

jobs:
build:
flake8:

runs-on: ubuntu-latest
strategy:
Expand All @@ -25,9 +25,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .
- name: Lint with flake8
run: |
pip install --upgrade pip
pip install flake8
flake8 .
- name: Lint with flake8
run: flake8 .
7 changes: 4 additions & 3 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- cron: '0 0 * * *'

jobs:
build:
mypy:

runs-on: ubuntu-latest
strategy:
Expand All @@ -23,8 +23,9 @@ jobs:
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Type checking with mypy
- name: Install dependencies
run: |
pip install --upgrade pip
pip install mypy
mypy --no-site-packages --ignore-missing-imports torchani/{aev,nn,utils,models,ase}.py
- name: Type checking with mypy
run: mypy --ignore-missing-imports .
11 changes: 5 additions & 6 deletions .github/workflows/runnable_submodules.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: runnable submodules
name: runnable-submodules

on:
pull_request:
Expand All @@ -9,7 +9,7 @@ on:
- cron: '0 0 * * *'

jobs:
build:
runnable-submodules:

runs-on: ubuntu-latest
strategy:
Expand All @@ -24,10 +24,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
ci/install_dependencies.sh
pip install h5py .
pip install .
run: ci/install_dependencies.sh
- name: Install TorchANI
run: python setup.py install
- name: Download data files
run: ./download.sh
- name: Run submodules
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/stable-torch.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: stable-torch

on:
pull_request:
push:
branches:
- master
schedule:
- cron: '0 0 * * *'

jobs:
build:
stable-torch:

runs-on: ubuntu-latest
strategy:
Expand All @@ -25,11 +26,9 @@ jobs:
- name: Fetch submodules
run: git submodule update --init
- name: Install dependencies
run: |
pip install --upgrade pip
pip install torch pytest
pip install -r test_requirements.txt
pip install .
run: ci/install_dependencies.sh
- name: Install TorchANI
run: python setup.py install
- name: Download data files
run: ./download.sh
- name: Run tests
Expand Down
Loading