From f9b8e2e9361a9365960ba0ec2dd1f6c7877159ee Mon Sep 17 00:00:00 2001 From: Timothy Middelkoop Date: Fri, 14 May 2021 13:14:31 -0500 Subject: [PATCH] Merge branch and do trival renames and fixes --- .../{SampleSlurmJobs => examples}/helloworld_singularity.slrm | 2 +- slurm-gcp/{SampleSlurmJobs => examples}/jupyter_launch.slrm | 0 slurm-gcp/setup.sh | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename slurm-gcp/{SampleSlurmJobs => examples}/helloworld_singularity.slrm (91%) rename slurm-gcp/{SampleSlurmJobs => examples}/jupyter_launch.slrm (100%) diff --git a/slurm-gcp/SampleSlurmJobs/helloworld_singularity.slrm b/slurm-gcp/examples/helloworld_singularity.slrm similarity index 91% rename from slurm-gcp/SampleSlurmJobs/helloworld_singularity.slrm rename to slurm-gcp/examples/helloworld_singularity.slrm index 8101a41..58e1a8e 100644 --- a/slurm-gcp/SampleSlurmJobs/helloworld_singularity.slrm +++ b/slurm-gcp/examples/helloworld_singularity.slrm @@ -5,7 +5,7 @@ #SBATCH --mem-per-cpu 2G #SBATCH --time 1-0:00:00 #SBATCH --job-name singularity-helloworld -#SBATCH --output hellowrold-singularity-%J.log +#SBATCH --output helloworld-singularity-%J.log date hostname diff --git a/slurm-gcp/SampleSlurmJobs/jupyter_launch.slrm b/slurm-gcp/examples/jupyter_launch.slrm similarity index 100% rename from slurm-gcp/SampleSlurmJobs/jupyter_launch.slrm rename to slurm-gcp/examples/jupyter_launch.slrm diff --git a/slurm-gcp/setup.sh b/slurm-gcp/setup.sh index 330adfa..754d091 100755 --- a/slurm-gcp/setup.sh +++ b/slurm-gcp/setup.sh @@ -3,4 +3,5 @@ gcloud compute ssh class-controller -- < scripts/controller.sh gcloud compute ssh class-controller -- sudo -i < scripts/singularity.sh +gcloud compute ssh class-controller -- sudo -i < scripts/install_miniconda.sh gcloud compute ssh class-controller -- < scripts/spack.sh