From 8ec94ccccf7c21d69067e1e7d92addfa3eb646d3 Mon Sep 17 00:00:00 2001 From: Gene Date: Mon, 25 Sep 2023 17:05:13 +0800 Subject: [PATCH] [FIX] Change print to logger --- learnware/market/database_ops.py | 5 +++-- learnware/market/easy.py | 9 ++++----- learnware/specification/rkme.py | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/learnware/market/database_ops.py b/learnware/market/database_ops.py index 557f9bf..38679c7 100644 --- a/learnware/market/database_ops.py +++ b/learnware/market/database_ops.py @@ -6,8 +6,9 @@ from sqlalchemy import ( import os import json from ..learnware import get_learnware_from_dirpath +from ..logger import get_module_logger - +logger = get_module_logger("database") DeclarativeBase = declarative_base() @@ -148,7 +149,7 @@ class DatabaseOperations(object): new_learnware = get_learnware_from_dirpath( id=id, semantic_spec=semantic_spec_dict, learnware_dirpath=folder_path ) - print(f'load learnware: {id}') + logger.info(f"Load learnware: {id}") learnware_list[id] = new_learnware # assert new_learnware is not None zip_list[id] = zip_path diff --git a/learnware/market/easy.py b/learnware/market/easy.py index ab9617e..f106c14 100644 --- a/learnware/market/easy.py +++ b/learnware/market/easy.py @@ -208,7 +208,7 @@ class EasyMarket(BaseMarket): logger.warning("Illegal semantic specification, please provide the right type.") return None, self.INVALID_LEARNWARE except: - print(semantic_spec) + logger.info(f"Semantic specification: {semantic_spec}") logger.warning("Illegal semantic specification, some keys are missing.") return None, self.INVALID_LEARNWARE @@ -637,7 +637,6 @@ class EasyMarket(BaseMarket): continue if key in ("Name", "Description"): - # print(f'{v1},{name2},{description2}') v1 = v1.lower() if v1 not in name2 and v1 not in description2: return False @@ -703,7 +702,7 @@ class EasyMarket(BaseMarket): else: user_rkme = user_info.stat_info["RKMEStatSpecification"] learnware_list = self._filter_by_rkme_spec_dimension(learnware_list, user_rkme) - print('after filter by rkme dimension, learnware_list length is %d' % len(learnware_list)) + logger.info(f"After filter by rkme dimension, learnware_list length is {len(learnware_list)}") sorted_dist_list, single_learnware_list = self._search_by_rkme_spec_single(learnware_list, user_rkme) if search_method == "auto": @@ -728,13 +727,13 @@ class EasyMarket(BaseMarket): sorted_score_list = merge_score_list[:-1] mixture_score = merge_score_list[-1] - print('after search by rkme spec, learnware_list length is %d' % len(learnware_list)) + logger.info(f"After search by rkme spec, learnware_list length is {len(learnware_list)}") # filter learnware with low score sorted_score_list, single_learnware_list = self._filter_by_rkme_spec_single( sorted_score_list, single_learnware_list ) - print('after filter by rkme spec, learnware_list length is %d' % len(learnware_list)) + logger.info(f"After filter by rkme spec, learnware_list length is {len(learnware_list)}") return sorted_score_list, single_learnware_list, mixture_score, mixture_learnware_list def delete_learnware(self, id: str) -> bool: diff --git a/learnware/specification/rkme.py b/learnware/specification/rkme.py index fa51012..60b8446 100644 --- a/learnware/specification/rkme.py +++ b/learnware/specification/rkme.py @@ -20,15 +20,15 @@ try: except ImportError: _FAISS_INSTALLED = False -if not _FAISS_INSTALLED: - print("Required faiss version >= 1.7.1 is not detected!") - print('Please run "conda install -c pytorch faiss-cpu" first.') - from .base import BaseStatSpecification from ..logger import get_module_logger logger = get_module_logger("rkme") +if not _FAISS_INSTALLED: + logger.warning("Required faiss version >= 1.7.1 is not detected!") + logger.warning('Please run "conda install -c pytorch faiss-cpu" first.') + class RKMEStatSpecification(BaseStatSpecification): """Reduced Kernel Mean Embedding (RKME) Specification"""