Unverified Commit 765666d5 authored by Pascal Roth's avatar Pascal Roth Committed by GitHub

Fixes the cluster scripts after python migration (#824)

# Description

Fixes cluster setting after merge of [python
conversion](https://github.com/isaac-sim/IsaacLab/commit/f565c33d7716db1be813b30ddbcf9321712fc497)

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Checklist

- [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with
`./isaaclab.sh --format`
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] I have updated the changelog and the corresponding version in the
extension's `config/extension.toml` file
- [x] I have added my name to the `CONTRIBUTORS.md` or my name already
exists there
parent 7670f0f1
......@@ -12,8 +12,8 @@ docs/
**/videos/*
*.tmp
# ignore docker
docker/exports/
docker/.container.yaml
docker/cluster/exports/
docker/.container.cfg
# ignore recordings
recordings/
# ignore __pycache__
......
......@@ -24,8 +24,7 @@
# Docker/Singularity
**/*.sif
docker/exports/
docker/.container.yaml
docker/cluster/exports/
docker/.container.cfg
# IDE
......
......@@ -2,6 +2,9 @@
# Cluster specific settings
###
# Job scheduler used by cluster.
# Currently supports PBS and SLURM
CLUSTER_JOB_SCHEDULER=SLURM
# Docker cache dir for Isaac Sim (has to end on docker-isaac-sim)
# e.g. /cluster/scratch/$USER/docker-isaac-sim
CLUSTER_ISAAC_SIM_CACHE_DIR=/some/path/on/cluster/docker-isaac-sim
......
......@@ -174,7 +174,7 @@ case $command in
ssh $CLUSTER_LOGIN "mkdir -p $CLUSTER_ISAACLAB_DIR"
# Sync Isaac Lab code
echo "[INFO] Syncing Isaac Lab code..."
rsync -rh --exclude="*.git*" --filter=':- .dockerignore' /$SCRIPT_DIR/.. $CLUSTER_LOGIN:$CLUSTER_ISAACLAB_DIR
rsync -rh --exclude="*.git*" --filter=':- .dockerignore' /$SCRIPT_DIR/../.. $CLUSTER_LOGIN:$CLUSTER_ISAACLAB_DIR
# execute job script
echo "[INFO] Executing job script..."
# check whether the second argument is a profile or a job argument
......
#!/bin/bash
#!/usr/bin/env bash
echo "(run_singularity.py): Called on compute node with container profile $1 and arguments ${@:2}"
......
......@@ -18,7 +18,7 @@ cat <<EOT > job.sh
#SBATCH --job-name="training-$(date +"%Y-%m-%dT%H:%M")"
# Pass the container profile first to run_singularity.sh, then all arguments intended for the executed script
sh "$1/docker/cluster/run_singularity.sh" "$2" "${@:3}"
bash "$1/docker/cluster/run_singularity.sh" "$2" "${@:3}"
EOT
sbatch < job.sh
......
......@@ -31,7 +31,7 @@ class IsaacLabContainerInterface:
Args:
context_dir : The context directory for Docker operations.
statefile : An instance of the Statefile class to manage state variables. If not provided, initializes a Statefile(path=self.context_dir/.container.yaml).
statefile : An instance of the Statefile class to manage state variables. If not provided, initializes a Statefile(path=self.context_dir/.container.cfg).
profile : The profile name for the container. Defaults to "base".
yamls : A list of yamls to extend docker-compose.yaml. They will be extended in the order they are provided.
envs : A list of envs to extend .env.base. They will be extended in the order they are provided.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment