CLI Fixes & ESMI import handling

Signed-off-by: Maisam Arif <maisarif@amd.com>
Change-Id: I08e66d2bdbe37064fd73f42eeb9199f1e3bc3404


[ROCm/amdsmi commit: 6ec87b6a23]

projects/amdsmi/py-interface/__init__.py

@@ -29,20 +29,24 @@ from .amdsmi_interface import amdsmi_get_processor_handles
 from .amdsmi_interface import amdsmi_get_socket_handles
 from .amdsmi_interface import amdsmi_get_socket_info
 
-from .amdsmi_interface import amdsmi_get_cpusocket_handles
-from .amdsmi_interface import amdsmi_get_cpusocket_info
-from .amdsmi_interface import amdsmi_get_cpucore_handles
-from .amdsmi_interface import amdsmi_get_cpu_hsmp_proto_ver
-from .amdsmi_interface import amdsmi_get_cpu_smu_fw_version
-from .amdsmi_interface import amdsmi_get_cpu_core_energy
-from .amdsmi_interface import amdsmi_get_cpu_socket_energy
-from .amdsmi_interface import amdsmi_get_cpu_prochot_status
-from .amdsmi_interface import amdsmi_get_cpu_fclk_mclk
-from .amdsmi_interface import amdsmi_get_cpu_cclk_limit
-from .amdsmi_interface import amdsmi_get_cpu_socket_current_active_freq_limit
-from .amdsmi_interface import amdsmi_get_cpu_socket_freq_range
-from .amdsmi_interface import amdsmi_get_cpu_core_current_freq_limit
-from .amdsmi_interface import amdsmi_get_cpu_socket_power
+# ESMI Dependent Functions
+try:
+    from .amdsmi_interface import amdsmi_get_cpusocket_handles
+    from .amdsmi_interface import amdsmi_get_cpusocket_info
+    from .amdsmi_interface import amdsmi_get_cpucore_handles
+    from .amdsmi_interface import amdsmi_get_cpu_hsmp_proto_ver
+    from .amdsmi_interface import amdsmi_get_cpu_smu_fw_version
+    from .amdsmi_interface import amdsmi_get_cpu_core_energy
+    from .amdsmi_interface import amdsmi_get_cpu_socket_energy
+    from .amdsmi_interface import amdsmi_get_cpu_prochot_status
+    from .amdsmi_interface import amdsmi_get_cpu_fclk_mclk
+    from .amdsmi_interface import amdsmi_get_cpu_cclk_limit
+    from .amdsmi_interface import amdsmi_get_cpu_socket_current_active_freq_limit
+    from .amdsmi_interface import amdsmi_get_cpu_socket_freq_range
+    from .amdsmi_interface import amdsmi_get_cpu_core_current_freq_limit
+    from .amdsmi_interface import amdsmi_get_cpu_socket_power
+except AttributeError:
+    pass
 
 from .amdsmi_interface import amdsmi_get_gpu_device_bdf
 from .amdsmi_interface import amdsmi_get_gpu_device_uuid