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

Add featurizer #102

Merged
merged 52 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3fcb776
first commit to featurizer
naik-aakash Apr 25, 2023
7334129
update doc string
naik-aakash Apr 25, 2023
a447a86
update test
naik-aakash Apr 25, 2023
1d211a0
update featurizer to incorporate OOP
naik-aakash Apr 27, 2023
8841394
add test for Lobsterpyjson featurizer
naik-aakash Apr 27, 2023
7e906ba
add optional featurizer dependencies
naik-aakash Apr 27, 2023
5123d02
update test and publish workflows
naik-aakash Apr 27, 2023
c3fe2c6
update workflows
naik-aakash Apr 27, 2023
14d9d27
fix linting errors
naik-aakash Apr 27, 2023
fc2ace0
update core.py
naik-aakash Apr 27, 2023
c63a299
mypy error fix
naik-aakash Apr 27, 2023
9ad2a29
more mypy error fixes
naik-aakash Apr 27, 2023
12204da
fix mypy variable assignment error
naik-aakash Apr 27, 2023
ded6dd2
attempt error ignore temporary
naik-aakash Apr 27, 2023
b3e675b
fix mypy,pydocstyle errors for featurizer module
naik-aakash Apr 27, 2023
2a2b8e4
update __init__.py
naik-aakash Apr 27, 2023
f0e0d14
refactor featurizer module, added summary.py and batch.py module, add…
naik-aakash Apr 28, 2023
7dea944
fix docstring
naik-aakash Apr 28, 2023
5d489f3
fix liniting errors
naik-aakash Apr 28, 2023
2f61e81
refactor featurize module, add more tests
naik-aakash May 3, 2023
ccbf17e
fix pylint import errors
naik-aakash May 3, 2023
c5245f3
run black
naik-aakash May 3, 2023
6030c33
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash May 3, 2023
b568190
sort index of dataframe returned by batch featurizers
naik-aakash May 4, 2023
19937e6
run black
naik-aakash May 4, 2023
ce21ab6
Merge branch 'add-featurizer' of github.com:naik-aakash/LobsterPy int…
naik-aakash May 4, 2023
a7d0889
added .coveragerc, as multiprocessing calls are not captured without it
naik-aakash May 4, 2023
3499229
update workflow to get correct coverage report
naik-aakash May 4, 2023
40656f1
add missing doc string
naik-aakash May 4, 2023
348ec29
add missing annotation hints, fix some linting issues
naik-aakash May 4, 2023
77507c5
fix mypy errors
naik-aakash May 4, 2023
b2df2b4
remove deprecated disable tags from pylintrc file
naik-aakash May 4, 2023
77c153b
handle cation-anion mode failure with exception
naik-aakash May 5, 2023
372f916
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash May 13, 2023
d8876a2
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash May 18, 2023
7b76fa6
if else instead of exception
JaGeo May 26, 2023
7cb88bb
Fix typos
JaGeo May 26, 2023
10fbe18
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash Jun 1, 2023
7cc21f0
improve default file handling, increase core.py test coverage
naik-aakash Jun 2, 2023
c92b3ba
increase tests coverage
naik-aakash Jun 3, 2023
148a7cd
improve numerical stability, add more tests
naik-aakash Jun 4, 2023
3266bfc
pydocstyle linitng fix
naik-aakash Jun 4, 2023
1c7cec9
fix erange bug in COXX featurize
naik-aakash Jun 5, 2023
d3b2975
resolve merge conflicts with github CI workflow, remove redundant use…
naik-aakash Jun 6, 2023
aecfea0
Merge branch 'main' into add-featurizer
naik-aakash Jun 6, 2023
99fed4e
fix featurizer requirements
naik-aakash Jun 6, 2023
00356b0
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash Jul 25, 2023
c85e90e
fix failing exception test> changes in pymatgen
naik-aakash Jul 25, 2023
b38b115
Merge branch 'main' into add-featurizer
naik-aakash Aug 11, 2023
bee9480
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash Aug 14, 2023
9c6c76b
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash Sep 13, 2023
3bef101
Merge branch 'JaGeo:main' into add-featurizer
naik-aakash Sep 13, 2023
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
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
concurrency = multiprocessing
3 changes: 1 addition & 2 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install mypy pydocstyle pylint black flake8 pyproject-flake8==6.0.0
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install -e .
pip install -e .[featurizer]
pip install types-setuptools
- name: mypy
run: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install flake8 pytest pytest-mock pytest-split pytest-cov
python -m pip install types-setuptools
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install -e .
pip install -e .[featurizer]
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
Expand All @@ -48,7 +47,7 @@ jobs:
with:
name: coverage-${{ matrix.split }}
path: .coverage

coverage:
needs: build
runs-on: ubuntu-latest
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ jobs:
python -m pip install flake8 pytest pytest-mock
python -m pip install types-setuptools
python -m pip install coverage
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install -e .
pip install -e .[featurizer]
pip install build
- name: Build package
run: python -m build
Expand Down
31 changes: 23 additions & 8 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
#
import os
import sys

sys.path.insert(0, os.path.abspath("../"))


# -- Project information -----------------------------------------------------

project = 'Lobsterpy'
copyright = '2022, Janine George'
author = 'Janine George'
project = "Lobsterpy"
copyright = "2022, Janine George"
author = "Janine George"


# -- General configuration ---------------------------------------------------
Expand All @@ -43,12 +44,18 @@
source_suffix = [".rst", ".md"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ["../../lobsterpy/test","../../lobsterpy/cohp/test","../../lobsterpy/plotting/test","../../lobsterpy/TestData","Thumbs.db", ".DS_Store",]
exclude_patterns = ["../../lobsterpy/test",
"../../lobsterpy/cohp/test",
"../../lobsterpy/plotting/test",
"../../lobsterpy/TestData",
"Thumbs.db",
".DS_Store",
]

def run_apidoc(_):
import subprocess
Expand All @@ -60,7 +67,15 @@ def run_apidoc(_):
excludes2 = glob.glob(os.path.join(output_path, "../../lobsterpy/plotting/test"))
module = os.path.join(output_path, "../../lobsterpy")
cmd_path = "sphinx-apidoc"
command = [cmd_path, "-e", "-o", output_path, module, " ".join(excludes)," ".join(excludes1)," ".join(excludes2), "--force"]
command = [cmd_path,
"-e", "-o",
output_path,
module,
" ".join(excludes),
" ".join(excludes1),
" ".join(excludes2),
"--force"
]
subprocess.check_call(command)


Expand All @@ -73,9 +88,9 @@ def setup(app):
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_book_theme'
html_theme = "sphinx_book_theme"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added lobsterpy/TestData/JSONS/mp-1249.json.gz
Binary file not shown.
Binary file added lobsterpy/TestData/JSONS/mp-14652.json.gz
Binary file not shown.
Binary file added lobsterpy/TestData/JSONS/mp-1958.json.gz
Binary file not shown.
6 changes: 6 additions & 0 deletions lobsterpy/featurize/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright (c) lobsterpy development team
# Distributed under the terms of a BSD 3-Clause "New" or "Revised" License

"""
This package provides the modules for featurzing Lobster data ready for ML
"""
Loading