Skip to content
This repository was archived by the owner on Nov 28, 2023. It is now read-only.

Commit 97ea093

Browse files
authored
Merge pull request #131 from DeepRank/development
Development
2 parents 476ad17 + 954a271 commit 97ea093

File tree

123 files changed

+63412
-46235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+63412
-46235
lines changed

.gitignore

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,32 @@ Byte-compiled / optimized
55
deeprank.egg-info
66
database*
77

8+
# specific architure files
9+
deeprank/learn/arch_*
10+
811
# some example file
912
example/grid/ELEC
1013
example/grid/VDW
1114
example/grid/data_viz
1215
example/grid/input
1316
example/workflow/test_out
17+
example/hdf5
18+
example/out_3d
19+
example/*.pckl
20+
example/*.hdf5
21+
example/*.pdb
22+
23+
# some test file
24+
test/out_2d*
25+
test/out_3d*
26+
test/out_test
27+
test/*.pckl
28+
test/*.hdf5
29+
test/*.pdb
30+
1431

1532
# datafile
16-
*.pdb
33+
#*.pdb
1734
*.CHARGE
1835
*.db
1936
*.COULOMB
@@ -27,5 +44,15 @@ example/workflow/test_out
2744
#docs/_static
2845
#docs/_templates
2946

47+
48+
# vscode setting
49+
.vscode
50+
51+
.DS_Store
52+
test/1AK4/atomic_features/test_1AK4_100w.dat
53+
test/2OUL/atomic_features/test_2OUL_1.dat
54+
test/atomic_pair_interaction.dat
55+
3056
# Mac OSX files
3157
.DS_Store
58+

.travis.yml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sudo: false
2-
distr : "trusty"
2+
distr : "bionic"
33

44
language: generic
55

@@ -16,44 +16,11 @@ before_install:
1616
# Useful for debugging any issues with conda
1717
- conda info -a
1818

19-
# pytest
20-
- conda install -c anaconda pytest
21-
- conda install -c conda-forge pytest-cov
22-
- conda install python=3.6
23-
24-
# install freesasa python bindings
25-
# - pip install freesasa==2.0.3.post4 # <- doesn't work anymore
26-
27-
# install freesasa
28-
# - conda install cython
29-
# - git clone https://github.com/freesasa/freesasa-python
30-
# - cd freesasa-python
31-
# - git submodule update --init
32-
# - USE_CYTHON=1 python setup.py build
33-
# - export PYTHONPATH=$PYTHONPATH: ???
34-
35-
# install freesasa
36-
- conda install cython
37-
- sudo apt-get install -y libxml2 libxml2-dev libjson0 libjson0-dev
38-
- wget http://github.com/mittinatten/freesasa/releases/download/2.0.2/freesasa-2.0.2.tar.gz
39-
- mkdir freesasa
40-
- tar -xvf freesasa-2.0.2.tar.gz -C freesasa --strip-components=1
41-
- cd freesasa
42-
- ./configure --disable-xml --disable-json --enable-python-bindings --with-python=python3.6 CFLAGS="-fPIC" --prefix=$HOME
43-
- make
44-
- make install
45-
- cd ../
46-
47-
48-
# install pytorch
49-
- conda install pytorch=1.0 torchvision cuda80 -c soumith
50-
51-
# codacy-coverage
52-
- pip install -q --upgrade pip
53-
- pip install -q coverage
54-
- pip install -q codacy-coverage
55-
- pip install -q coveralls
19+
# python
20+
- conda install python=3.7
5621

22+
# install openmpi for mpi4py
23+
- sudo apt-get install libopenmpi-dev openmpi-bin
5724

5825
install:
5926
- pip install -qe .[test]

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
###########
2+
Change Log
3+
###########
4+
5+
All notable changes to this project will be documented in this file.
6+
This project adheres to `Semantic Versioning <http://semver.org/>`_.
7+
8+
[Unreleased]
9+
************
10+
11+
Added
12+
-----
13+
14+
* Empty Python project directory structure

CODE_OF_CONDUCT.rst

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
###############################################################################
2+
Contributor Covenant Code of Conduct
3+
###############################################################################
4+
5+
Our Pledge
6+
**********
7+
8+
In the interest of fostering an open and welcoming environment, we as
9+
contributors and maintainers pledge to making participation in our project and
10+
our community a harassment-free experience for everyone, regardless of age, body
11+
size, disability, ethnicity, gender identity and expression, level of experience,
12+
education, socio-economic status, nationality, personal appearance, race,
13+
religion, or sexual identity and orientation.
14+
15+
Our Standards
16+
*************
17+
18+
Examples of behavior that contributes to creating a positive environment
19+
include:
20+
21+
* Using welcoming and inclusive language
22+
* Being respectful of differing viewpoints and experiences
23+
* Gracefully accepting constructive criticism
24+
* Focusing on what is best for the community
25+
* Showing empathy towards other community members
26+
27+
Examples of unacceptable behavior by participants include:
28+
29+
* The use of sexualized language or imagery and unwelcome sexual attention or
30+
advances
31+
* Trolling, insulting/derogatory comments, and personal or political attacks
32+
* Public or private harassment
33+
* Publishing others' private information, such as a physical or electronic
34+
address, without explicit permission
35+
* Other conduct which could reasonably be considered inappropriate in a
36+
professional setting
37+
38+
Our Responsibilities
39+
********************
40+
41+
Project maintainers are responsible for clarifying the standards of acceptable
42+
behavior and are expected to take appropriate and fair corrective action in
43+
response to any instances of unacceptable behavior.
44+
45+
Project maintainers have the right and responsibility to remove, edit, or
46+
reject comments, commits, code, wiki edits, issues, and other contributions
47+
that are not aligned to this Code of Conduct, or to ban temporarily or
48+
permanently any contributor for other behaviors that they deem inappropriate,
49+
threatening, offensive, or harmful.
50+
51+
Scope
52+
*****
53+
54+
This Code of Conduct applies both within project spaces and in public spaces
55+
when an individual is representing the project or its community. Examples of
56+
representing a project or community include using an official project e-mail
57+
address, posting via an official social media account, or acting as an appointed
58+
representative at an online or offline event. Representation of a project may be
59+
further defined and clarified by project maintainers.
60+
61+
Enforcement
62+
***********
63+
64+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
65+
reported by contacting the project team at n.renaud@esciencecenter.nl. All
66+
complaints will be reviewed and investigated and will result in a response that
67+
is deemed necessary and appropriate to the circumstances. The project team is
68+
obligated to maintain confidentiality with regard to the reporter of an incident.
69+
Further details of specific enforcement policies may be posted separately.
70+
71+
Project maintainers who do not follow or enforce the Code of Conduct in good
72+
faith may face temporary or permanent repercussions as determined by other
73+
members of the project's leadership.
74+
75+
Attribution
76+
***********
77+
78+
This Code of Conduct is adapted from the `Contributor Covenant <https://www.contributor-covenant.org>`_, version 1.4,
79+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

CONTRIBUTING.rst

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
############################
2+
Contributing guidelines
3+
############################
4+
5+
We welcome any kind of contribution to our software, from simple comment or question to a full fledged `pull request <https://help.github.com/articles/about-pull-requests/>`_. Please read and follow our `Code of Conduct <CODE_OF_CONDUCT.rst>`_.
6+
7+
A contribution can be one of the following cases:
8+
9+
#. you have a question;
10+
#. you think you may have found a bug (including unexpected behavior);
11+
#. you want to make some kind of change to the code base (e.g. to fix a bug, to add a new feature, to update documentation).
12+
13+
The sections below outline the steps in each case.
14+
15+
You have a question
16+
*******************
17+
18+
#. use the search functionality `here <https://github.com/DeepRank/deeprank/issues>`__ to see if someone already filed the same issue;
19+
#. if your issue search did not yield any relevant results, make a new issue;
20+
#. apply the "Question" label; apply other labels when relevant.
21+
22+
You think you may have found a bug
23+
**********************************
24+
25+
#. use the search functionality `here <https://github.com/DeepRank/deeprank/issues>`__ to see if someone already filed the same issue;
26+
#. if your issue search did not yield any relevant results, make a new issue, making sure to provide enough information to the rest of the community to understand the cause and context of the problem. Depending on the issue, you may want to include:
27+
- the `SHA hashcode <https://help.github.com/articles/autolinked-references-and-urls/#commit-shas>`_ of the commit that is causing your problem;
28+
- some identifying information (name and version number) for dependencies you're using;
29+
- information about the operating system;
30+
#. apply relevant labels to the newly created issue.
31+
32+
You want to make some kind of change to the code base
33+
*****************************************************
34+
35+
#. (**important**) announce your plan to the rest of the community *before you start working*. This announcement should be in the form of a (new) issue;
36+
#. (**important**) wait until some kind of consensus is reached about your idea being a good idea;
37+
#. if needed, fork the repository to your own Github profile and create your own feature branch off of the latest master commit. While working on your feature branch, make sure to stay up to date with the master branch by pulling in changes, possibly from the 'upstream' repository (follow the instructions `here <https://help.github.com/articles/configuring-a-remote-for-a-fork/>`__ and `here <https://help.github.com/articles/syncing-a-fork/>`__);
38+
#. make sure the existing tests still work by running ``python setup.py test``;
39+
#. add your own tests (if necessary);
40+
#. update or expand the documentation;
41+
#. `push <http://rogerdudler.github.io/git-guide/>`_ your feature branch to (your fork of) the DeepRank repository on GitHub;
42+
#. create the pull request, e.g. following the instructions `here <https://help.github.com/articles/creating-a-pull-request/>`__.
43+
44+
In case you feel like you've made a valuable contribution, but you don't know how to write or run tests for it, or how to generate the documentation: don't let this discourage you from making the pull request; we can help you! Just go ahead and submit the pull request, but keep in mind that you might be asked to append additional commits to your pull request.

MANIFEST.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
include LICENSE
2+
include README.md
3+
include deeprank/features/forcefield/*
4+
graft test/1AK4
5+
prune deeprank/utils
6+
include deeprank/utils/logger_helper.py
7+
exclude test/test_hitrate_successrate.py

NOTICE

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
DeepRank
2+
Copyright [2017-2020] The Netherlands eScience Center
3+
4+
This product includes software developed at
5+
The Netherlands eScience Center (https://www.esciencecenter.nl/)
6+
For the DeepRank project

0 commit comments

Comments
 (0)