Skip to content

Commit

Permalink
Fix import guard checks (NVIDIA#7124)
Browse files Browse the repository at this point in the history
Signed-off-by: smajumdar <titu1994@gmail.com>
  • Loading branch information
titu1994 authored Jul 28, 2023
1 parent fcfc0eb commit a46e325
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion nemo/utils/model_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ def check_lib_version(lib_name: str, checked_version: str, operator) -> Tuple[Op
f"Could not check version compatibility."
)
return False, msg
except (ImportError, ModuleNotFoundError):
except (ImportError, ModuleNotFoundError, AttributeError):
pass

msg = f"Lib {lib_name} has not been installed. Please use pip or conda to install this package."
Expand Down
21 changes: 14 additions & 7 deletions tests/collections/nlp/test_flash_attention.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,23 @@
except (ImportError, ModuleNotFoundError):
HAVE_TRITON = False

import pynvml
try:
import pynvml

HAVE_PYNVML = True
except (ImportError, ModuleNotFoundError):
HAVE_PYNVML = False


def HAVE_AMPERE_GPU():
pynvml.nvmlInit()
handle = pynvml.nvmlDeviceGetHandleByIndex(0)
device_arch = pynvml.nvmlDeviceGetArchitecture(handle)
pynvml.nvmlShutdown()
return device_arch == pynvml.NVML_DEVICE_ARCH_AMPERE

if HAVE_PYNVML:
pynvml.nvmlInit()
handle = pynvml.nvmlDeviceGetHandleByIndex(0)
device_arch = pynvml.nvmlDeviceGetArchitecture(handle)
pynvml.nvmlShutdown()
return device_arch == pynvml.NVML_DEVICE_ARCH_AMPERE
else:
return False

@pytest.mark.run_only_on('GPU')
@pytest.mark.skipif(not HAVE_APEX, reason="apex is not installed")
Expand Down

0 comments on commit a46e325

Please sign in to comment.