From 87139506075907760d398258bda5f17a2115113d Mon Sep 17 00:00:00 2001 From: Peter Andreas Entschev Date: Thu, 4 Nov 2021 08:36:32 -0700 Subject: [PATCH] Reorder and reenable UCX_MEMTYPE_CACHE=n for all UCX versions UCX_MEMTYPE_CACHE=n is still required even for UCX 1.12 (see https://github.com/openucx/ucx/issues/7575), so we reenable it. Reordering the import is also required to prevent UCS warnings when Cython code is imported. --- ucp/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ucp/__init__.py b/ucp/__init__.py index 7b11f7b57..d40b11392 100644 --- a/ucp/__init__.py +++ b/ucp/__init__.py @@ -6,20 +6,21 @@ import logging import os -from ._version import get_versions as _get_versions -from .core import * # noqa -from .core import get_ucx_version -from .utils import get_address, get_ucxpy_logger # noqa - logger = logging.getLogger("ucx") -# Notice, if we have to update environment variables -# we need to do it before importing UCX -if "UCX_MEMTYPE_CACHE" not in os.environ and get_ucx_version() < (1, 12, 0): +# Notice, if we have to update environment variables we need to do it +# before importing UCX, which must happen also before the Cython code +# import to prevent UCS unused variable warnings. +if "UCX_MEMTYPE_CACHE" not in os.environ: # See logger.debug("Setting env UCX_MEMTYPE_CACHE=n, which is required by UCX") os.environ["UCX_MEMTYPE_CACHE"] = "n" +from ._version import get_versions as _get_versions # noqa +from .core import * # noqa +from .core import get_ucx_version # noqa +from .utils import get_address, get_ucxpy_logger # noqa + if "UCX_SOCKADDR_TLS_PRIORITY" not in os.environ and get_ucx_version() < (1, 11, 0): logger.debug( "Setting env UCX_SOCKADDR_TLS_PRIORITY=sockcm, "