The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Better handle torch being imported by prestartup nodes. (#11383)
comfyanonymous16d85ea13342
diff --git a/main.py b/main.pyindex 0d02a087b..0e07a95da 100644--- a/main.py+++ b/main.py@@ -23,6 +23,38 @@ if __name__ == "__main__":setup_logger(log_level=args.verbose, use_stdout=args.log_stdout)+if os.name == "nt":+ os.environ['MIMALLOC_PURGE_DELAY'] = '0'++if __name__ == "__main__":+ os.environ['TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL'] = '1'+ if args.default_device is not None:+ default_dev = args.default_device+ devices = list(range(32))+ devices.remove(default_dev)+ devices.insert(0, default_dev)+ devices = ','.join(map(str, devices))+ os.environ['CUDA_VISIBLE_DEVICES'] = str(devices)+ os.environ['HIP_VISIBLE_DEVICES'] = str(devices)++ if args.cuda_device is not None:+ os.environ['CUDA_VISIBLE_DEVICES'] = str(args.cuda_device)+ os.environ['HIP_VISIBLE_DEVICES'] = str(args.cuda_device)+ os.environ["ASCEND_RT_VISIBLE_DEVICES"] = str(args.cuda_device)+ logging.info("Set cuda device to: {}".format(args.cuda_device))++ if args.oneapi_device_selector is not None:+ os.environ['ONEAPI_DEVICE_SELECTOR'] = args.oneapi_device_selector+ logging.info("Set oneapi device selector to: {}".format(args.oneapi_device_selector))++ if args.deterministic:+ if 'CUBLAS_WORKSPACE_CONFIG' not in os.environ:+ os.environ['CUBLAS_WORKSPACE_CONFIG'] = ":4096:8"++ import cuda_malloc+ if "rocm" in cuda_malloc.get_torch_version_noimport():+ os.environ['OCL_SET_SVM_SIZE'] = '262144' # set at the request of AMD+def handle_comfyui_manager_unavailable():if not args.windows_standalone_build:@@ -137,40 +169,6 @@ import shutilimport threadingimport gc--if os.name == "nt":- os.environ['MIMALLOC_PURGE_DELAY'] = '0'--if __name__ == "__main__":- os.environ['TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL'] = '1'- if args.default_device is not None:- default_dev = args.default_device- devices = list(range(32))- devices.remove(default_dev)- devices.insert(0, default_dev)- devices = ','.join(map(str, devices))- os.environ['CUDA_VISIBLE_DEVICES'] = str(devices)- os.environ['HIP_VISIBLE_DEVICES'] = str(devices)-- if args.cuda_device is not None:- os.environ['CUDA_VISIBLE_DEVICES'] = str(args.cuda_device)- os.environ['HIP_VISIBLE_DEVICES'] = str(args.cuda_device)- os.environ["ASCEND_RT_VISIBLE_DEVICES"] = str(args.cuda_device)- logging.info("Set cuda device to: {}".format(args.cuda_device))-- if args.oneapi_device_selector is not None:- os.environ['ONEAPI_DEVICE_SELECTOR'] = args.oneapi_device_selector- logging.info("Set oneapi device selector to: {}".format(args.oneapi_device_selector))-- if args.deterministic:- if 'CUBLAS_WORKSPACE_CONFIG' not in os.environ:- os.environ['CUBLAS_WORKSPACE_CONFIG'] = ":4096:8"-- import cuda_malloc- if "rocm" in cuda_malloc.get_torch_version_noimport():- os.environ['OCL_SET_SVM_SIZE'] = '262144' # set at the request of AMD--if 'torch' in sys.modules:logging.warning("WARNING: Potential Error in code: Torch already imported, torch should never be imported before this point.")