Unverified Commit 4fde71e3 authored by Bharath Ramsundar's avatar Bharath Ramsundar Committed by GitHub
Browse files

Merge pull request #2045 from nd-02110114/mat-feat

Modify MoleculeGraphData  and add CGCNN featurizer
parents ceaadc1b 4370a148
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ jobs:
      language: c
      python: '3.7'
      os: windows

cache: pip
install:
  - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -33,8 +33,6 @@ install:
  - bash scripts/install_deepchem_conda.sh deepchem
  - conda activate deepchem
  - python setup.py install
  - pip install coveralls mypy flake8 yapf==0.22.0

script:
  - bash devtools/run_yapf.sh
  - bash devtools/run_flake8.sh
@@ -47,12 +45,9 @@ script:
  - if [ $TRAVIS_PYTHON_VERSION == '3.7' ]; then
      find ./deepchem -name "*.py" ! -name '*load_dataset_template.py' | xargs python -m doctest -v;
    fi


after_success:
  - echo $TRAVIS_SECURE_ENV_VARS
  - coveralls

deploy:
  provider: pypi
  username: __token__
+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ conda install -y -c conda-forge rdkit deepchem==2.3.0
You install the nightly build version via pip. The nightly version is built by the HEAD of DeepChem.

```bash
pip install tensorflow==2.2
pip install tensorflow==2.2.0
pip install --pre deepchem
```

+1 −4
Original line number Diff line number Diff line
@@ -3,12 +3,9 @@ Tests for JsonLoader class.
"""

import os
import tempfile
import shutil
import numpy as np
import deepchem as dc
from deepchem.data.data_loader import JsonLoader
from deepchem.feat.materials_featurizers import SineCoulombMatrix
from deepchem.feat import SineCoulombMatrix


def test_json_loader():
+3 −1
Original line number Diff line number Diff line
@@ -22,4 +22,6 @@ from deepchem.feat.atomic_coordinates import AtomicCoordinates
from deepchem.feat.atomic_coordinates import NeighborListComplexAtomicCoordinates
from deepchem.feat.adjacency_fingerprints import AdjacencyFingerprint
from deepchem.feat.smiles_featurizers import SmilesToSeq, SmilesToImage
from deepchem.feat.materials_featurizers import ElementPropertyFingerprint, SineCoulombMatrix, StructureGraphFeaturizer
from deepchem.feat.material_featurizers import ElementPropertyFingerprint
from deepchem.feat.material_featurizers import SineCoulombMatrix
from deepchem.feat.material_featurizers import CGCNNFeaturizer
+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ class CircularFingerprint(MolecularFeaturizer):
      from rdkit.Chem import rdMolDescriptors
    except ModuleNotFoundError:
      raise ValueError("This class requires RDKit to be installed.")

    self.radius = radius
    self.size = size
    self.chiral = chiral
Loading