From 4ec60156a923a5131e0eb67d6660fbc5d348bfeb Mon Sep 17 00:00:00 2001 From: albertmena <12760268+albertmena@users.noreply.github.com> Date: Wed, 25 Jun 2025 12:29:10 +0200 Subject: [PATCH 1/2] DLTK fixing updates --- src/xmipp/bindings/python/xmipp_base.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/xmipp/bindings/python/xmipp_base.py b/src/xmipp/bindings/python/xmipp_base.py index e3b5633a2..5ae690a3c 100644 --- a/src/xmipp/bindings/python/xmipp_base.py +++ b/src/xmipp/bindings/python/xmipp_base.py @@ -284,9 +284,10 @@ def getCondaActivationCmd(): return condaActCmd @staticmethod - def yieldInstallAllCmds(useGpu): + def yieldInstallAllCmds(useGpu, folderInstallation): for name, env in CondaEnvManager.XMIPP_CONDA_ENVS.items(): yield CondaEnvManager.installEnvironCmd( + folderInstallation=folderInstallation, name=name, versionId=env.get('versionId', None), requirementsFn=env['requirements'], @@ -314,7 +315,7 @@ def getCurInstalledDep(dependency, defaultVersion=None, environ=None): return dependency+'=='+defaultVersion if defaultVersion else dependency @staticmethod - def installEnvironCmd(name: str,requirementsFn: str, versionId: int = None, gpu=False): + def installEnvironCmd(name: str,requirementsFn: str, versionId: int = None, gpu=False, pathInstallation: str = ''): # Consider the gpu version if requested if gpu: root, ext = os.path.splitext(requirementsFn) @@ -328,9 +329,14 @@ def installEnvironCmd(name: str,requirementsFn: str, versionId: int = None, gpu else: target = f'{name}.yml' - commands = [] - commands.append('conda env create -f %s || conda env update -f %s' % (requirementsFn, requirementsFn)) - commands.append('conda env export -f %s' % target) + commands = [] + if not os.path.isfile(os.path.join(pathInstallation, target)): + commands.append( + 'conda env create -f %s || conda remove --name %s --all -y && conda env create -f %s' % ( + requirementsFn, name, requirementsFn)) + commands.append('conda env export -f %s' % target) + + #commands.append('conda env create -f %s || conda env update -f %s' % (requirementsFn, requirementsFn)) return ' && '.join(commands), target def getModel(*modelPath, **kwargs): From a1043749a7d78cdeab390ad8f7e623ec7ecb0458 Mon Sep 17 00:00:00 2001 From: albertmena <12760268+albertmena@users.noreply.github.com> Date: Wed, 25 Jun 2025 12:50:21 +0200 Subject: [PATCH 2/2] error pathInstallation --- src/xmipp/bindings/python/xmipp_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xmipp/bindings/python/xmipp_base.py b/src/xmipp/bindings/python/xmipp_base.py index 5ae690a3c..23350cd4f 100644 --- a/src/xmipp/bindings/python/xmipp_base.py +++ b/src/xmipp/bindings/python/xmipp_base.py @@ -284,10 +284,10 @@ def getCondaActivationCmd(): return condaActCmd @staticmethod - def yieldInstallAllCmds(useGpu, folderInstallation): + def yieldInstallAllCmds(useGpu, pathInstallation): for name, env in CondaEnvManager.XMIPP_CONDA_ENVS.items(): yield CondaEnvManager.installEnvironCmd( - folderInstallation=folderInstallation, + pathInstallation=pathInstallation, name=name, versionId=env.get('versionId', None), requirementsFn=env['requirements'],