lzhengning
/
JittorMirror
mirror of https://github.com/Jittor/Jittor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

os polish

This commit is contained in:
Dun Liang 2021-05-14 15:16:16 +08:00
parent 504442e47a
commit 67e8e9a1ea
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/jittor/__init__.py
View File

@ -9,7 +9,7 @@
# file 'LICENSE.txt', which is part of this source code package. # file 'LICENSE.txt', which is part of this source code package.
# *************************************************************** # ***************************************************************
__version__ = '1.2.3.5' __version__ = '1.2.3.6'
from . import lock from . import lock
with lock.lock_scope(): with lock.lock_scope():
ori_int = int ori_int = int

13
python/jittor/compiler.py
View File

@ -997,8 +997,8 @@ with open("/etc/os-release", "r", encoding='utf8') as f:
os_release[a[0]] = a[1].replace("\"", "") os_release[a[0]] = a[1].replace("\"", "")
os_type = { os_type = {
"ubuntu": "", "ubuntu": "ubuntu",
"debian": "", "debian": "ubuntu",
"centos": "centos", "centos": "centos",
} }
version_file = os.path.join(jittor_path, "version") version_file = os.path.join(jittor_path, "version")
@ -1008,13 +1008,12 @@ if os.path.isfile(version_file) and not os.path.isdir(os.path.join(jittor_path,
# key = f"{version}-{cc_type}-{'cuda' if has_cuda else 'cpu'}.o" # key = f"{version}-{cc_type}-{'cuda' if has_cuda else 'cpu'}.o"
key = f"{version}-g++-cpu" key = f"{version}-g++-cpu"
os_id = os_release["ID"] os_id = os_release["ID"]
os_key = os_type.get(os_id, "") os_key = os_type.get(os_id, "ubuntu")
LOG.i("OS type:", os_id, "OS key", os_key) LOG.i("OS type:", os_id, " OS key:", os_key)
if len(os_key): key += '-' + os_key + '.o'
key += '-' + os_key
# TODO: open the website # TODO: open the website
extra_obj = os.path.join(cache_path, key) extra_obj = os.path.join(cache_path, key)
url = os.path.join("https://cg.cs.tsinghua.edu.cn/jittor/assets/build/"+key+".o") url = os.path.join("https://cg.cs.tsinghua.edu.cn/jittor/assets/build/"+key)
jit_utils.download(url, extra_obj) jit_utils.download(url, extra_obj)
files.append(extra_obj) files.append(extra_obj)