Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[llvm] Further improve LLVM 10 compatibility by using RTLD_DEEPBIND #1355

Merged
merged 7 commits into from
Jul 2, 2020
Merged

[llvm] Further improve LLVM 10 compatibility by using RTLD_DEEPBIND #1355

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2cb4a42
[misc] Further improve libLLVM-10.so compatibility by using RTLD_DEEP…
archibate Jun 29, 2020
52d7088
off-topic
archibate Jun 29, 2020
a6d09d3
[skip ci] enforce code format
taichi-gardener Jun 29, 2020
d5b1cc5
improve error message
archibate Jun 30, 2020
d42af36
[skip ci] enforce code format
taichi-gardener Jun 30, 2020
f389449
Merge branch 'master' into further-improve-llvm-so-compat
archibate Jul 1, 2020
b6ba8ef
[skip ci] Update taichi/ir/expr.cpp
archibate Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
*.swp
*.swo
/.vs
/.*_localrc
/tags
/Debug
*.sdf
/x64
Expand Down
2 changes: 1 addition & 1 deletion python/taichi/core/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def import_ti_core(tmp_dir=None):
global ti_core
if get_os_name() != 'win':
old_flags = sys.getdlopenflags()
sys.setdlopenflags(2) # 2 = RTLD_NOW
sys.setdlopenflags(2 | 8) # RTLD_NOW | RTLD_DEEPBIND
else:
pyddir = os.path.join(package_root(), 'lib')
os.environ['PATH'] += ';' + pyddir
Expand Down
2 changes: 1 addition & 1 deletion taichi/backends/opengl/opengl_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ bool initialize_opengl(bool error_tolerance) {
desc = "Unknown Error";
if (error_tolerance) {
// error tolerated, returning false
TI_TRACE("[glsl] cannot create GLFW window: error {}: {}", status, desc);
TI_DEBUG("[glsl] cannot create GLFW window: error {}: {}", status, desc);
supported = std::make_optional<bool>(false);
return false;
}
Expand Down