Skip to content

Commit

Permalink
update 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
amazingDD committed Jul 28, 2022
1 parent 5d5a3fa commit 96bd6b9
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 10 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</p>

![PyPI - Python Version](https://img.shields.io/badge/pyhton-3.5%2B-blue)
[![Version](https://img.shields.io/badge/version-2.1.0-orange)](https://github.com/AmazingDD/daisyRec)
[![Version](https://img.shields.io/badge/version-2.1.1-orange)](https://github.com/AmazingDD/daisyRec)
![GitHub repo size](https://img.shields.io/github/repo-size/AmazingDD/daisyRec)
![GitHub](https://img.shields.io/github/license/AmazingDD/daisyRec)
[![arXiv](https://img.shields.io/badge/arXiv-daisyRec-%23B21B1B)](https://arxiv.org/abs/2206.10848)
Expand Down Expand Up @@ -39,12 +39,12 @@ pip install daisyRec
git clone https://github.com/AmazingDD/daisyRec.git && cd daisyRec
```

- Example codes are listed in `run_examples`, try to refer them and find out how to use daisy; you can also implement these codes by moving them into `daisy/`
- Example codes are listed in `run_examples`, try to refer them and find out how to use daisy; you can also implement these codes by moving them into `daisyRec/`.
```
python fair_rec.py
python fair_hpo.py
python test.py
python tune.py
```
- The GUI Command Generator for `fair_rec.py` and `fair_hpo.py`, which can assist you to quikly write arguments and run the fair comparison experiments, is now available [**here**](http://DaisyRecGuiCommandGenerator.pythonanywhere.com).
- The GUI Command Generator for `test.py` and `tune.py`, which can assist you to quikly write arguments and run the fair comparison experiments, is now available [**here**](http://DaisyRecGuiCommandGenerator.pythonanywhere.com).


### Documentation
Expand Down
2 changes: 1 addition & 1 deletion daisy/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = 'v2.1.0'
__version__ = 'v2.1.1'
12 changes: 12 additions & 0 deletions daisy/model/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from daisy.model.EASERecommender import EASE
from daisy.model.FMRecommender import FM
from daisy.model.Item2VecRecommender import Item2Vec
from daisy.model.KNNCFRecommender import ItemKNNCF, UserKNNCF
from daisy.model.MFRecommender import MF
from daisy.model.NeuMFRecommender import NeuMF
from daisy.model.NFMRecommender import NFM
from daisy.model.NGCFRecommender import NGCF
from daisy.model.PopRecommender import MostPop
from daisy.model.PureSVDRecommender import PureSVD
from daisy.model.SLiMRecommender import SLiM
from daisy.model.VAECFRecommender import VAECF
9 changes: 7 additions & 2 deletions daisy/utils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,19 @@ def init_config(param_dict=None):
summarize hyper-parameter part (basic yaml + args + model yaml)
'''
config = dict()
basic_conf = yaml.load(open('./daisy/config/basic.yaml'), Loader=yaml.loader.SafeLoader)

current_path = os.path.dirname(os.path.realpath(__file__))
basic_init_file = os.path.join(current_path, '../config/basic.yaml')

basic_conf = yaml.load(open(basic_init_file), Loader=yaml.loader.SafeLoader)
config.update(basic_conf)

args = parse_args()
algo_name = config['algo_name'] if args.algo_name is None else args.algo_name
model_init_file = os.path.join(current_path, f'../config/model/{algo_name}.yaml')

model_conf = yaml.load(
open(f'./daisy/config/model/{algo_name}.yaml'), Loader=yaml.loader.SafeLoader)
open(model_init_file), Loader=yaml.loader.SafeLoader)
config.update(model_conf)

args_conf = vars(args)
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
name='daisyRec',
packages=[package for package in find_packages() if package.startswith('daisy')],
# packages = find_packages(exclude=['tests*']),
version='v2.1.0', # Ideally should be same as your GitHub release tag varsion
version='v2.1.1', # Ideally should be same as your GitHub release tag varsion
description=('An easy-to-use library for recommender systems.'),
long_description=long_description,
# long_description_content_type="text/markdown",
author='Yu Di',
author_email='[email protected]',
url='https://github.com/AmazingDD/daisyRec',
download_url='https://github.com/AmazingDD/daisyRec/archive/refs/tags/v2.1.0.tar.gz',
download_url='https://github.com/AmazingDD/daisyRec/archive/refs/tags/v2.1.1.tar.gz',
keywords=['ranking', 'recommendation'],
include_package_data=True,
install_requires=install_requires,
Expand Down

0 comments on commit 96bd6b9

Please sign in to comment.