From 129c9e5251ac7c2f793cca39fd67f35cf398642a Mon Sep 17 00:00:00 2001 From: D-X-Y <280835372@qq.com> Date: Wed, 19 May 2021 08:20:44 +0000 Subject: [PATCH] Refine lib -> xautodl --- exps/LFNA/basic-his.py | 25 +++++++++++++------------ exps/LFNA/basic-prev.py | 24 +++++++++++++----------- exps/LFNA/basic-same.py | 24 +++++++++++++----------- exps/basic-main.py | 7 ++++++- exps/search-shape.py | 7 ++++++- exps/trading/baselines.py | 13 ++++--------- exps/trading/organize_results.py | 6 +----- exps/trading/workflow_tt.py | 13 ++++--------- 8 files changed, 60 insertions(+), 59 deletions(-) diff --git a/exps/LFNA/basic-his.py b/exps/LFNA/basic-his.py index d571c1f..0752098 100644 --- a/exps/LFNA/basic-his.py +++ b/exps/LFNA/basic-his.py @@ -6,21 +6,22 @@ import sys, time, copy, torch, random, argparse from tqdm import tqdm from copy import deepcopy -from pathlib import Path -lib_dir = (Path(__file__).parent / ".." / ".." / "lib").resolve() -if str(lib_dir) not in sys.path: - sys.path.insert(0, str(lib_dir)) -from procedures import prepare_seed, prepare_logger, save_checkpoint, copy_checkpoint -from log_utils import time_string -from log_utils import AverageMeter, convert_secs2time +from xautodl.procedures import ( + prepare_seed, + prepare_logger, + save_checkpoint, + copy_checkpoint, +) +from xautodl.log_utils import time_string +from xautodl.log_utils import AverageMeter, convert_secs2time -from utils import split_str2indexes +from xautodl.utils import split_str2indexes -from procedures.advanced_main import basic_train_fn, basic_eval_fn -from procedures.metric_utils import SaveMetric, MSEMetric, ComposeMetric -from datasets.synthetic_core import get_synthetic_env -from models.xcore import get_model +from xautodl.procedures.advanced_main import basic_train_fn, basic_eval_fn +from xautodl.procedures.metric_utils import SaveMetric, MSEMetric, ComposeMetric +from xautodl.datasets.synthetic_core import get_synthetic_env +from xautodl.models.xcore import get_model from lfna_utils import lfna_setup diff --git a/exps/LFNA/basic-prev.py b/exps/LFNA/basic-prev.py index 96756c0..d94a170 100644 --- a/exps/LFNA/basic-prev.py +++ b/exps/LFNA/basic-prev.py @@ -9,19 +9,21 @@ from tqdm import tqdm from copy import deepcopy from pathlib import Path -lib_dir = (Path(__file__).parent / ".." / ".." / "lib").resolve() -if str(lib_dir) not in sys.path: - sys.path.insert(0, str(lib_dir)) -from procedures import prepare_seed, prepare_logger, save_checkpoint, copy_checkpoint -from log_utils import time_string -from log_utils import AverageMeter, convert_secs2time +from xautodl.procedures import ( + prepare_seed, + prepare_logger, + save_checkpoint, + copy_checkpoint, +) +from xautodl.log_utils import time_string +from xautodl.log_utils import AverageMeter, convert_secs2time -from utils import split_str2indexes +from xautodl.utils import split_str2indexes -from procedures.advanced_main import basic_train_fn, basic_eval_fn -from procedures.metric_utils import SaveMetric, MSEMetric, ComposeMetric -from datasets.synthetic_core import get_synthetic_env -from models.xcore import get_model +from xautodl.procedures.advanced_main import basic_train_fn, basic_eval_fn +from xautodl.procedures.metric_utils import SaveMetric, MSEMetric, ComposeMetric +from xautodl.datasets.synthetic_core import get_synthetic_env +from xautodl.models.xcore import get_model from lfna_utils import lfna_setup diff --git a/exps/LFNA/basic-same.py b/exps/LFNA/basic-same.py index 3f53528..83c4592 100644 --- a/exps/LFNA/basic-same.py +++ b/exps/LFNA/basic-same.py @@ -9,19 +9,21 @@ from tqdm import tqdm from copy import deepcopy from pathlib import Path -lib_dir = (Path(__file__).parent / ".." / ".." / "lib").resolve() -if str(lib_dir) not in sys.path: - sys.path.insert(0, str(lib_dir)) -from procedures import prepare_seed, prepare_logger, save_checkpoint, copy_checkpoint -from log_utils import time_string -from log_utils import AverageMeter, convert_secs2time +from xautodl.procedures import ( + prepare_seed, + prepare_logger, + save_checkpoint, + copy_checkpoint, +) +from xautodl.log_utils import time_string +from xautodl.log_utils import AverageMeter, convert_secs2time -from utils import split_str2indexes +from xautodl.utils import split_str2indexes -from procedures.advanced_main import basic_train_fn, basic_eval_fn -from procedures.metric_utils import SaveMetric, MSEMetric, ComposeMetric -from datasets.synthetic_core import get_synthetic_env -from models.xcore import get_model +from xautodl.procedures.advanced_main import basic_train_fn, basic_eval_fn +from xautodl.procedures.metric_utils import SaveMetric, MSEMetric, ComposeMetric +from xautodl.datasets.synthetic_core import get_synthetic_env +from xautodl.models.xcore import get_model from lfna_utils import lfna_setup diff --git a/exps/basic-main.py b/exps/basic-main.py index b6d896a..1fa72e2 100644 --- a/exps/basic-main.py +++ b/exps/basic-main.py @@ -10,7 +10,12 @@ from pathlib import Path from xautodl.datasets import get_datasets from xautodl.config_utils import load_config, obtain_basic_args as obtain_args -from xautodl.procedures import prepare_seed, prepare_logger, save_checkpoint, copy_checkpoint +from xautodl.procedures import ( + prepare_seed, + prepare_logger, + save_checkpoint, + copy_checkpoint, +) from xautodl.procedures import get_optim_scheduler, get_procedures from xautodl.models import obtain_model from xautodl.nas_infer_model import obtain_nas_infer_model diff --git a/exps/search-shape.py b/exps/search-shape.py index 301d7db..4112dd9 100644 --- a/exps/search-shape.py +++ b/exps/search-shape.py @@ -15,7 +15,12 @@ from xautodl.config_utils import ( configure2str, obtain_search_single_args as obtain_args, ) -from xautodl.procedures import prepare_seed, prepare_logger, save_checkpoint, copy_checkpoint +from xautodl.procedures import ( + prepare_seed, + prepare_logger, + save_checkpoint, + copy_checkpoint, +) from xautodl.procedures import get_optim_scheduler, get_procedures from xautodl.datasets import get_datasets, SearchDataset from xautodl.models import obtain_search_model, obtain_model, change_key diff --git a/exps/trading/baselines.py b/exps/trading/baselines.py index ecbe246..5576b8f 100644 --- a/exps/trading/baselines.py +++ b/exps/trading/baselines.py @@ -24,18 +24,13 @@ import copy from datetime import datetime import argparse from collections import OrderedDict -from pathlib import Path from pprint import pprint import ruamel.yaml as yaml -lib_dir = (Path(__file__).parent / ".." / ".." / "lib").resolve() -if str(lib_dir) not in sys.path: - sys.path.insert(0, str(lib_dir)) - -from config_utils import arg_str2bool -from procedures.q_exps import update_gpu -from procedures.q_exps import update_market -from procedures.q_exps import run_exp +from xautodl.config_utils import arg_str2bool +from xautodl.procedures.q_exps import update_gpu +from xautodl.procedures.q_exps import update_market +from xautodl.procedures.q_exps import run_exp import qlib from qlib.utils import init_instance_by_config diff --git a/exps/trading/organize_results.py b/exps/trading/organize_results.py index 1f88d30..bbbbed7 100644 --- a/exps/trading/organize_results.py +++ b/exps/trading/organize_results.py @@ -7,15 +7,11 @@ import os, re, sys, argparse import numpy as np from typing import List, Text from collections import defaultdict, OrderedDict -from pathlib import Path from pprint import pprint import ruamel.yaml as yaml -lib_dir = (Path(__file__).parent / ".." / ".." / "lib").resolve() -if str(lib_dir) not in sys.path: - sys.path.insert(0, str(lib_dir)) +from xautodl.config_utils import arg_str2bool -from config_utils import arg_str2bool import qlib from qlib.config import REG_CN from qlib.workflow import R diff --git a/exps/trading/workflow_tt.py b/exps/trading/workflow_tt.py index 3df31ba..876b492 100644 --- a/exps/trading/workflow_tt.py +++ b/exps/trading/workflow_tt.py @@ -6,16 +6,11 @@ # - https://github.com/microsoft/qlib/blob/main/examples/workflow_by_code.py # python exps/trading/workflow_tt.py --gpu 1 --market csi300 ##################################################### -import sys, argparse -from pathlib import Path +import argparse -lib_dir = (Path(__file__).parent / ".." / ".." / "lib").resolve() -if str(lib_dir) not in sys.path: - sys.path.insert(0, str(lib_dir)) - -from procedures.q_exps import update_gpu -from procedures.q_exps import update_market -from procedures.q_exps import run_exp +from xautodl.procedures.q_exps import update_gpu +from xautodl.procedures.q_exps import update_market +from xautodl.procedures.q_exps import run_exp import qlib from qlib.config import C