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

2.0 #15

Open
wants to merge 53 commits into
base: 2.0
Choose a base branch
from
Open

2.0 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
bac262a
Adjusted project structure
theconsolelogger Sep 14, 2019
8abd729
Added gitignore file
theconsolelogger Sep 14, 2019
0c041c0
Created license file
theconsolelogger Sep 17, 2019
03493df
Adjusted project structure
theconsolelogger Sep 17, 2019
ef3f169
Moved NeuRec.properties
theconsolelogger Sep 17, 2019
ff05915
Created Dockerfile
theconsolelogger Sep 17, 2019
44fa9d2
Added MIT license to LICENSE file
theconsolelogger Sep 17, 2019
5c58734
Removed long_description_content_type due to unknown tag error
theconsolelogger Sep 18, 2019
06c3af1
Adjusted imports due to package implementation and added init files
theconsolelogger Sep 18, 2019
62a77c4
Refactored reading of files
theconsolelogger Sep 18, 2019
91b9056
Created setup function to allow custom setting of seed values.
theconsolelogger Sep 19, 2019
96d1e83
Fixed package versions and changed function calls to prevent warnings.
theconsolelogger Sep 19, 2019
af5ae84
Created initial set of docs
theconsolelogger Sep 19, 2019
4cce3ae
Allowed user provided properties files and improve project parts
theconsolelogger Oct 2, 2019
446f336
Moved configuration files outside project
theconsolelogger Oct 2, 2019
3a9fa0e
Improved AbstractRecommender class and updated models to use Properties
theconsolelogger Oct 2, 2019
11e60e5
Fixed issues with recent merge relating to missing lines and logging
theconsolelogger Oct 2, 2019
27ff497
Created helper function to convert string to lists in properties files
theconsolelogger Oct 2, 2019
f86451a
Correct issues with Dataset class and adjusted logging settings
theconsolelogger Oct 2, 2019
7bf461b
Added missing models to neurec.data.models.models
theconsolelogger Oct 3, 2019
2866356
Added missing properties to neurec.data.properties.types
theconsolelogger Oct 3, 2019
9117786
Exception handling for mismatch of defined property type with value
theconsolelogger Oct 3, 2019
f3104f6
Added bool helper & corrected list helper with conversion type as well
theconsolelogger Oct 3, 2019
876dfe7
Cleaned models and adjusted with recent chnages to project
theconsolelogger Oct 3, 2019
ae5b803
Changed Dataset to a singleton class
theconsolelogger Oct 3, 2019
991ef68
Created recommender parent __init__() and adjusted models to call it
theconsolelogger Oct 3, 2019
1fa935f
Added ability to pass custom dataset
theconsolelogger Oct 4, 2019
75b80c0
Created requirements file & fixed package versions
theconsolelogger Oct 11, 2019
d5338c2
Added visual studio code to gitignore
theconsolelogger Oct 11, 2019
3e237e5
Adjusted logging & changed errors to exceptions
theconsolelogger Oct 11, 2019
51249e7
Added ability to ask for model properties
theconsolelogger Oct 11, 2019
0c4e120
Added ability to provide custom dataset
theconsolelogger Oct 11, 2019
6323463
Added ability to find available models
theconsolelogger Oct 11, 2019
8c6c68c
Updated docs & added 2 new pages
theconsolelogger Oct 11, 2019
b240396
Improved import of neurec package
theconsolelogger Oct 11, 2019
da55915
Updated require python version for neurec package
theconsolelogger Oct 14, 2019
5d7a472
Removed editable flag for package in docker image
theconsolelogger Oct 14, 2019
ce94427
Created GPU and CPU builds of docker image
theconsolelogger Oct 14, 2019
014f41c
Handled warnings with tensorflow deprecation
theconsolelogger Oct 14, 2019
a4e2aab
Cleaned up properties files
theconsolelogger Oct 18, 2019
21cbea4
Corrected logging output
theconsolelogger Oct 18, 2019
c44072e
Corrected properties error messages
theconsolelogger Oct 18, 2019
c6024d2
Corrected Dockerfiles
theconsolelogger Oct 18, 2019
b99e65a
Reordered models list and added missing model
theconsolelogger Oct 21, 2019
ccc5c7e
Updated README file with new quick start guide
theconsolelogger Oct 21, 2019
f704723
Create requirements.txt
wubinzzu Oct 31, 2019
dc8ff98
Update README.md
wubinzzu Oct 31, 2019
ae9ebc8
Update README.md
wubinzzu Oct 31, 2019
b577841
Update requirements.txt
wubinzzu Oct 31, 2019
4bf1c41
Adjustments for publishing python package
theconsolelogger Nov 4, 2019
429f09b
Merge branch 'master' into master
Nov 4, 2019
5409996
Merge pull request #9 from jonathanstaniforth/master
Nov 4, 2019
8a28394
Packaged NeuRec 2.0
wubinzzu Oct 31, 2019
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
127 changes: 127 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# Visual Studio Code
.vscode/
13 changes: 13 additions & 0 deletions Dockerfile-cpu
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM tensorflow/tensorflow:1.12.3-py3

LABEL maintainer="[email protected]"

WORKDIR /tf/neurec

COPY ./neurec .

RUN pip3 install neurec

WORKDIR /tf

EXPOSE 8888
13 changes: 13 additions & 0 deletions Dockerfile-gpu
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM tensorflow/tensorflow:1.12.3-gpu-py3

LABEL maintainer="[email protected]"

WORKDIR /tf/neurec

COPY ./neurec .

RUN pip3 install neurec

WORKDIR /tf

EXPOSE 8888
7 changes: 7 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2019 BinWu

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
recursive-include neurec *.py
include neurec/dataset/*
20 changes: 0 additions & 20 deletions NeuRec.properties

This file was deleted.

Loading