From bb64e0ce1fe027c6df9e57dbeee502b5605ee920 Mon Sep 17 00:00:00 2001 From: amazingDD <1172392977@gmail.com> Date: Thu, 28 Jul 2022 18:40:23 +0800 Subject: [PATCH] update 2.1.3 --- daisy/__init__.py | 2 +- daisy/{config => assets}/__init__.py | 0 daisy/{config => assets}/basic.yaml | 0 daisy/{config/model => assets}/ease.yaml | 0 daisy/{config/model => assets}/fm.yaml | 0 daisy/{config/model => assets}/infae.yaml | 0 daisy/{config/model => assets}/item2vec.yaml | 0 daisy/{config/model => assets}/itemknn.yaml | 0 daisy/{config/model => assets}/mf.yaml | 0 daisy/{config/model => assets}/mostpop.yaml | 0 daisy/{config/model => assets}/multi-vae.yaml | 0 daisy/{config/model => assets}/neumf.yaml | 0 daisy/{config/model => assets}/nfm.yaml | 0 daisy/{config/model => assets}/ngcf.yaml | 0 daisy/{config/model => assets}/puresvd.yaml | 0 daisy/{config/model => assets}/slim.yaml | 0 daisy/utils/config.py | 4 ++-- run_examples/test.py | 4 +++- setup.cfg | 2 -- setup.py | 12 ++++++++---- 20 files changed, 14 insertions(+), 10 deletions(-) rename daisy/{config => assets}/__init__.py (100%) rename daisy/{config => assets}/basic.yaml (100%) rename daisy/{config/model => assets}/ease.yaml (100%) rename daisy/{config/model => assets}/fm.yaml (100%) rename daisy/{config/model => assets}/infae.yaml (100%) rename daisy/{config/model => assets}/item2vec.yaml (100%) rename daisy/{config/model => assets}/itemknn.yaml (100%) rename daisy/{config/model => assets}/mf.yaml (100%) rename daisy/{config/model => assets}/mostpop.yaml (100%) rename daisy/{config/model => assets}/multi-vae.yaml (100%) rename daisy/{config/model => assets}/neumf.yaml (100%) rename daisy/{config/model => assets}/nfm.yaml (100%) rename daisy/{config/model => assets}/ngcf.yaml (100%) rename daisy/{config/model => assets}/puresvd.yaml (100%) rename daisy/{config/model => assets}/slim.yaml (100%) delete mode 100644 setup.cfg diff --git a/daisy/__init__.py b/daisy/__init__.py index 73f37a5..6c49b9b 100644 --- a/daisy/__init__.py +++ b/daisy/__init__.py @@ -1 +1 @@ -__version__ = 'v2.1.1' +__version__ = 'v2.1.3' diff --git a/daisy/config/__init__.py b/daisy/assets/__init__.py similarity index 100% rename from daisy/config/__init__.py rename to daisy/assets/__init__.py diff --git a/daisy/config/basic.yaml b/daisy/assets/basic.yaml similarity index 100% rename from daisy/config/basic.yaml rename to daisy/assets/basic.yaml diff --git a/daisy/config/model/ease.yaml b/daisy/assets/ease.yaml similarity index 100% rename from daisy/config/model/ease.yaml rename to daisy/assets/ease.yaml diff --git a/daisy/config/model/fm.yaml b/daisy/assets/fm.yaml similarity index 100% rename from daisy/config/model/fm.yaml rename to daisy/assets/fm.yaml diff --git a/daisy/config/model/infae.yaml b/daisy/assets/infae.yaml similarity index 100% rename from daisy/config/model/infae.yaml rename to daisy/assets/infae.yaml diff --git a/daisy/config/model/item2vec.yaml b/daisy/assets/item2vec.yaml similarity index 100% rename from daisy/config/model/item2vec.yaml rename to daisy/assets/item2vec.yaml diff --git a/daisy/config/model/itemknn.yaml b/daisy/assets/itemknn.yaml similarity index 100% rename from daisy/config/model/itemknn.yaml rename to daisy/assets/itemknn.yaml diff --git a/daisy/config/model/mf.yaml b/daisy/assets/mf.yaml similarity index 100% rename from daisy/config/model/mf.yaml rename to daisy/assets/mf.yaml diff --git a/daisy/config/model/mostpop.yaml b/daisy/assets/mostpop.yaml similarity index 100% rename from daisy/config/model/mostpop.yaml rename to daisy/assets/mostpop.yaml diff --git a/daisy/config/model/multi-vae.yaml b/daisy/assets/multi-vae.yaml similarity index 100% rename from daisy/config/model/multi-vae.yaml rename to daisy/assets/multi-vae.yaml diff --git a/daisy/config/model/neumf.yaml b/daisy/assets/neumf.yaml similarity index 100% rename from daisy/config/model/neumf.yaml rename to daisy/assets/neumf.yaml diff --git a/daisy/config/model/nfm.yaml b/daisy/assets/nfm.yaml similarity index 100% rename from daisy/config/model/nfm.yaml rename to daisy/assets/nfm.yaml diff --git a/daisy/config/model/ngcf.yaml b/daisy/assets/ngcf.yaml similarity index 100% rename from daisy/config/model/ngcf.yaml rename to daisy/assets/ngcf.yaml diff --git a/daisy/config/model/puresvd.yaml b/daisy/assets/puresvd.yaml similarity index 100% rename from daisy/config/model/puresvd.yaml rename to daisy/assets/puresvd.yaml diff --git a/daisy/config/model/slim.yaml b/daisy/assets/slim.yaml similarity index 100% rename from daisy/config/model/slim.yaml rename to daisy/assets/slim.yaml diff --git a/daisy/utils/config.py b/daisy/utils/config.py index fb86bb7..5cec79a 100644 --- a/daisy/utils/config.py +++ b/daisy/utils/config.py @@ -48,14 +48,14 @@ def init_config(param_dict=None): config = dict() current_path = os.path.dirname(os.path.realpath(__file__)) - basic_init_file = os.path.join(current_path, '../config/basic.yaml') + basic_init_file = os.path.join(current_path, '../assets/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_init_file = os.path.join(current_path, f'../assets/{algo_name}.yaml') model_conf = yaml.load( open(model_init_file), Loader=yaml.loader.SafeLoader) diff --git a/run_examples/test.py b/run_examples/test.py index b070e7a..485481f 100644 --- a/run_examples/test.py +++ b/run_examples/test.py @@ -6,7 +6,7 @@ from daisy.utils.loader import RawDataReader, Preprocessor from daisy.utils.sampler import BasicNegtiveSampler, SkipGramNegativeSampler from daisy.utils.dataset import get_dataloader, BasicDataset, CandidatesDataset, AEDataset -from daisy.utils.utils import get_ur, get_history_matrix, build_candidates_set, get_adj_mat +from daisy.utils.utils import ensure_dir, get_ur, get_history_matrix, build_candidates_set, get_adj_mat from daisy.utils.metrics import calc_ranking_results from daisy.model.KNNCFRecommender import ItemKNNCF @@ -126,5 +126,7 @@ algo_prefix = f"{config['loss_type']}_{config['algo_name']}" common_prefix = f"with_{config['sample_ratio']}{config['sample_method']}" + ensure_dir(result_save_path) + results = calc_ranking_results(test_ur, preds, test_u, config) results.to_csv(f'{result_save_path}{algo_prefix}_{common_prefix}_kpi_results.csv') diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index b88034e..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[metadata] -description-file = README.md diff --git a/setup.py b/setup.py index 99bf4d3..953f2bc 100644 --- a/setup.py +++ b/setup.py @@ -33,23 +33,27 @@ } print('=============================================') -print([package for package in find_packages() if package.startswith('daisy')]) +# print([package for package in find_packages() if package.startswith('daisy')]) +print(find_packages(where="daisy")) print('=============================================') setup( name='daisyRec', packages=[package for package in find_packages() if package.startswith('daisy')], + # packages=find_packages(where="daisy"), + # package_dir={"": "daisy"}, + package_data={"": ["*.yaml"]}, # packages = find_packages(exclude=['tests*']), - version='v2.1.1', # Ideally should be same as your GitHub release tag varsion + version='v2.1.3', # 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='di.yu.2021@mitb.smu.edu.sg', url='https://github.com/AmazingDD/daisyRec', - download_url='https://github.com/AmazingDD/daisyRec/archive/refs/tags/v2.1.1.tar.gz', + download_url='https://github.com/AmazingDD/daisyRec/archive/refs/tags/v2.1.3.tar.gz', keywords=['ranking', 'recommendation'], - include_package_data=True, + # include_package_data=True, install_requires=install_requires, setup_requires=setup_requires, extras_require=extras_require,