-
Notifications
You must be signed in to change notification settings - Fork 0
Fix ubuntu symbol drop #109
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -21,9 +21,16 @@ def parse_library_names(libdir): | |||||||||||||||||||||||||
| library_names.extend(['netcdf']) | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| # move current library name to first | ||||||||||||||||||||||||||
| current = [item for item in library_names if item.startswith('snap')] | ||||||||||||||||||||||||||
| other = [item for item in library_names if not item.startswith('snap')] | ||||||||||||||||||||||||||
| return current + other | ||||||||||||||||||||||||||
| #current = [item for item in library_names if item.startswith('snap')] | ||||||||||||||||||||||||||
| #other = [item for item in library_names if not item.startswith('snap')] | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| # 1) non-cuda libs first (consumers) | ||||||||||||||||||||||||||
| snap_non_cuda = [l for l in library_names if l.startswith("snap") and "cuda" not in l] | ||||||||||||||||||||||||||
| # 2) cuda libs last (providers) | ||||||||||||||||||||||||||
| snap_cuda = [l for l in library_names if l.startswith("snap") and "cuda" in l] | ||||||||||||||||||||||||||
| # 3) everything else | ||||||||||||||||||||||||||
| other = [l for l in library_names if not l.startswith("snap")] | ||||||||||||||||||||||||||
| return snap_non_cuda + other + snap_cuda | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
| site_dir = sysconfig.get_paths()["purelib"] | ||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||
|
|
@@ -58,11 +65,13 @@ def parse_library_names(libdir): | |||||||||||||||||||||||||
| ] | ||||||||||||||||||||||||||
| else: | ||||||||||||||||||||||||||
| extra_link_args = [ | ||||||||||||||||||||||||||
| "-Wl,--no-as-needed", | ||||||||||||||||||||||||||
| "-Wl,-rpath,$ORIGIN/lib", | ||||||||||||||||||||||||||
| "-Wl,-rpath,$ORIGIN/../torch/lib", | ||||||||||||||||||||||||||
| "-Wl,-rpath,$ORIGIN/../pydisort/lib", | ||||||||||||||||||||||||||
| "-Wl,-rpath,$ORIGIN/../pyharp/lib", | ||||||||||||||||||||||||||
| "-Wl,-rpath,$ORIGIN/../kintera/lib", | ||||||||||||||||||||||||||
| "-Wl,--as-needed", | ||||||||||||||||||||||||||
|
Comment on lines
+68
to
+74
|
||||||||||||||||||||||||||
| "-Wl,--no-as-needed", | |
| "-Wl,-rpath,$ORIGIN/lib", | |
| "-Wl,-rpath,$ORIGIN/../torch/lib", | |
| "-Wl,-rpath,$ORIGIN/../pydisort/lib", | |
| "-Wl,-rpath,$ORIGIN/../pyharp/lib", | |
| "-Wl,-rpath,$ORIGIN/../kintera/lib", | |
| "-Wl,--as-needed", | |
| "-Wl,-rpath,$ORIGIN/lib", | |
| "-Wl,-rpath,$ORIGIN/../torch/lib", | |
| "-Wl,-rpath,$ORIGIN/../pydisort/lib", | |
| "-Wl,-rpath,$ORIGIN/../pyharp/lib", | |
| "-Wl,-rpath,$ORIGIN/../kintera/lib", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The commented-out code should be removed rather than kept as comments. Leaving old code commented out reduces code maintainability and can cause confusion for future developers.