liuyu/qlib
1
0
Fork 0
mirror of https://github.com/microsoft/qlib.git synced 2026-07-12 15:26:54 +08:00
Code Activity

Fix C.provider_uri

Browse Source
This commit is contained in:
zhupr
2020-09-30 16:10:28 +08:00
committed by you-n-g
parent 9637dc540e
commit 1f23eb9a30
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qlib/config.py
View File

@@ -207,14 +207,15 @@ class QlibConfig(Config):
def resolve_path(self): def resolve_path(self):
# resolve path # resolve path
if self["mount_path"] is not None: if self["mount_path"] is not None:
self["mount_path"]= str(Path(self["mount_path"]).expanduser().resolve()) self["mount_path"] = str(Path(self["mount_path"]).expanduser().resolve())
if self.get_uri_type() == QlibConfig.LOCAL_URI: if self.get_uri_type() == QlibConfig.LOCAL_URI:
self["provider_uri"] = str(Path(self["provider_uri"]).expanduser().resolve()) self["provider_uri"] = str(Path(self["provider_uri"]).expanduser().resolve())
def get_uri_type(self): def get_uri_type(self):
rm = re.match("^[^/ ]+:.+", self["provider_uri"]) rm = re.match("^[^/ ]+:.+", self["provider_uri"])
if rm is None: # Windows path is "C:\\"
if rm is None or Path(self["provider_uri"]).exists():
return QlibConfig.LOCAL_URI return QlibConfig.LOCAL_URI
else: else:
return QlibConfig.NFS_URI return QlibConfig.NFS_URI

5
qlib/data/data.py
View File

@@ -459,7 +459,7 @@ class DatasetProvider(object):
return data return data
@staticmethod @staticmethod
def expression_calculator(inst, start_time, end_time, freq, column_names, spans=None, C=None): def expression_calculator(inst, start_time, end_time, freq, column_names, spans=None, g_config=None):
""" """
Calculate the expressions for one instrument, return a df result. Calculate the expressions for one instrument, return a df result.
If the expression has been calculated before, load from cache. If the expression has been calculated before, load from cache.
@@ -467,6 +467,9 @@ class DatasetProvider(object):
return value: A data frame with index 'datetime' and other data columns. return value: A data frame with index 'datetime' and other data columns.
""" """
# FIXME: Windows OS or MacOS using spawn: https://docs.python.org/3.8/library/multiprocessing.html?highlight=spawn#contexts-and-start-methods
global C
C = g_config
# NOTE: This place is compatible with windows, windows multi-process is spawn # NOTE: This place is compatible with windows, windows multi-process is spawn
if getattr(ExpressionD, "_provider", None) is None: if getattr(ExpressionD, "_provider", None) is None:
register_all_wrappers() register_all_wrappers()