feat(hpc): smart cluster modules
This commit is contained in:
parent
51da258feb
commit
78aa20868e
4 changed files with 8 additions and 13 deletions
1
env/hpc/modules.txt
vendored
1
env/hpc/modules.txt
vendored
|
|
@ -1,6 +1,5 @@
|
|||
gfbf/2024a
|
||||
GCCcore/13.3.0
|
||||
Python/3.12.3-GCCcore-13.3.0
|
||||
PyTorch/2.7.1-foss-2024a-CUDA-12.6.0
|
||||
FFmpeg/7.0.2-GCCcore-13.3.0
|
||||
PyYAML/6.0.2-GCCcore-13.3.0
|
||||
|
|
|
|||
1
env/hpc/modules_gpu.txt
vendored
Normal file
1
env/hpc/modules_gpu.txt
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
PyTorch/2.7.1-foss-2024a-CUDA-12.6.0
|
||||
|
|
@ -37,7 +37,8 @@ def main() -> None:
|
|||
print(f"Error: {modules_path} not found.", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
# Read normalized module names from modules.txt
|
||||
# Read normalized module names from base modules only
|
||||
# Library modules (like PyTorch) are kept in requirements for portability
|
||||
module_names = [
|
||||
normalise(line.split()[0].split("/")[0])
|
||||
for line in modules_path.read_text().splitlines()
|
||||
|
|
@ -51,7 +52,7 @@ def main() -> None:
|
|||
deps: list[str] = data.get("project", {}).get("dependencies", [])
|
||||
|
||||
final_deps: list[str] = []
|
||||
print(f"Checking dependencies against {modules_path}...", file=sys.stderr)
|
||||
print(f"Checking dependencies against HPC module list...", file=sys.stderr)
|
||||
for dep in deps:
|
||||
name = normalise(pkg_name(dep))
|
||||
# Smart check: if the package name is a substring of any loaded module name
|
||||
|
|
@ -63,7 +64,8 @@ def main() -> None:
|
|||
final_deps.append(dep)
|
||||
print(f" [pip] {dep}", file=sys.stderr)
|
||||
|
||||
output_path = ROOT / "env" / "hpc" / "requirements.txt"
|
||||
hpc_dir = ROOT / "env" / "hpc"
|
||||
output_path = hpc_dir / "requirements.txt"
|
||||
output_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
output_path.write_text("\n".join(final_deps) + "\n")
|
||||
print(f"\nWrote {len(final_deps)} requirement(s) to {output_path}", file=sys.stderr)
|
||||
|
|
|
|||
|
|
@ -21,19 +21,12 @@ fi
|
|||
|
||||
module load vsc-venv
|
||||
|
||||
echo 'Synchronizing environment...'
|
||||
# Step 1: Sync (build/update) the environment
|
||||
vsc-venv \
|
||||
--modules env/hpc/modules.txt \
|
||||
--requirements env/hpc/requirements.txt
|
||||
|
||||
echo 'Activating environment...'
|
||||
# Step 2: Activate the environment
|
||||
echo 'Synchronizing and activating environment...'
|
||||
source vsc-venv --activate \
|
||||
--modules env/hpc/modules.txt \
|
||||
--requirements env/hpc/requirements.txt
|
||||
|
||||
# Step 3: Force upgrade shared system dependencies to ensure venv precedence
|
||||
# Step 2: Force upgrade shared system dependencies to ensure venv precedence
|
||||
echo 'Applying library overlays (NumPy, Protobuf)...'
|
||||
pip install --upgrade --no-deps numpy protobuf
|
||||
|
||||
|
|
|
|||
Reference in a new issue