update 2.1.3

daisy/__init__.py

@@ -1 +1 @@
-__version__ = 'v2.1.1'
+__version__ = 'v2.1.3'

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)

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')

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,