From b1f6ec0643799273f32b034c89f6bca0cbcf5acd Mon Sep 17 00:00:00 2001 From: Greta Assmann Date: Wed, 17 Apr 2024 13:18:57 +0200 Subject: [PATCH] no cuda changes --- cpu-daily/cluster_info.json | 3 +-- dev/update_versions.sh | 8 ++++---- gpu-big/cluster_info.json | 3 +-- gpu-big/cluster_script.sh | 1 - gpu-rtx2080ti/cluster_info.json | 3 +-- gpu-rtx2080ti/cluster_script.sh | 1 - gpu-short/cluster_info.json | 3 +-- gpu-short/cluster_script.sh | 1 - gpu/cluster_info.json | 3 +-- gpu/cluster_script.sh | 1 - 10 files changed, 9 insertions(+), 18 deletions(-) diff --git a/cpu-daily/cluster_info.json b/cpu-daily/cluster_info.json index e3263ba..f9132fa 100644 --- a/cpu-daily/cluster_info.json +++ b/cpu-daily/cluster_info.json @@ -6,6 +6,5 @@ "qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=merlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'", "qstat_cmd_tpl" : "squeue --cluster=merlin6 -j {{ cluster_job_id }}", "qdel_cmd_tpl" : "scancel --cluster=merlin6 {{ cluster_job_id }}", - "qinfo_cmd_tpl" : "sinfo --cluster=merlin6", - "transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}" + "qinfo_cmd_tpl" : "sinfo --cluster=merlin6" } diff --git a/dev/update_versions.sh b/dev/update_versions.sh index 9b8d4a2..478df1c 100755 --- a/dev/update_versions.sh +++ b/dev/update_versions.sh @@ -14,10 +14,10 @@ fi # support both cryosparc2_master and cryosparc_master directories CRYOSPARC_WORKER=$(ls "$CRYOSPARC_HOME"/cryosparc*_worker/bin/cryosparcw | head -1) -echo "Cuda version: ${CUDA_VERSION?Please load the correct cuda module}" -echo "GCC version: ${GCC_VERSION?Please load the correct gcc version}" +#echo "Cuda version: ${CUDA_VERSION?Please load the correct cuda module}" +#echo "GCC version: ${GCC_VERSION?Please load the correct gcc version}" echo "Worker path: ${CRYOSPARC_WORKER}" -sed -ri 's#cuda/[0-9.]+#cuda/'$CUDA_VERSION'#' */cluster_script.sh -sed -ri 's#gcc/[0-9.]+#gcc/'$GCC_VERSION'#' */cluster_script.sh +#sed -ri 's#cuda/[0-9.]+#cuda/'$CUDA_VERSION'#' */cluster_script.sh +#sed -ri 's#gcc/[0-9.]+#gcc/'$GCC_VERSION'#' */cluster_script.sh sed -ri 's#worker_bin_path.*#worker_bin_path" : "'$CRYOSPARC_WORKER'",#' */cluster_info.json diff --git a/gpu-big/cluster_info.json b/gpu-big/cluster_info.json index d204bfa..cc0012e 100644 --- a/gpu-big/cluster_info.json +++ b/gpu-big/cluster_info.json @@ -6,6 +6,5 @@ "qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'", "qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}", "qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}", - "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6", - "transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}" + "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6" } diff --git a/gpu-big/cluster_script.sh b/gpu-big/cluster_script.sh index 96d68ed..9869d42 100644 --- a/gpu-big/cluster_script.sh +++ b/gpu-big/cluster_script.sh @@ -70,7 +70,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print # Make sure this matches the version of cuda used to compile cryosparc module purge -module load cuda/11.5.1 gcc/7.5.0 srun {{ run_cmd }} diff --git a/gpu-rtx2080ti/cluster_info.json b/gpu-rtx2080ti/cluster_info.json index 65a03c2..0027dcb 100644 --- a/gpu-rtx2080ti/cluster_info.json +++ b/gpu-rtx2080ti/cluster_info.json @@ -6,6 +6,5 @@ "qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'", "qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}", "qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}", - "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6", - "transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}" + "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6" } diff --git a/gpu-rtx2080ti/cluster_script.sh b/gpu-rtx2080ti/cluster_script.sh index 5b04731..bda97fa 100644 --- a/gpu-rtx2080ti/cluster_script.sh +++ b/gpu-rtx2080ti/cluster_script.sh @@ -67,7 +67,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print # Make sure this matches the version of cuda used to compile cryosparc module purge -module load cuda/11.5.1 gcc/7.5.0 srun {{ run_cmd }} diff --git a/gpu-short/cluster_info.json b/gpu-short/cluster_info.json index 9719098..e2cf503 100644 --- a/gpu-short/cluster_info.json +++ b/gpu-short/cluster_info.json @@ -6,6 +6,5 @@ "qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'", "qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}", "qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}", - "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6", - "transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}" + "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6" } diff --git a/gpu-short/cluster_script.sh b/gpu-short/cluster_script.sh index 68993df..a24b6fe 100644 --- a/gpu-short/cluster_script.sh +++ b/gpu-short/cluster_script.sh @@ -69,7 +69,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print # Make sure this matches the version of cuda used to compile cryosparc module purge -module load cuda/11.5.1 gcc/7.5.0 srun {{ run_cmd }} diff --git a/gpu/cluster_info.json b/gpu/cluster_info.json index 2c20612..eeb1d1a 100644 --- a/gpu/cluster_info.json +++ b/gpu/cluster_info.json @@ -6,6 +6,5 @@ "qsub_cmd_tpl" : "bash -c 'sbatch --parsable --cluster=gmerlin6 \"{{ script_path_abs }}\" | cut -d \";\" -f 1'", "qstat_cmd_tpl" : "squeue --cluster=gmerlin6 -j {{ cluster_job_id }}", "qdel_cmd_tpl" : "scancel --cluster=gmerlin6 {{ cluster_job_id }}", - "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6", - "transfer_cmd_tpl" : "cp {{ src_path }} {{ dest_path }}" + "qinfo_cmd_tpl" : "sinfo --cluster=gmerlin6" } diff --git a/gpu/cluster_script.sh b/gpu/cluster_script.sh index faaf63b..75eb669 100644 --- a/gpu/cluster_script.sh +++ b/gpu/cluster_script.sh @@ -66,7 +66,6 @@ srun /opt/psi/Programming/anaconda/2019.07/conda/bin/python -c 'import os; print # Make sure this matches the version of cuda used to compile cryosparc module purge -module load cuda/11.5.1 gcc/7.5.0 srun {{ run_cmd }} -- 2.49.1