From 0b641f53c68bf937bd3b52aa8576b4044a5d745c Mon Sep 17 00:00:00 2001 From: Henry Addison Date: Mon, 5 Aug 2024 21:41:11 +0100 Subject: [PATCH] load gcc module on jasmin so version of GCC is compatible with PyTorch (I think) and so can also re-enable model imports in predict.py --- bin/jasmin/lotus-sampling-wrapper | 2 +- bin/jasmin/lotus-wrapper | 2 ++ bin/predict.py | 18 +++++++++--------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bin/jasmin/lotus-sampling-wrapper b/bin/jasmin/lotus-sampling-wrapper index 28f4bb06a..2cd64a0dd 100755 --- a/bin/jasmin/lotus-sampling-wrapper +++ b/bin/jasmin/lotus-sampling-wrapper @@ -1,7 +1,7 @@ #!/bin/bash # Wrapper script around commands for training a model to queue on LOTUS on JASMIN -module use gcc +module load gcc source ~/.bashrc mamba activate mv-mlde diff --git a/bin/jasmin/lotus-wrapper b/bin/jasmin/lotus-wrapper index cf0df8e7a..8a683b9a0 100755 --- a/bin/jasmin/lotus-wrapper +++ b/bin/jasmin/lotus-wrapper @@ -1,6 +1,8 @@ #!/bin/bash # Wrapper script around commands for training a model to queue on LOTUS on JASMIN +module load gcc + source ~/.bashrc mamba activate mv-mlde diff --git a/bin/predict.py b/bin/predict.py index 342670a4b..18b1b4828 100644 --- a/bin/predict.py +++ b/bin/predict.py @@ -34,17 +34,17 @@ import ml_downscaling_emulator.score_sde_pytorch.models as models # noqa: F401 from ml_downscaling_emulator.score_sde_pytorch.models import utils as mutils -# from ml_downscaling_emulator.score_sde_pytorch.models import cncsnpp # noqa: F401 -# from ml_downscaling_emulator.score_sde_pytorch.models import cunet # noqa: F401 +from ml_downscaling_emulator.score_sde_pytorch.models import cncsnpp # noqa: F401 +from ml_downscaling_emulator.score_sde_pytorch.models import cunet # noqa: F401 from ml_downscaling_emulator.score_sde_pytorch.models import det_cunet # noqa: F401 -# from ml_downscaling_emulator.score_sde_pytorch.models import ( # noqa: F401 -# layerspp, # noqa: F401 -# ) # noqa: F401 -# from ml_downscaling_emulator.score_sde_pytorch.models import layers # noqa: F401 -# from ml_downscaling_emulator.score_sde_pytorch.models import ( # noqa: F401 -# normalization, # noqa: F401 -# ) # noqa: F401 +from ml_downscaling_emulator.score_sde_pytorch.models import ( # noqa: F401 + layerspp, # noqa: F401 +) # noqa: F401 +from ml_downscaling_emulator.score_sde_pytorch.models import layers # noqa: F401 +from ml_downscaling_emulator.score_sde_pytorch.models import ( # noqa: F401 + normalization, # noqa: F401 +) # noqa: F401 import ml_downscaling_emulator.score_sde_pytorch.sampling as sampling from ml_downscaling_emulator.score_sde_pytorch.sde_lib import (