Skip to content

Commit

Permalink
use vsc-sofwtare-stack repo in root of active virtual environment
Browse files Browse the repository at this point in the history
  • Loading branch information
lexming committed Jan 30, 2025
1 parent d5bc569 commit dd0faaf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
27 changes: 18 additions & 9 deletions bin/submit_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,33 @@
import sys

from vsc.utils import fancylogger
from vsc.utils.script_tools import SimpleOption
from vsc.utils.run import RunNoShell
from vsc.utils.script_tools import SimpleOption

from build_tools import hooks_hydra
from build_tools.clusters import ARCHS, PARTITIONS
from build_tools.filetools import APPS_BRUSSEL
from build_tools import hooks_hydra
from build_tools.hooks_hydra import (SUBDIR_MODULES_BWRAP, SUFFIX_MODULES_PATH, SUFFIX_MODULES_SYMLINK,
VALID_MODULES_SUBDIRS)
from build_tools.hooks_hydra import (
SUBDIR_MODULES_BWRAP,
SUFFIX_MODULES_PATH,
SUFFIX_MODULES_SYMLINK,
VALID_MODULES_SUBDIRS,
)
from build_tools.lmodtools import submit_lmod_cache_job
from build_tools.softinstall import mk_job_name, submit_build_job

logger = fancylogger.getLogger()
fancylogger.logToScreen(True)
fancylogger.setLogLevelInfo()

# repositories with easyconfigs
VSCSOFTSTACK_ROOT = os.path.expanduser("~/vsc-software-stack")
VSCSOFTSTACK_ROOT = os.path.join(os.path.dirname(os.getenv("VIRTUAL_ENV", "")), "vsc-software-stack")
if not os.path.isdir(VSCSOFTSTACK_ROOT):
logger.error(
f"Cannot locate 'vsc-software-stack' repo in: {VSCSOFTSTACK_ROOT} "
"Please clone that repo in the parent folder of your virtual environment directory"
)
sys.exit(1)
EASYCONFIG_REPOS = [
# our site repo (https://github.com/vscentrum/vsc-software-stack/tree/site-vub)
os.path.join("site-vub", "easyconfigs"),
Expand All @@ -46,10 +59,6 @@
]
EASYBLOCK_REPO = os.path.join("site-vub", "easyblocks", "*", "*.py")

logger = fancylogger.getLogger()
fancylogger.logToScreen(True)
fancylogger.setLogLevelInfo()

DEFAULT_ARCHS = [arch for (arch, prop) in ARCHS.items() if prop['default']]
LOCAL_ARCH = os.getenv('VSC_ARCH_LOCAL', '') + os.getenv('VSC_ARCH_SUFFIX', '')
if LOCAL_ARCH not in ARCHS:
Expand Down
2 changes: 1 addition & 1 deletion src/build_tools/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@author: Alex Domingo (Vrije Universiteit Brussel)
"""

VERSION = '4.0.2'
VERSION = '4.0.3'

AUTHOR = {
'wp': 'Ward Poelmans',
Expand Down

0 comments on commit dd0faaf

Please sign in to comment.