Commit 659a7dfc authored by Tim Dettmers's avatar Tim Dettmers
Browse files

Fixing #300.

parent eb1c331c
...@@ -212,12 +212,12 @@ def find_cuda_lib_in(paths_list_candidate: str) -> Set[Path]: ...@@ -212,12 +212,12 @@ def find_cuda_lib_in(paths_list_candidate: str) -> Set[Path]:
def warn_in_case_of_duplicates(results_paths: Set[Path]) -> None: def warn_in_case_of_duplicates(results_paths: Set[Path]) -> None:
if len(results_paths) > 1: if len(results_paths) > 1:
warning_msg = ( warning_msg = (
f"Found duplicate {CUDA_RUNTIME_LIB} files: {results_paths}.. " f"Found duplicate {CUDA_RUNTIME_LIBS} files: {results_paths}.. "
"We'll flip a coin and try one of these, in order to fail forward.\n" "We'll flip a coin and try one of these, in order to fail forward.\n"
"Either way, this might cause trouble in the future:\n" "Either way, this might cause trouble in the future:\n"
"If you get `CUDA error: invalid device function` errors, the above " "If you get `CUDA error: invalid device function` errors, the above "
"might be the cause and the solution is to make sure only one " "might be the cause and the solution is to make sure only one "
f"{CUDA_RUNTIME_LIB} in the paths that we search based on your env.") f"{CUDA_RUNTIME_LIBS} in the paths that we search based on your env.")
CUDASetup.get_instance().add_log_entry(warning_msg, is_warning=True) CUDASetup.get_instance().add_log_entry(warning_msg, is_warning=True)
...@@ -245,7 +245,7 @@ def determine_cuda_runtime_lib_path() -> Union[Path, None]: ...@@ -245,7 +245,7 @@ def determine_cuda_runtime_lib_path() -> Union[Path, None]:
return next(iter(conda_cuda_libs)) return next(iter(conda_cuda_libs))
CUDASetup.get_instance().add_log_entry(f'{candidate_env_vars["CONDA_PREFIX"]} did not contain ' CUDASetup.get_instance().add_log_entry(f'{candidate_env_vars["CONDA_PREFIX"]} did not contain '
f'{CUDA_RUNTIME_LIB} as expected! Searching further paths...', is_warning=True) f'{CUDA_RUNTIME_LIBS} as expected! Searching further paths...', is_warning=True)
if "LD_LIBRARY_PATH" in candidate_env_vars: if "LD_LIBRARY_PATH" in candidate_env_vars:
lib_ld_cuda_libs = find_cuda_lib_in(candidate_env_vars["LD_LIBRARY_PATH"]) lib_ld_cuda_libs = find_cuda_lib_in(candidate_env_vars["LD_LIBRARY_PATH"])
...@@ -255,7 +255,7 @@ def determine_cuda_runtime_lib_path() -> Union[Path, None]: ...@@ -255,7 +255,7 @@ def determine_cuda_runtime_lib_path() -> Union[Path, None]:
warn_in_case_of_duplicates(lib_ld_cuda_libs) warn_in_case_of_duplicates(lib_ld_cuda_libs)
CUDASetup.get_instance().add_log_entry(f'{candidate_env_vars["LD_LIBRARY_PATH"]} did not contain ' CUDASetup.get_instance().add_log_entry(f'{candidate_env_vars["LD_LIBRARY_PATH"]} did not contain '
f'{CUDA_RUNTIME_LIB} as expected! Searching further paths...', is_warning=True) f'{CUDA_RUNTIME_LIBS} as expected! Searching further paths...', is_warning=True)
remaining_candidate_env_vars = { remaining_candidate_env_vars = {
env_var: value for env_var, value in candidate_env_vars.items() env_var: value for env_var, value in candidate_env_vars.items()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment