From 4f86712579750006eea4d1b3b47066fd732e784d Mon Sep 17 00:00:00 2001 From: bxdd Date: Wed, 11 Nov 2020 21:05:52 +0800 Subject: [PATCH] fix exit not found in ipython & fix re about provider_uri --- qlib/__init__.py | 1 + qlib/config.py | 12 ++++++++---- qlib/data/ops.py | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/qlib/__init__.py b/qlib/__init__.py index f63aa26cc..bce264f1a 100644 --- a/qlib/__init__.py +++ b/qlib/__init__.py @@ -58,6 +58,7 @@ def init(default_conf="client", **kwargs): # check path if server/local if C.get_uri_type() == QlibConfig.LOCAL_URI: + print("?") if not os.path.exists(C["provider_uri"]): if C["auto_mount"]: LOG.error( diff --git a/qlib/config.py b/qlib/config.py index ff01fe5e8..6070ececd 100644 --- a/qlib/config.py +++ b/qlib/config.py @@ -211,12 +211,16 @@ class QlibConfig(Config): self["provider_uri"] = str(Path(self["provider_uri"]).expanduser().resolve()) def get_uri_type(self): - rm = re.match("^[^/ ]+:.+", self["provider_uri"]) + win_rm = re.match("^[a-zA-Z]:.*", self["provider_uri"]) + nfs_or_win_rm = re.match("^[^/]+:.+", self["provider_uri"]) # Windows path is "C:\\" - if rm is None or Path(self["provider_uri"]).exists(): - return QlibConfig.LOCAL_URI + if win_rm is None: + if nfs_or_win_rm is None: + return QlibConfig.LOCAL_URI + else: + return QlibConfig.NFS_URI else: - return QlibConfig.NFS_URI + return QlibConfig.LOCAL_URI def get_data_path(self): if self.get_uri_type() == QlibConfig.LOCAL_URI: diff --git a/qlib/data/ops.py b/qlib/data/ops.py index 9f66a88af..309dd24fc 100644 --- a/qlib/data/ops.py +++ b/qlib/data/ops.py @@ -5,6 +5,7 @@ from __future__ import division from __future__ import print_function +import sys import numpy as np import pandas as pd @@ -17,7 +18,7 @@ try: except ImportError as err: print(err) print("Do not import qlib package in the repository directory") - exit(-1) + sys.exit(-1) __all__ = ( "Ref",